Merge branch 'master' into vcpkg_nuget

4 files changed, 44 insertions, 5 deletions

diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt
index a2f0aeb03..64ff00262 100644
--- a/ports/sqlite3/CMakeLists.txt
+++ b/ports/sqlite3/CMakeLists.txt
@@ -3,7 +3,13 @@ project(sqlite3 C)
 
 include_directories(.)
 if(BUILD_SHARED_LIBS)
-    set(API "-DSQLITE_API=__declspec(dllexport)")
+    if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Darwin")
+        set(API "-DSQLITE_API=__attribute__((visibility(\"default\")))")
+    elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
+        set(API "-DSQLITE_API=__declspec(dllexport)")
+    else()
+        message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
+    endif()
 else()
     set(API "-DSQLITE_API=extern")
 endif()
@@ -30,7 +36,6 @@ endif()
 
 if(NOT SQLITE3_SKIP_TOOLS)
     add_executable(sqlite3-bin shell.c)
-    set_target_properties(sqlite3-bin PROPERTIES OUTPUT_NAME sqlite3)
     target_link_libraries(sqlite3-bin PRIVATE sqlite3)
     install(TARGETS sqlite3-bin sqlite3
       RUNTIME DESTINATION tools
diff --git a/ports/sqlite3/CONTROL b/ports/sqlite3/CONTROL
index 7bba4d78c..3418b867e 100644
--- a/ports/sqlite3/CONTROL
+++ b/ports/sqlite3/CONTROL
@@ -1,5 +1,5 @@
 Source: sqlite3
-Version: 3.28.0
+Version: 3.30.1-1
 Homepage: https://sqlite.org/
 Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
 
diff --git a/ports/sqlite3/fix-arm-uwp.patch b/ports/sqlite3/fix-arm-uwp.patch
new file mode 100644
index 000000000..03e092965
--- /dev/null
+++ b/ports/sqlite3/fix-arm-uwp.patch
@@ -0,0 +1,33 @@
+diff --git a/shell.c b/shell.c
+index 10d8cc1..99f37a5 100644
+--- a/shell.c
++++ b/shell.c
+@@ -316,7 +316,11 @@ static int hasTimer(void){
+     */
+     hProcess = GetCurrentProcess();
+     if( hProcess ){
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+       HINSTANCE hinstLib = LoadLibrary(TEXT("Kernel32.dll"));
++#else
++      HINSTANCE hinstLib = LoadPackagedLibrary(TEXT("Kernel32.dll"), 0);
++#endif
+       if( NULL != hinstLib ){
+         getProcessTimesAddr =
+             (GETPROCTIMES) GetProcAddress(hinstLib, "GetProcessTimes");
+@@ -2437,10 +2441,16 @@ static int writeFile(
+     if( zUnicodeName==0 ){
+       return 1;
+     }
++#if !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)
+     hFile = CreateFileW(
+       zUnicodeName, FILE_WRITE_ATTRIBUTES, 0, NULL, OPEN_EXISTING,
+       FILE_FLAG_BACKUP_SEMANTICS, NULL
+     );
++#else
++    hFile = CreateFile2(
++      zUnicodeName, FILE_WRITE_ATTRIBUTES, 0, OPEN_EXISTING, NULL
++    );
++#endif
+     sqlite3_free(zUnicodeName);
+     if( hFile!=INVALID_HANDLE_VALUE ){
+       BOOL bResult = SetFileTime(hFile, NULL, &lastAccess, &lastWrite);
diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake
index 131469c12..2cb778aad 100644
--- a/ports/sqlite3/portfile.cmake
+++ b/ports/sqlite3/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)

 

-set(SQLITE_VERSION 3280000)

-set(SQLITE_HASH 6a2b9c0accd286b09d7e077393a627e22112ef11c76ff6a5896f5ff1a11eb62a8b2700f5a99eebda82df63b3968814ca460582aa4619852f96a899d2f59b9f8d)

+set(SQLITE_VERSION 3300100)

+set(SQLITE_HASH 030b53fe684e0fb8e9747b1f160e5e875807eabb0763caff66fe949ee6aa92f26f409b9b25034d8d1f5cee554a99e56a2bb92129287b0fe0671409babe9d18ea )

 

 vcpkg_download_distfile(ARCHIVE

     URLS "https://sqlite.org/2019/sqlite-amalgamation-${SQLITE_VERSION}.zip"

@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH

     ARCHIVE ${ARCHIVE}

     REF ${SQLITE_VERSION}

+    PATCHES fix-arm-uwp.patch

 )

 

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})