Revert "[qt5,sqlite3] Fix missing pthread flags" (#46607)

Author: dg0yt

ports/qt5-base/portfile.cmake

@@ -212,41 +212,41 @@ set(DEBUG_OPTIONS
             "QMAKE_LIBS_PRIVATE+=${LIBPNG_DEBUG} ${ZLIB_DEBUG}"
             )
 
-x_vcpkg_pkgconfig_get_modules(PREFIX freetype MODULES freetype2 LIBS)
+x_vcpkg_pkgconfig_get_modules(PREFIX freetype MODULES freetype2 LIBRARIES)
 list(APPEND CORE_OPTIONS -system-freetype)
-list(APPEND RELEASE_OPTIONS "FREETYPE_LIBS=${freetype_LIBS_RELEASE}")
-list(APPEND DEBUG_OPTIONS "FREETYPE_LIBS=${freetype_LIBS_DEBUG}")
+list(APPEND RELEASE_OPTIONS "FREETYPE_LIBS=${freetype_LIBRARIES_RELEASE}")
+list(APPEND DEBUG_OPTIONS "FREETYPE_LIBS=${freetype_LIBRARIES_DEBUG}")
 
-x_vcpkg_pkgconfig_get_modules(PREFIX harfbuzz MODULES harfbuzz LIBS)
+x_vcpkg_pkgconfig_get_modules(PREFIX harfbuzz MODULES harfbuzz LIBRARIES)
 if(VCPKG_TARGET_IS_OSX)
     string(APPEND harfbuzz_LIBRARIES_RELEASE " -framework ApplicationServices")
     string(APPEND harfbuzz_LIBRARIES_DEBUG " -framework ApplicationServices")
 endif()
 list(APPEND CORE_OPTIONS -system-harfbuzz)
-list(APPEND RELEASE_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBS_RELEASE}")
-list(APPEND DEBUG_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBS_DEBUG}")
+list(APPEND RELEASE_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_RELEASE}")
+list(APPEND DEBUG_OPTIONS "HARFBUZZ_LIBS=${harfbuzz_LIBRARIES_DEBUG}")
 
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     list(APPEND CORE_OPTIONS -fontconfig)
-    x_vcpkg_pkgconfig_get_modules(PREFIX fontconfig MODULES fontconfig LIBS)
-    list(APPEND RELEASE_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBS_RELEASE}")
-    list(APPEND DEBUG_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBS_DEBUG}")
+    x_vcpkg_pkgconfig_get_modules(PREFIX fontconfig MODULES fontconfig LIBRARIES)
+    list(APPEND RELEASE_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBRARIES_RELEASE}")
+    list(APPEND DEBUG_OPTIONS "FONTCONFIG_LIBS=${fontconfig_LIBRARIES_DEBUG}")
 endif()
 
 if("sqlite3plugin" IN_LIST FEATURES)
     list(APPEND CORE_OPTIONS -system-sqlite)
-    x_vcpkg_pkgconfig_get_modules(PREFIX sqlite3 MODULES sqlite3 LIBS)
-    list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${sqlite3_LIBS_RELEASE}")
-    list(APPEND DEBUG_OPTIONS "SQLITE_LIBS=${sqlite3_LIBS_DEBUG}")
+    x_vcpkg_pkgconfig_get_modules(PREFIX sqlite3 MODULES sqlite3 LIBRARIES)
+    list(APPEND RELEASE_OPTIONS "SQLITE_LIBS=${sqlite3_LIBRARIES_RELEASE}")
+    list(APPEND DEBUG_OPTIONS "SQLITE_LIBS=${sqlite3_LIBRARIES_DEBUG}")
 else()
     list(APPEND CORE_OPTIONS -no-sql-sqlite)
 endif()
 
 if("zstd" IN_LIST FEATURES)
     list(APPEND CORE_OPTIONS -zstd)
-    x_vcpkg_pkgconfig_get_modules(PREFIX libzstd MODULES libzstd LIBS)
-    list(APPEND RELEASE_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBS_RELEASE}")
-    list(APPEND DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBS_DEBUG}")
+    x_vcpkg_pkgconfig_get_modules(PREFIX libzstd MODULES libzstd LIBRARIES)
+    list(APPEND RELEASE_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBRARIES_RELEASE}")
+    list(APPEND DEBUG_OPTIONS "QMAKE_LIBS_PRIVATE+=${libzstd_LIBRARIES_DEBUG}")
 else()
     list(APPEND CORE_OPTIONS -no-zstd)
 endif()

ports/sqlite3/CMakeLists.txt

@@ -7,7 +7,6 @@ option(SQLITE3_SKIP_TOOLS "Disable build sqlite3 executable" OFF)
 
 set(PKGCONFIG_LIBS_PRIVATE "")
 set(PKGCONFIG_REQUIRES_PRIVATE "")
-set(PKGCONFIG_CFLAGS "")
 
 add_library(sqlite3 sqlite3.c sqlite3.rc)
 
@@ -34,7 +33,6 @@ if (NOT WIN32)
     find_package(Threads REQUIRED)
     target_link_libraries(sqlite3 PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
     string(APPEND PKGCONFIG_LIBS_PRIVATE " -pthread")
-    string(APPEND PKGCONFIG_CFLAGS " -pthread")
     foreach(LIB IN LISTS CMAKE_DL_LIBS)
         string(APPEND PKGCONFIG_LIBS_PRIVATE " -l${LIB}")
     endforeach()

ports/sqlite3/sqlite3.pc.in

@@ -9,4 +9,4 @@ Version: @PKGCONFIG_VERSION@
 Libs: -L${libdir} -lsqlite3
 Libs.private: @PKGCONFIG_LIBS_PRIVATE@
 Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@
-Cflags: -I${includedir} @PKGCONFIG_CFLAGS@
+Cflags: -I${includedir}

versions/q-/qt5-base.json

@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "d58cac448df90554ba032b788cc4cdf3fd8538d8",
+      "git-tree": "e2c35de318d30fc18437711fc0b0e6fdd9f6bb90",
       "version": "5.15.17",
       "port-version": 0
     },

versions/s-/sqlite3.json

@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a9b96b5247b84b5ed31414f50c9a95492fe11720",
+      "git-tree": "31b40b0331963abeb58583e1616c9ac80b972486",
       "version": "3.50.3",
       "port-version": 0
     },