diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 489ad61fbd7565..c817bc2c256ef4 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz" FILENAME "ACE-TAO-${VERSION}.tar.gz" - SHA512 7210091f0512fa9c7ba2ea9e3f805a2ba0aab4d848a8e9e5651a824dcac65ddd50b95c98f4da86900487fa0a79aede126d021f4eb109f224224fc88a58133f79 + SHA512 a40a4761d396f1e7dc96287075810a3d874794f56057cf1f18b2bd27fbb89e024c2926890fd0a8efe825c31865c382b91e90477d78cba64877b93ba9909b7da2 ) else() # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz" FILENAME "ACE-src-${VERSION}.tar.gz" - SHA512 6e8b63ee8fa691656544a7a9e5887b499a8791f25766a8081df1d64e911f667a95fed26c1eb6355f6ce1233694f8ef11c1a986ca16a686e21fb1e375035a29ed + SHA512 716b27e347e013b866fa08f7ab182c60faf108e8000089b90717db86d6dd92d8c7e776d4850be27c5f50c8e31543f573ce19466efcd9b4b7bc8836eec5447860 ) endif() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 62f28842ef2aad..c0290ba2f2adce 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ace", - "version": "7.0.11", - "port-version": 2, + "version": "7.1.0", "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://github.com/DOCGroup/ACE_TAO", diff --git a/ports/aws-sdk-cpp/compute_build_only.cmake b/ports/aws-sdk-cpp/compute_build_only.cmake index 05a4649c825646..645075a34e9e85 100644 --- a/ports/aws-sdk-cpp/compute_build_only.cmake +++ b/ports/aws-sdk-cpp/compute_build_only.cmake @@ -548,9 +548,6 @@ endif() if("mobile" IN_LIST FEATURES) list(APPEND BUILD_ONLY mobile) endif() -if("mobileanalytics" IN_LIST FEATURES) - list(APPEND BUILD_ONLY mobileanalytics) -endif() if("monitoring" IN_LIST FEATURES) list(APPEND BUILD_ONLY monitoring) endif() diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch index 828647cc4365ce..1dc1cfd7603d4e 100644 --- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch +++ b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch @@ -1,12 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a653e38628..76d6067646 100644 +index 41d220d5fa..f6ee9a2a74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -142,7 +142,6 @@ else() - endif() - - # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. --set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) - - # build the sdk targets - project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) +@@ -147,7 +147,6 @@ if (LEGACY_BUILD) + endif () + + # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. +- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) + + # build the sdk targets + project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 5e9c815ea9adb0..aab2e305840b06 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -4,12 +4,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp REF "${VERSION}" - SHA512 d30a9cbe67aca41e98c799b55122ff97e9a935d2073ae4c1ca6545b68719236c0f2daf665cc3c0da4210e6e24e908a7a3cd0b826242e8fb5a97763f43e92b57a + SHA512 e3fff504e8437741493451f602289010150d767f57ceb0a3aea02bf85268ddb2afb7473affa4a162aa356a410573ded50324979bf77265e81c047c861d887635 PATCHES patch-relocatable-rpath.patch fix-aws-root.patch fix-openssl3.patch lock-curl-http-and-tls-settings.patch + turn-off-warnings-as-errors.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch b/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch new file mode 100644 index 00000000000000..c682b9d5bc901e --- /dev/null +++ b/ports/aws-sdk-cpp/turn-off-warnings-as-errors.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake +index a7689dc595..13e594f12c 100644 +--- a/cmake/compiler_settings.cmake ++++ b/cmake/compiler_settings.cmake +@@ -153,9 +153,6 @@ macro(set_msvc_warnings) + endif() + + # warnings as errors, max warning level (4) +- if(NOT CMAKE_CXX_FLAGS MATCHES "/WX") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") +- endif() + + # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 3e8e960872f4f1..3e5f0b7c6092dc 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.11.4", + "version": "1.11.65", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "license": "Apache-2.0", @@ -585,9 +585,6 @@ "mobile": { "description": "C++ SDK for the AWS mobile service" }, - "mobileanalytics": { - "description": "C++ SDK for the AWS mobileanalytics service" - }, "monitoring": { "description": "C++ SDK for the AWS monitoring service" }, diff --git a/ports/collada-dom/use-vcpkg-minizip.patch b/ports/collada-dom/use-vcpkg-minizip.patch index daaaf0f487c01d..e696f702b83928 100644 --- a/ports/collada-dom/use-vcpkg-minizip.patch +++ b/ports/collada-dom/use-vcpkg-minizip.patch @@ -1,13 +1,14 @@ -diff --git a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -index 4536275..77651f9 100644 ---- a/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -+++ b/dom/src/modules/LIBXMLPlugin/daeLIBXMLPlugin.cpp -@@ -32,7 +32,7 @@ - #include - using namespace std; - --#include // for saving compressed files -+#include // for saving compressed files - #ifdef _WIN32 - #include - #else +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f6c2bb6..3351ab0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,8 @@ else() + endif() + endif() + +-pkg_check_modules(minizip minizip) ++find_package(minizip NAMES unofficial-minizip REQUIRED) ++add_library(minizip ALIAS unofficial::minizip::minizip) + if(minizip_FOUND) + set(MINIZIP_INCLUDE_DIR ${minizip_INCLUDE_DIRS}) + else() diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json index 619cdfd4403076..7321d2f20d255f 100644 --- a/ports/collada-dom/vcpkg.json +++ b/ports/collada-dom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "collada-dom", "version": "2.5.0", - "port-version": 8, + "port-version": 9, "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", "homepage": "https://github.com/rdiankov/collada-dom", "license": null, diff --git a/ports/fmilib/devendor-sublibs.diff b/ports/fmilib/devendor-sublibs.diff index 02c39dbdab3a41..8845c35de848b9 100644 --- a/ports/fmilib/devendor-sublibs.diff +++ b/ports/fmilib/devendor-sublibs.diff @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b01aba5..583e15b 100644 +index 690ee5f..2816987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,7 +230,7 @@ configure_file ( @@ -7,7 +7,7 @@ index b01aba5..583e15b 100644 ) -set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} expat minizip zlib c99snprintf) -+set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} c99snprintf) ++set(FMILIB_SHARED_SUBLIBS ${FMIXML_LIBRARIES} ${FMIZIP_LIBRARIES} ${FMICAPI_LIBRARIES} minizip c99snprintf) set(FMILIB_SUBLIBS ${FMIIMPORT_LIBRARIES} ${JMUTIL_LIBRARIES} ${FMILIB_SHARED_SUBLIBS}) set(FMILIB_SHARED_SRC ${FMIIMPORTSOURCE} ${JMUTILSOURCE} ${FMIIMPORTHEADERS}) @@ -35,16 +35,20 @@ index ddd3c1f..3bafac3 100644 include_directories("${EXPAT_INCLUDE_DIRS}" "${FMILIB_THIRDPARTYLIBS}/FMI/" "${FMIXMLGENDIR}/FMI1" "${FMIXMLGENDIR}/FMI2") diff --git a/Config.cmake/fmizip.cmake b/Config.cmake/fmizip.cmake -index 091fc4d..c53555f 100644 +index c046d47..50e82b3 100644 --- a/Config.cmake/fmizip.cmake +++ b/Config.cmake/fmizip.cmake -@@ -20,7 +20,8 @@ if(NOT FMIZIPDIR) +@@ -20,7 +20,12 @@ if(NOT FMIZIPDIR) set(FMIZIP_LIBRARIES fmizip) - add_subdirectory(Config.cmake/Minizip) -+ find_package(minizip CONFIG REQUIRED) -+ add_library(minizip ALIAS minizip::minizip) ++ add_library(minizip OBJECT ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/miniunz.c" ++ "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip/minizip.c" ++ ) ++ find_package(unofficial-minizip CONFIG REQUIRED) ++ target_link_libraries(minizip PRIVATE unofficial::minizip::minizip) include_directories("${FMIZIPDIR}/include" "${FMILIB_THIRDPARTYLIBS}/Minizip/minizip" "${FMILIB_THIRDPARTYLIBS}/FMI" "${FMILIB_THIRDPARTYLIBS}/Zlib/zlib-1.2.6" "${FMILibrary_BINARY_DIR}/zlib") diff --git a/ports/fmilib/minizip.patch b/ports/fmilib/minizip.patch new file mode 100644 index 00000000000000..abd3ec131892d2 --- /dev/null +++ b/ports/fmilib/minizip.patch @@ -0,0 +1,52 @@ +diff --git a/ThirdParty/Minizip/minizip/miniunz.c b/ThirdParty/Minizip/minizip/miniunz.c +index 1931161..d7a8be1 100644 +--- a/ThirdParty/Minizip/minizip/miniunz.c ++++ b/ThirdParty/Minizip/minizip/miniunz.c +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + #include + + #ifdef _WIN32 +@@ -107,7 +108,7 @@ void change_file_date(filename,dosdate,tmu_date) + SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); + CloseHandle(hFile); + #else +-#ifdef unix || __APPLE__ ++#if defined(unix) || defined(__APPLE__) + struct utimbuf ut; + struct tm newdate; + newdate.tm_sec = tmu_date.tm_sec; +@@ -137,7 +138,7 @@ int mymkdir(dirname) + int ret=0; + #ifdef _WIN32 + ret = _mkdir(dirname); +-#elif unix ++#elif 1 + ret = mkdir (dirname,0775); + #elif __APPLE__ + ret = mkdir (dirname,0775); +diff --git a/ThirdParty/Minizip/minizip/minizip.c b/ThirdParty/Minizip/minizip/minizip.c +index e22f80d..548b6ca 100644 +--- a/ThirdParty/Minizip/minizip/minizip.c ++++ b/ThirdParty/Minizip/minizip/minizip.c +@@ -101,7 +101,7 @@ uLong filetime(f, tmzip, dt) + return ret; + } + #else +-#ifdef unix || __APPLE__ ++#if defined(unix) || defined(__APPLE__) + uLong filetime(f, tmzip, dt) + char *f; /* name of file to get info on */ + tm_zip *tmzip; /* return value: access, modific. and creation times */ +@@ -453,7 +453,7 @@ int minizip(argc,argv) + } + if( lastslash != NULL ) + { +- savefilenameinzip = lastslash+1; // base filename follows last slash. ++ savefilenameinzip = lastslash+1; + } + } + diff --git a/ports/fmilib/portfile.cmake b/ports/fmilib/portfile.cmake index 374c43f3d932bc..7556110492e5cd 100644 --- a/ports/fmilib/portfile.cmake +++ b/ports/fmilib/portfile.cmake @@ -8,13 +8,16 @@ vcpkg_from_github( HEAD_REF master PATCHES devendor-sublibs.diff + minizip.patch fix-mergestaticlibs.diff unofficial-export.diff ) -file(REMOVE RECURSE +file(GLOB vendored_minizip "${SOURCE_PATH}/ThirdParty/Minizip/minizip/*") +list(FILTER vendored_minizip EXCLUDE REGEX "/minizip.[ch]\$|/miniunz.[ch]\$") +file(REMOVE_RECURSE + ${vendored_minizip} "${SOURCE_PATH}/ThirdParty/Expat" - "${SOURCE_PATH}/ThirdParty/Minizip" "${SOURCE_PATH}/ThirdParty/Zlib" ) diff --git a/ports/fmilib/unofficial-fmilib-config.cmake b/ports/fmilib/unofficial-fmilib-config.cmake index 154b57aec962f5..3ad246ef9ac006 100644 --- a/ports/fmilib/unofficial-fmilib-config.cmake +++ b/ports/fmilib/unofficial-fmilib-config.cmake @@ -1,4 +1,4 @@ include(CMakeFindDependencyMacro) find_dependency(expat CONFIG) -find_dependency(minizip CONFIG) +find_dependency(unofficial-minizip CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/unofficial-fmilib-targets.cmake") diff --git a/ports/fmilib/vcpkg.json b/ports/fmilib/vcpkg.json index d2dac18800e5f9..55a9744902b446 100644 --- a/ports/fmilib/vcpkg.json +++ b/ports/fmilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmilib", "version": "2.4.1", - "port-version": 1, + "port-version": 2, "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.", "homepage": "https://www.fmi-standard.org/", "license": "BSD-3-Clause", diff --git a/ports/folly/fix-deps.patch b/ports/folly/fix-deps.patch index 20cd752d5fd7e4..64973de8307043 100644 --- a/ports/folly/fix-deps.patch +++ b/ports/folly/fix-deps.patch @@ -57,7 +57,7 @@ index 4b78e9f..ac83c99 100644 thread REQUIRED ) -+set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread ++set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread + ) list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES}) -list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index a55f678da21f24..3d6ec5b774096a 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2022.10.31.00", - "port-version": 5, + "port-version": 6, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 9d99127e5e63ae..4b74031f0636a8 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -4,12 +4,18 @@ vcpkg_download_distfile(GLIB_ARCHIVE FILENAME "glib-${VERSION}.tar.xz" SHA512 7ab8740925fa4ed2d860a35544c475ae905df5fa7fc0cc64ffa8c543df6073794e44c8ff39e3e1de1d677016ef9d27e9bc709d2505d13090faa8d6c47cd64bd0 ) +vcpkg_download_distfile(GLIB_MR_3386 + URLS "https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3386.diff" + FILENAME "glib-mr-3386.diff" + SHA512 cb67e8908a7cb6f945d019da1bf56f504b9c2131a832bcdfbdc61c973c89efd8e4380d5d67f83e229998da1e8579f3ff87b7695a3318eee9613d1ab1168bd0db +) vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${GLIB_ARCHIVE}" PATCHES use-libiconv-on-windows.patch libintl.patch + ${GLIB_MR_3386} ) vcpkg_list(SET OPTIONS) diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index e098105c7297a8..9bd2350f873d60 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.76.1", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-or-later", diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index cc9feda770f259..f9b309733b29d8 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.20.5", - "port-version": 5, + "port-version": 6, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -312,6 +312,13 @@ { "name": "ffmpeg", "default-features": false + }, + { + "name": "gstreamer", + "default-features": false, + "features": [ + "plugins-base" + ] } ] }, diff --git a/ports/gtkmm/portfile.cmake b/ports/gtkmm/portfile.cmake index 6f0fa06f3935f2..78652a8c9b93e7 100644 --- a/ports/gtkmm/portfile.cmake +++ b/ports/gtkmm/portfile.cmake @@ -1,7 +1,8 @@ +string(REGEX MATCH "^([0-9]*[.][0-9]*)" GTKMM_MAJOR_MINOR "${VERSION}") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/4.6/gtkmm-4.6.0.tar.xz" - FILENAME "gtkmm-4.6.0.tar.xz" - SHA512 d1040be44d133cfa016efc581b79c5303806d0d441b57dcc22bd84a05c3e7934f9b7b894e71d7f4a0be332daba3dd58ef558f58070b83bf8a9de7d1027d92199 + URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/${GTKMM_MAJOR_MINOR}/gtkmm-${VERSION}.tar.xz" + FILENAME "gtkmm-${VERSION}.tar.xz" + SHA512 ee40cce37c34814884ffc06e614013d23fa31cac51ea9d98ea5689a08acc2ff58bb2ca80ba822d6fe3c0f3bdcb9ce2596ede3c05c69a702b524c4e38afc3d9ab ) vcpkg_extract_source_archive( diff --git a/ports/gtkmm/vcpkg.json b/ports/gtkmm/vcpkg.json index 2f48e5df8f5276..4ce750b67cbf09 100644 --- a/ports/gtkmm/vcpkg.json +++ b/ports/gtkmm/vcpkg.json @@ -1,27 +1,16 @@ { "name": "gtkmm", - "version": "4.6.0", - "port-version": 2, + "version": "4.10.0", "description": "gtkmm is the official C++ interface for the popular GUI library GTK+.", "homepage": "https://www.gtkmm.org/", "license": "LGPL-3.0-or-later", "supports": "!uwp", "dependencies": [ - "atk", - "atkmm", - "cairo", "cairomm", "gdk-pixbuf", - "gettext", - "glib", - { - "name": "glib", - "host": true - }, "glibmm", "gtk", "libepoxy", - "pango", "pangomm", { "name": "vcpkg-tool-meson", diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake index 50956ea2457461..7574a81c3d183f 100644 --- a/ports/gtl/portfile.cmake +++ b/ports/gtl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/gtl - REF v1.1.5 - SHA512 87666a975d3e355d24463f31bd7fe9796eb9e90b557b678807432fc3797a2b501e76acefae490cbaa503f993efe7f44c04a7cc8bd48662c38293c90741c8f7df + REF "v${VERSION}" + SHA512 c6ab1ae6bfdee7f4fa49ab6ea27138cfe7159b5b0fb918a65f27cc7fff74e632f2567508453d1767bc406ac6286ff3a12edeffd185b5b2acf0ef304d4175b86e HEAD_REF main ) diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json index f67c086d2f7eb8..ddf392373726f4 100644 --- a/ports/gtl/vcpkg.json +++ b/ports/gtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtl", - "version": "1.1.5", + "version": "1.1.8", "description": "Greg's Template Library of useful classes.", "homepage": "https://github.com/greg7mdp/gtl", "license": "Apache-2.0", diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 1994af115b7aed..f7a5f30923882d 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -53,8 +53,10 @@ if(IMGUI_BUILD_DX12_BINDING) endif() if(IMGUI_BUILD_GLFW_BINDING) - find_package(glfw3 CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + if(NOT EMSCRIPTEN) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC glfw) + endif() target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_glfw.cpp) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index 1ea694a10beb46..ab1148fe3f5cae 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -5,7 +5,9 @@ cmake_policy(SET CMP0012 NEW) include(CMakeFindDependencyMacro) if (@IMGUI_BUILD_GLFW_BINDING@) - find_dependency(glfw3 CONFIG) + if (NOT "@EMSCRIPTEN@") + find_dependency(glfw3 CONFIG) + endif() endif() if (@IMGUI_BUILD_GLUT_BINDING@) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 44b9bda6e0c6bb..a22b2b18618ab1 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.89.4", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", @@ -49,7 +50,10 @@ "glfw-binding": { "description": "Make available GLFW binding", "dependencies": [ - "glfw3" + { + "name": "glfw3", + "platform": "!emscripten" + } ] }, "glut-binding": { diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index bffa9e8b6a5308..291c24bd2bf327 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - REF dfc5d361e6748d5f48b706e5c4ac949d133b5470 # v1.6.3 - PATCHES + FETCH_REF "v${VERSION}" + REF ae275c375477f207912113e5cf190fada78f3f90 # v2.0.1 ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index 11d6da3782242f..12175cd7f45778 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libgpiod", - "version": "1.6.3", - "port-version": 2, + "version": "2.0.1", "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 6106aae7f4955e..d1f7f2ac051165 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 06f6acfe735379b9c3bcf865285f6dba80611e90 #v1.15.1 - SHA512 46666ff26c45ed51fdf454fd0be440ac78d6d17571dcf49dd202299248ee28078b1a500b3768b9a391a32e005f021f626e4d0956f9fab6731d17503020c31031 + REF "v${VERSION}" + SHA512 966a95dacc12722d2dd37d449125c3df08f9e9be76ec2dc6762866bf285442c33836046df884b50cc14c799dfdcc1d5c9b16e4f9f36a2dbaf422df089756a234 HEAD_REF master PATCHES gdk-pixbuf.patch @@ -13,6 +13,7 @@ vcpkg_cmake_configure( OPTIONS -DWITH_EXAMPLES=OFF -DWITH_DAV1D=OFF + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -38,4 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libheif" "${CURRENT_PACKAGES_DI vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif_version.h" "#define LIBHEIF_PLUGIN_DIRECTORY \"${CURRENT_PACKAGES_DIR}/lib/libheif\"" "") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 306e2973024ebb..77fbb700757559 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libheif", "version": "1.15.1", + "port-version": 1, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/ports/libjpeg-turbo/usage b/ports/libjpeg-turbo/usage index ccd47717f7f1c6..c7be47b5aab1b3 100644 --- a/ports/libjpeg-turbo/usage +++ b/ports/libjpeg-turbo/usage @@ -1,5 +1,9 @@ -The package libjpeg-turbo is compatible with built-in CMake targets: +libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets: find_package(JPEG REQUIRED) - target_link_libraries(main PRIVATE ${JPEG_LIBRARIES}) - target_include_directories(main PRIVATE ${JPEG_INCLUDE_DIR}) + target_include_directories(main PRIVATE JPEG::JPEG) + +libjpeg-turbo provides CMake targets for the TurboJPEG C API: + + find_package(libjpeg-turbo CONFIG REQUIRED) + target_link_libraries(main PRIVATE libjpeg-turbo::turbojpeg) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 37cac9ea1238e6..16ac0ff48fcda4 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.5.1", + "port-version": 1, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/ports/libtorch/fix_werror.patch b/ports/libtorch/fix_werror.patch new file mode 100644 index 00000000000000..c952eca00f416a --- /dev/null +++ b/ports/libtorch/fix_werror.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e46275..b505ec5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -788,7 +788,6 @@ if(NOT MSVC) + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type") + string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers") + string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits") + string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds") diff --git a/ports/libtorch/portfile.cmake b/ports/libtorch/portfile.cmake index 29fe9815e9ebbb..16804028394b77 100644 --- a/ports/libtorch/portfile.cmake +++ b/ports/libtorch/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( fix-c10-glog.patch use-flatbuffers2.patch # check with codegen-flatc-mobile_bytecode fix-windows.patch # https://github.com/pytorch/pytorch/issues/87957 + fix_werror.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/caffe2/core/macros.h") # We must use generated header files diff --git a/ports/libtorch/vcpkg.json b/ports/libtorch/vcpkg.json index c704804d3509cc..2e0e8b9d1ccc0e 100644 --- a/ports/libtorch/vcpkg.json +++ b/ports/libtorch/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtorch", "version": "1.12.1", - "port-version": 2, + "port-version": 3, "description": "Tensors and Dynamic neural networks in Python with strong GPU acceleration", "homepage": "https://pytorch.org/", "license": null, diff --git a/ports/mathgl/fix-include-property.patch b/ports/mathgl/fix-include-property.patch new file mode 100644 index 00000000000000..1c15d38a1cac91 --- /dev/null +++ b/ports/mathgl/fix-include-property.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d44125c..1ad17a1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -53,6 +53,9 @@ generate_export_header(mgl EXPORT_FILE_NAME ../include/mgl2/dllexport.h) + target_link_libraries(mgl ${MGL_DEP_LIBS}) + target_link_libraries(mgl-static ${MGL_DEP_LIBS}) + ++target_include_directories(mgl PUBLIC $) ++target_include_directories(mgl-static PUBLIC $) ++ + mgl_po_src(${mgl_src} ${mgl_hdr}) + + if(MGL_HAVE_MPI) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 24ada6108252d9..2025773d74390a 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_sourceforge( fix-format-specifiers.patch fix-glut.patch fix-mgllab.patch + fix-include-property.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/addons/getopt") diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index e56b8c62f1d6c2..cb4503f2a54135 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mathgl", "version": "8.0.1", + "port-version": 1, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "license": "GPL-3.0-only", "supports": "!uwp", @@ -98,7 +99,14 @@ "png": { "description": "png module", "dependencies": [ - "libpng" + "libpng", + { + "name": "mathgl", + "default-features": false, + "features": [ + "zlib" + ] + } ] }, "qt5": { diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 6dbe24e074cfd2..feec2312c1ce91 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -134,4 +134,8 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() +if(FEATURES STREQUAL "core") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() + vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/docs/license.rst") diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 14652411688d8b..b652de2bf5d458 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mesa", "version": "23.0.1", + "port-version": 1, "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", @@ -111,7 +112,16 @@ ] }, "offscreen": { - "description": "Build with support for offscreen rendering (OSMesa)" + "description": "Build with support for offscreen rendering (OSMesa)", + "dependencies": [ + { + "name": "mesa", + "default-features": false, + "features": [ + "opengl" + ] + } + ] }, "opengl": { "description": "Build support for OpenGL (all versions)", diff --git a/ports/microsoft-signalr/find-msgpack.patch b/ports/microsoft-signalr/find-msgpack.patch new file mode 100644 index 00000000000000..882c85bfc560cf --- /dev/null +++ b/ports/microsoft-signalr/find-msgpack.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676cde2..4562873 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,8 +45,8 @@ set(JSONCPP_LIB "jsoncpp_static" CACHE STRING "jsoncpp target name") + endif() + + if(USE_MSGPACK) +- find_package(msgpack CONFIG REQUIRED) +- set(MSGPACK_LIB "msgpackc-cxx") ++ find_package(msgpack-cxx CONFIG REQUIRED) ++ set(MSGPACK_LIB "msgpack-cxx") + endif() + + include_directories (include) diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index 3b71eafec9f7e4..6b54407b2dcef8 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp - REF v0.1.0-alpha4 + REF "v${VERSION}" SHA512 b87c94e8bc81781c1cfb4292f1fe3ce046a5f192a25c02104f454b533349c1c0ed965570bd749b496bb316ccb89ae51c5e7461ffa06055e71dac659fbde79456 HEAD_REF main + PATCHES find-msgpack.patch ) vcpkg_check_features( @@ -31,7 +32,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/share/microsoft-signalr) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(COPY "${SOURCE_PATH}/third-party-notices.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index cfe52d05ac95fb..4e0c4fca712b0d 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 3, + "port-version": 4, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", "dependencies": [ diff --git a/ports/minitrace/CMakeLists.txt b/ports/minitrace/CMakeLists.txt deleted file mode 100644 index fcae7841ef5717..00000000000000 --- a/ports/minitrace/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(minitrace C) - -set(minitrace_HEADERS minitrace.h) -set(minitrace_SOURCES minitrace.c) - -add_library(minitrace ${minitrace_SOURCES}) - -# Install headers -install(FILES ${minitrace_HEADERS} DESTINATION include/minitrace) - -# Install minitrace -install( - TARGETS minitrace EXPORT minitraceConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) - -# Export config file for minitrace -export( - TARGETS minitrace - NAMESPACE minitrace:: - FILE "${CMAKE_CURRENT_BINARY_DIR}/minitrace-config.cmake" -) - -# Install config file -install( - EXPORT minitraceConfig - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/minitrace" - NAMESPACE minitrace:: -) diff --git a/ports/minitrace/portfile.cmake b/ports/minitrace/portfile.cmake index 06b43396e63a04..b5a4b5a6edb01b 100644 --- a/ports/minitrace/portfile.cmake +++ b/ports/minitrace/portfile.cmake @@ -1,15 +1,11 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hrydgard/minitrace - REF a48215c409dd848fa0a76c5eb4dfaba4ca3bca39 - SHA512 591fa52132b6bbe8e7e121526a43d07056deff8fe026227c1a4c26bebf95536e5d68750fa8551d23afebf048fe8b8503017b9a93650e18a992cf2e5678d46135 + REF a45ca4f58c8af2fc4d4d6042e68aa68bfea422c9 + SHA512 5ea6fb58a1f2397444e58e449fd32b4b45f5a15afe8f8694115a0025f5444cf493ba8228a58f0772ca1dc149fd1633fc897b0a264b8927cfd6cc15eefa40c336 HEAD_REF master ) -file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ) diff --git a/ports/minitrace/vcpkg.json b/ports/minitrace/vcpkg.json index cb27c98a27b8e4..8c09d532070baa 100644 --- a/ports/minitrace/vcpkg.json +++ b/ports/minitrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "minitrace", - "version-string": "2019.02.06", - "port-version": 2, + "version-date": "2023-04-23", "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.", "dependencies": [ { diff --git a/ports/minizip/CMakeLists.txt b/ports/minizip/CMakeLists.txt index 313450b96294bf..bcf284b4e5686a 100644 --- a/ports/minizip/CMakeLists.txt +++ b/ports/minizip/CMakeLists.txt @@ -1,104 +1,111 @@ -cmake_minimum_required(VERSION 3.8) -project(minizip VERSION 1.2.13 LANGUAGES C) +cmake_minimum_required(VERSION 3.25) +project(minizip LANGUAGES C) if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) endif() -find_package(ZLIB REQUIRED) -set(MIN_SRC contrib/minizip) - -include_directories(${MIN_SRC} ${ZLIB_INCLUDE_DIRS}) - -set(MINIZIP_LIBRARIES ZLIB::ZLIB) -if(ENABLE_BZIP2) - message(STATUS "Building with bzip2 support") - find_package(BZip2) - - include_directories(${BZIP2_INCLUDE_DIR}) - set(MINIZIP_LIBRARIES ${MINIZIP_LIBRARIES} ${BZIP2_LIBRARIES}) -else() - message(STATUS "Building without bzip2 support") -endif() - set(SRC - ${MIN_SRC}/ioapi.c - ${MIN_SRC}/unzip.c - ${MIN_SRC}/zip.c - ${MIN_SRC}/mztools.c + ioapi.c + unzip.c + zip.c + mztools.c ) -if(WIN32) - list(APPEND SRC ${MIN_SRC}/iowin32.c) -endif() - set(HEADERS - ${MIN_SRC}/crypt.h - ${MIN_SRC}/ioapi.h - ${MIN_SRC}/unzip.h - ${MIN_SRC}/zip.h - ${MIN_SRC}/mztools.h + crypt.h + ioapi.h + unzip.h + zip.h + mztools.h ) if(WIN32) - list(APPEND HEADERS ${MIN_SRC}/iowin32.h) + list(APPEND SRC iowin32.c) + list(APPEND HEADERS iowin32.h) endif() add_library(minizip ${SRC}) +target_include_directories(minizip PUBLIC $) -target_link_libraries(minizip PRIVATE ZLIB::ZLIB) +find_package(ZLIB REQUIRED) target_compile_definitions(minizip PRIVATE -D_ZLIB_H) +target_link_libraries(minizip PUBLIC ZLIB::ZLIB) +set(MINIZIP_REQUIRES zlib) if(ENABLE_BZIP2) - target_link_libraries(minizip PUBLIC ${BZIP2_LIBRARIES}) + message(STATUS "Building with bzip2 support") + find_package(BZip2 REQUIRED) target_compile_definitions(minizip PRIVATE -DHAVE_BZIP2=1) + target_link_libraries(minizip PUBLIC BZip2::BZip2) + list(APPEND MINIZIP_REQUIRES bzip2) +else() + message(STATUS "Building without bzip2 support") endif() + if(ANDROID) target_compile_definitions(minizip PRIVATE IOAPI_NO_64) endif() + if(NOT DISABLE_INSTALL_TOOLS) - add_executable(minizip_bin ${MIN_SRC}/minizip.c) - add_executable(miniunz_bin ${MIN_SRC}/miniunz.c) + add_executable(minizip_bin minizip.c) + add_executable(miniunz_bin miniunz.c) - target_link_libraries(minizip_bin minizip ${MINIZIP_LIBRARIES}) - target_link_libraries(miniunz_bin minizip ${MINIZIP_LIBRARIES}) + target_link_libraries(minizip_bin minizip) + target_link_libraries(miniunz_bin minizip) set_target_properties(minizip_bin PROPERTIES OUTPUT_NAME minizip) set_target_properties(miniunz_bin PROPERTIES OUTPUT_NAME miniunz) + + install ( + TARGETS minizip_bin miniunz_bin + RUNTIME DESTINATION bin + ) endif() install( TARGETS minizip - EXPORT minizipTargets + EXPORT unofficial-minizipTargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) include(CMakePackageConfigHelpers) -write_basic_package_version_file("${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" - COMPATIBILITY SameMajorVersion) +write_basic_package_version_file("${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake" + VERSION "${PACKAGE_VERSION}" + COMPATIBILITY SameMajorVersion +) -configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/minizipConfig.cmake.in - minizipConfig.cmake - INSTALL_DESTINATION share/minizip) +configure_package_config_file(unofficial-minizipConfig.cmake.in + unofficial-minizipConfig.cmake + INSTALL_DESTINATION share/unofficial-minizip +) install(FILES - "${PROJECT_BINARY_DIR}/minizipConfig.cmake" - "${PROJECT_BINARY_DIR}/minizipConfigVersion.cmake" - DESTINATION share/minizip + "${PROJECT_BINARY_DIR}/unofficial-minizipConfig.cmake" + "${PROJECT_BINARY_DIR}/unofficial-minizipConfigVersion.cmake" + DESTINATION share/unofficial-minizip ) -install(EXPORT minizipTargets - NAMESPACE minizip:: - DESTINATION share/minizip +install(EXPORT unofficial-minizipTargets + NAMESPACE unofficial::minizip:: + DESTINATION share/unofficial-minizip ) -if(NOT DISABLE_INSTALL_TOOLS) - install ( - TARGETS minizip_bin miniunz_bin - RUNTIME DESTINATION tools/minizip - ) -endif() - if(NOT DISABLE_INSTALL_HEADERS) install(FILES ${HEADERS} DESTINATION include/minizip) endif() + +list(JOIN MINIZIP_REQUIRES " " MINIZIP_REQUIRES) +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/minizip.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc" + @ONLY +) +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/minizip.pc" + DESTINATION lib/pkgconfig +) + diff --git a/ports/minizip/minizipConfig.cmake.in b/ports/minizip/minizipConfig.cmake.in index 17fc694e774080..4527b18d6f5ffa 100644 --- a/ports/minizip/minizipConfig.cmake.in +++ b/ports/minizip/minizipConfig.cmake.in @@ -1,12 +1,10 @@ -#@PACKAGE_INIT@ +message(WARNING "'find_package(minizip CONFIG)' is deprecated. Please use 'find_package(unofficial-minizip CONFIG)' instead.") include(CMakeFindDependencyMacro) - -find_dependency(ZLIB) - -if (@ENABLE_BZIP2@) - find_dependency(BZip2) +find_dependency(unofficial-minizip ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG) +if(NOT TARGET unofficial::minizip::minizip) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) +elseif(NOT TARGET minizip::minizip) + add_library(minizip::minizip INTERFACE IMPORTED) + set_target_properties(minizip::minizip PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::minizip::minizip) endif() - -include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -check_required_components("@PROJECT_NAME@") \ No newline at end of file diff --git a/ports/minizip/pkgconfig.patch b/ports/minizip/pkgconfig.patch new file mode 100644 index 00000000000000..107f9fc323831d --- /dev/null +++ b/ports/minizip/pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in +index 69b5b7f..9e43084 100644 +--- a/contrib/minizip/minizip.pc.in ++++ b/contrib/minizip/minizip.pc.in +@@ -8,5 +8,5 @@ Description: Minizip zip file manipulation library + Requires: + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lminizip +-Libs.private: -lz ++Requires.private: @MINIZIP_REQUIRES@ + Cflags: -I${includedir} diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index b929116f53a9e7..1e79583b13cd1e 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -12,38 +12,47 @@ vcpkg_from_github( 0001-remove-ifndef-NOUNCRYPT.patch 0002-add-declaration-for-mkdir.patch 0003-no-io64.patch + pkgconfig.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES bzip2 ENABLE_BZIP2 + INVERTED_FEATURES + tools DISABLE_INSTALL_TOOLS ) -configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY) -configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipConfig.cmake.in" + DESTINATION "${SOURCE_PATH}/contrib/minizip" +) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/contrib/minizip" OPTIONS ${FEATURE_OPTIONS} - -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS} + -DPACKAGE_VERSION=${VERSION} OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON + -DDISABLE_INSTALL_TOOLS=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-minizip) +vcpkg_fixup_pkgconfig() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES minizip miniunz AUTO_CLEAN) +endif() if ("bzip2" IN_LIST FEATURES) file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") foreach(HEADER ${HEADERS}) - file(READ "${HEADER}" _contents) - string(REPLACE "#ifdef HAVE_BZIP2" "#if 1" _contents "${_contents}") - file(WRITE "${HEADER}" "${_contents}") + vcpkg_replace_string("${HEADER}" "#ifdef HAVE_BZIP2" "#if 1") endforeach() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/minizipConfig.cmake" @ONLY) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt") diff --git a/ports/minizip/unofficial-minizipConfig.cmake.in b/ports/minizip/unofficial-minizipConfig.cmake.in new file mode 100644 index 00000000000000..f2afcbb32ea402 --- /dev/null +++ b/ports/minizip/unofficial-minizipConfig.cmake.in @@ -0,0 +1,10 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +if ("@ENABLE_BZIP2@") + find_dependency(BZip2) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-minizipTargets.cmake") +check_required_components(unofficial-minizip) diff --git a/ports/minizip/usage b/ports/minizip/usage index 38a6340661d627..6113742b8d0051 100644 --- a/ports/minizip/usage +++ b/ports/minizip/usage @@ -1,4 +1,4 @@ minizip provides CMake targets: - find_package(minizip CONFIG REQUIRED) - target_link_libraries(main PRIVATE minizip::minizip) + find_package(unofficial-minizip CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::minizip::minizip) diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index 89f610ccccff40..c9fca5c565c895 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,7 +1,8 @@ { "name": "minizip", "version-semver": "1.2.13", - "description": "Zip compression library", + "port-version": 1, + "description": "Minizip zip file manipulation library", "homepage": "https://github.com/madler/zlib", "license": "Zlib", "supports": "!uwp", @@ -22,6 +23,10 @@ "dependencies": [ "bzip2" ] + }, + "tools": { + "description": "Install tools", + "supports": "!ios" } } } diff --git a/ports/python3/0012-force-disable-curses.patch b/ports/python3/0012-force-disable-curses.patch index d0986e80d8dedb..01e5dcf15bb3bc 100644 --- a/ports/python3/0012-force-disable-curses.patch +++ b/ports/python3/0012-force-disable-curses.patch @@ -1,5 +1,14 @@ +From 08599a02debaa2ea015d1221dd2c8ca0481640a3 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:09 +0000 +Subject: [PATCH 12/14] force disable curses + +--- + Modules/Setup | 4 ++++ + 1 file changed, 4 insertions(+) + diff --git a/Modules/Setup b/Modules/Setup -index 87c6a15..7ad53f5 100644 +index 87c6a152f8..7ad53f5b4f 100644 --- a/Modules/Setup +++ b/Modules/Setup @@ -375,3 +375,7 @@ xxsubtype xxsubtype.c @@ -10,3 +19,6 @@ index 87c6a15..7ad53f5 100644 +*disabled* +_curses +_curses_panel +-- +2.25.1 + diff --git a/ports/python3/0013-configure-no-libcrypt.patch b/ports/python3/0013-configure-no-libcrypt.patch index dfeb9b77b76f8e..f75ac86c3004c6 100644 --- a/ports/python3/0013-configure-no-libcrypt.patch +++ b/ports/python3/0013-configure-no-libcrypt.patch @@ -1,8 +1,18 @@ +From f2c5695f17ec59f4badd374daabccf362bbd5f24 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:22 +0000 +Subject: [PATCH 13/14] configure no libcrypt + +--- + configure | 3 +++ + configure.ac | 3 +++ + 2 files changed, 6 insertions(+) + diff --git a/configure b/configure -index 15c7c54b0953..70f28b0c7064 100755 +index bad619963a..c443360280 100755 --- a/configure +++ b/configure -@@ -13227,6 +13227,8 @@ done +@@ -13239,6 +13239,8 @@ done # We search for both crypt and crypt_r as one or the other may be defined # This gets us our -lcrypt in LIBS when required on the target platform. @@ -11,7 +21,7 @@ index 15c7c54b0953..70f28b0c7064 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5 $as_echo_n "checking for library containing crypt... " >&6; } if ${ac_cv_search_crypt+:} false; then : -@@ -13368,6 +13370,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +@@ -13380,6 +13382,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -20,10 +30,10 @@ index 15c7c54b0953..70f28b0c7064 100755 for ac_func in clock_gettime do : diff --git a/configure.ac b/configure.ac -index 6c65b2914bf6..afdc68363cea 100644 +index cc69015b10..a6c72c1014 100644 --- a/configure.ac +++ b/configure.ac -@@ -4085,6 +4085,8 @@ AC_CHECK_FUNCS(setpgrp, +@@ -4056,6 +4056,8 @@ AC_CHECK_FUNCS(setpgrp, # We search for both crypt and crypt_r as one or the other may be defined # This gets us our -lcrypt in LIBS when required on the target platform. @@ -32,7 +42,7 @@ index 6c65b2914bf6..afdc68363cea 100644 AC_SEARCH_LIBS(crypt, crypt) AC_SEARCH_LIBS(crypt_r, crypt) -@@ -4099,6 +4101,7 @@ char *r = crypt_r("", "", &d); +@@ -4070,6 +4072,7 @@ char *r = crypt_r("", "", &d); [AC_DEFINE(HAVE_CRYPT_R, 1, [Define if you have the crypt_r() function.])], []) ) @@ -40,3 +50,6 @@ index 6c65b2914bf6..afdc68363cea 100644 AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ +-- +2.25.1 + diff --git a/ports/python3/0014-fix-get-python-inc-output.patch b/ports/python3/0014-fix-get-python-inc-output.patch new file mode 100644 index 00000000000000..a20d2673ac1949 --- /dev/null +++ b/ports/python3/0014-fix-get-python-inc-output.patch @@ -0,0 +1,44 @@ +From b6ffa6e7a0f7a013fb111e618a7f7e2c58e9d548 Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III +Date: Wed, 26 Apr 2023 05:17:44 +0000 +Subject: [PATCH 14/14] fix get python inc output + +--- + Lib/distutils/sysconfig.py | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py +index 3414a761e7..e6ae456ee9 100644 +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -45,7 +45,7 @@ + get_makefile_filename, + get_python_version, + ) +- ++from os.path import dirname + # This is better than + # from sysconfig import _CONFIG_VARS as _config_vars + # because it makes sure that the global dictionary is initialized +@@ -292,6 +292,7 @@ def get_python_inc(plat_specific=0, prefix=None): + incdir = os.path.join(get_config_var('srcdir'), 'Include') + return os.path.normpath(incdir) + python_dir = 'python' + get_python_version() + build_flags ++ prefix = dirname(dirname(BASE_PREFIX)) + return os.path.join(prefix, "include", python_dir) + elif os.name == "nt": + if python_build: +@@ -299,7 +300,9 @@ def get_python_inc(plat_specific=0, prefix=None): + # pyconfig.h + return (os.path.join(prefix, "include") + os.path.pathsep + + os.path.join(prefix, "PC")) +- return os.path.join(prefix, "include") ++ python_dir = 'python' + get_python_version() + build_flags ++ prefix = dirname(dirname(BASE_PREFIX)) ++ return os.path.join(prefix, "include", python_dir) + else: + raise DistutilsPlatformError( + "I don't know where Python installs its C header files " +-- +2.25.1 + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 14248aaaa705a5..bc07fbdea13f9f 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -18,6 +18,7 @@ set(PATCHES 0010-dont-skip-rpath.patch 0012-force-disable-curses.patch 0013-configure-no-libcrypt.patch # https://github.com/python/cpython/pull/28881 + 0014-fix-get-python-inc-output.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index a45ff7f8fdb60f..41d65148f7aed9 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.7", - "port-version": 5, + "port-version": 6, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 657c7bc9f98986..8dc3f6ffb37c84 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index 40ed73730f1419..ba49d4348fa3f1 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 6c5f53c8c2d728..7f6f038dc268e2 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5compat", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index c17be503fee78d..d29d4885dc9783 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.4.3", + "version": "6.5.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/bump-cmake-version.patch b/ports/qtapplicationmanager/bump-cmake-version.patch deleted file mode 100644 index 31b99c71d204ff..00000000000000 --- a/ports/qtapplicationmanager/bump-cmake-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2236c0..904c5b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - --cmake_minimum_required(VERSION 3.16) -+cmake_minimum_required(VERSION 3.19) - - include(.cmake.conf) - project(QtApplicationManager # special case diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 2a9e77ca64892f..7280aff8a30572 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -2,7 +2,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES - bump-cmake-version.patch wrapper-fixes.patch stack-walker-arm64.patch ) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 03da0c873efbcb..89a90416ce3c72 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/clang-cl_QGADGET_fix.diff b/ports/qtbase/clang-cl_QGADGET_fix.diff index 37bec5f9fccc46..0304bcc47dee87 100644 --- a/ports/qtbase/clang-cl_QGADGET_fix.diff +++ b/ports/qtbase/clang-cl_QGADGET_fix.diff @@ -4,7 +4,7 @@ index e40cd85..ba68a01 100644 +++ b/src/corelib/kernel/qmetatype.h @@ -18,6 +18,7 @@ #endif - #include + #include +#include #include diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 6d0a9527e26470..3811da601f3751 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -2,12 +2,12 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 823b2057b..4a8cd4fa8 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h -@@ -49,8 +49,8 @@ +@@ -16,8 +16,8 @@ #include --#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) -+#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) +-#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval) #include #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 7a553973e32e9e..c6393713a664f1 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -150,6 +150,7 @@ function(qt_cmake_configure) ${disable_parallel} OPTIONS -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings. + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. #-DQT_HOST_PATH= # For crosscompiling #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index f8796f3f322183..e61e3068fc6c48 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,50 +1,48 @@ -set(qtbase_HASH "a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43") -set(qttools_HASH "24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382") -set(qtdeclarative_HASH "ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2") -set(qtsvg_HASH "75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0") -set(qt5compat_HASH "22e3d6360afdb83b4bd122153cf3bba09d8593dbdd65ccf5b80e032b9de437f868b05c7170e636fd6bd8f42dd1eb56b07f21b73fd0c4a5437fcb72aa070d830b") -set(qtshadertools_HASH "11d6111c4b645d2d31b19c6cf788726546f484bd9c6a3940bdb2ce82f76eecf56a47655065fb87bf488a12968ea26e48e4c0c8b3ff9d702339bd497bef31630e") -set(qtquicktimeline_HASH "8310e0b360859e59157b5968647a5bb82bfd09f2f61c1b289669e551781e8fd1285f3efb8ed1324013ad14b192f0d9963c8584cfec98a136c82f5956ac1de9ae") -set(qtquick3d_HASH "511c8585ea8686b1e1cf2e3dd47ac5650ba312d583da7e86dc86aaff6769a5751e3d75ff3fd07664098ba6488f75c9dab68d060b0394ad0182c35c44b5306970") -set(qttranslations_HASH "200dd7418263474be95de25023ddd881f1cbc46fe4a0767aa33733414564aef9615b36429f511698d012704c4e94088026b3d9e454d9078e8975b48119c45c0d") -set(qtwayland_HASH "15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4") -set(qtdoc_HASH "a96f9112b9ad557695779ee2039ad3ff93c8476d0f6fa7eff7177f0a05f4089d8b25030795f1428fe69a7423151241022a6bee812e6dcc5b047e13d39934e405") -set(qtcoap_HASH "43dae7eaa19811aeeb5c140949421c2449671e71cfc8d553bd608e6bbdf344a4bd58b2a3405d51b3e621c1b817487b0adf87e51841f237a2ae6df96573a6c735") -set(qtopcua_HASH "c7664a438323653e809dccfbaf81717c4abcbabc552bf678461ee28bef05bed78d4c4e1c520f08d334f4f45bb4777831de20cbcc1d5e242ddbc63d5a2f4df709") -set(qtimageformats_HASH "8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36") -set(qtmqtt_HASH "e0de3d3a3c12ac7c407f002b6e680583c1d9ca437013ce277f18cb0de97b39269c6eb45ca3de46589de9177d8c62ea4020d55a514ace4667e8ff3e7780df5f2d") -set(qtnetworkauth_HASH "ccb488646f450541ce8546463c99d45d567339f676948e62c013fc0d7588af408c617bb0bec1d122b3fcb42e79d5ce04f5f779ad6d515fa9f223af70f06c84d9") -set(qt3d_HASH "d283e42effdb1b7199e4bf6fba3769b0ba3358b855d166fcad00cfc71858a5e71324e902d4ce163137a18b413c4463967563825ee8b902142c4c7559ff08efe5") -set(qtactiveqt_HASH "5fa17905697d1dbda9852b9f2555348e1c5fb428062806b5b78db22924927ebcf4db4932c04de155f517caf08487fb74d6afa30a223ed762bb46df61552ae149") -set(qtdatavis3d_HASH "0d687d29b20bf80a4274267c94bdfbf64048764f213dbf98361a00ee98c85bb2a3c25c1fe4aa17fc4d981cd54ea727bd0cec884b4fdb7e245f1801fc917a9123") -set(qtdeviceutilities_HASH "936a73e571f79c6c499b2c0705414ebb6eb45bb9209af6db9183285f37d81d8caac3c273ca1695f3cc1bf637a42c96242eb83b1f2034b5e9f0bcaa211368e85b") -set(qtlottie_HASH "1a3e7a462a1a886dfe556816dcb7811f0488ccca64106aebcc8178951f9e3db78dfd977c81b2eaa003b2ceddbd5d42bd1753fda80ad5562cf3e38699eafd1d0f") -set(qtscxml_HASH "0d6b31b1c5f29f19fb15ee5a77e100c5df122f1ccba6229131456f4d66ee99978b0392a0f3c61ae1e31923041a973e80dc23df7814ed704a4d80d75b60741fac") -set(qtvirtualkeyboard_HASH "943a96a35df368d63102b296c7e173d9d2929665c86044c33b1eec7bdc42f7fd6d6e5ed2f75caf582ecdb6cba5738d52121d3ed466cc26f1da58c36ea3a32a4f") -set(qtcharts_HASH "369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994") -set(qtconnectivity_HASH "2d5f0c6ca5ed5e0a8ef056344441b2828834a334129e337d51596c774f0e121e9f393a6a2f7ca24b8186ee28e8d398316abdf3f32fda6cd097c3139d92dd30aa") -set(qtpositioning_HASH "ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7") -set(qtmultimedia_HASH "1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5") -set(qtremoteobjects_HASH "019bc17922eb72b2bb79d527c1d53bcf7f5b67f66a33ab79cd10391099de671eb3b7f978b8b493a560c6c943587b0a942f887f4ddeb87860ca3e6e30f30541be") -set(qtsensors_HASH "a1a39ab73cb15384fa29e62d8193e796bfb5e8349fd85eff106e9fb6fd45677db39f200f5b8e47be268c34d8ff35142e608adc33b85cd4dcc5180f5c3220deba") -set(qtserialbus_HASH "1ec94eebbb1e123ebcb353577f8de33710d623df364492ad33cb949ba81b36b4dfbbccbbce394d766fab2434ccc561dc47dc5d5b95b986160bf21096c78a77b4") -set(qtserialport_HASH "4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4") -set(qtwebchannel_HASH "6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3") -set(qtwebengine_HASH "e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39") -set(qtwebsockets_HASH "231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3") -set(qtwebview_HASH "585b73cb0ca6a9e8b9fd16c92720e3bb7535bf142049c9453cf9f479b656827d450885e6bc1b09c0f8c9462f80f722f58a388f283d2b132cf83936e28c6f217a") -set(qtinterfaceframework_REF 35892bfbfa4c405bba2a648d1a4d4d17b1bc62b2) -set(qtapplicationmanager_HASH "2771edec2d8195158fcdfaaa08641db7363695e569e100fc0a949300b6616403bc1c8946526d3e6f0ec0a20b0e117c0bcd0b0d7f8fc09dfe3e6bc95326ff9f30") -set(qtlanguageserver_HASH "291239b61470c86cc1d371a533ddb4f8c289590831d3f835cff551dd24049061dcab7bdade904a1397f2c3cc8701747bc2568bad1d034ed8c51aad04257a83fa") -set(qthttpserver_HASH "25dfb101dd57143ee97122c46a8fd85668d16c0b7520285f72ea37db6d9e0c43876a3d5c1016ecc4cb4ec08f2ed9813afbaa1b4812e6816159b11d620bb8dadf") -set(qtquick3dphysics_REF fc155dd34fa53a8c7520f1c150a2b8eeb4c760c3) -set(qtspeech_HASH "f101c9a27b300f5b7dfb502f342dc565f206a119f667d02ed23ec0103a2d0d8025d15bccb42bacd238853f695523691dc22e1a4b703f0ea13aab0922c922cb1f") - -# Not in newer releases -set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") +set(qtbase_HASH "29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3") +set(qttools_HASH "fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd") +set(qtdeclarative_HASH "df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00") +set(qtsvg_HASH "ef317b9b3621b5554df20bc570b67392f9c0ab37929b4c9dc0e9902c1b63763aff5d9bdf50b50f7c0a3c9f74c513a53553744dda68d8d29f593fc70f787f1009") +set(qt5compat_HASH "097f6cda4dee6eac8dd224d8539c26c1c016cb065f1718040f1b8e0b230b562f9b46f05d20655d30fe719d0886e02961a6dfbe7226d0dcc30f7145fe2f32a000") +set(qtshadertools_HASH "da62ec1ea4d20f91d83cfbbfc3cc25feb87051a1c2af58fd50afe4ee42b2fce9bb645e59291beb5893ec5dc7c0cb9d1defea0e90d7023c175e30c34dac13cdc5") +set(qtquicktimeline_HASH "80e1a979f86f68a817d5138a3e3033a3934123e72dad58bfad6383430ab24a7f1010e76cd41e549f00baeca6be76f2f17bff6b39855d0e5c47b003c59e5b1d55") +set(qtquick3d_HASH "84e5e7015596c035a74f94ec2c6ea254c820b7c4bdc730ec487642108eb6e948867aae1033314a7a4cf0fc37db673537008ec1a44079594acd76ecbaf475c467") +set(qttranslations_HASH "aa10c2e6937597805e385e52e36cc3dcecf0980a80d34fe8b642b7f830f1667e8c6b9aec17019cba7d2f3fe2f640c794a96f834ed8d4cb782f7fa73954ad892d") +set(qtwayland_HASH "d0a9b3cb5f93b99b20eca98512ebc8b6b8453df822e2aad7cd38169cd22ab1661ac0fc14223679174e8dbeaa63c2f3013287fef1b8ef620aa23ff6abbb6b730e") +set(qtdoc_HASH "59ff6e9afe4635e437b26fd37fd4c88a8ddb5b8f1e3903615c3b9687e973f4287863ad0075595c00b212ea10ab9c446c277446d82948108745e2ba71cd37fe21") +set(qtcoap_HASH "b90d5f79045f0c5cb441d4888265b2048ee28e977bc8c4e3d600e61c2eb07698ced2d97b40b1e44ca3e3e168b6580fdbd43fdd892da4ca6503f85055812dc8d7") +set(qtopcua_HASH "f362750263db27cc64df0a2bb1a12cc07ddbc332553e7f54cecb103126b79d86e9dcf3da82a37da423d3b3124bd4b4e2ccd0aeb3413c49334064cd9f39124246") +set(qtimageformats_HASH "2456f6e85baccc933f275e2d1f0e1ee75ef6816b811d52544345b208e19755d9a9ced5fd314d47744d894bd0395c0b9f9792b739d021f90fa67e7c3c08b9f751") +set(qtmqtt_HASH "45aa0d834eae5d5264e5571d4c2f37ba842933b212dd6ca16af38123f848151e43b1a47b99f723b911fa52f1a58b1d601b8c76950ab07f68e04665e73d6c59ed") +set(qtnetworkauth_HASH "bf18b3a677306ff4d3dd0e9f579f36a14f6b8b51134c45c2e0cd1988c453b5ca52dd0cda9189f6f41050e6d6ea1fe27872099db5af0d3616de7751e4f25c34c0") +set(qt3d_HASH "875e1e3a94de59d9b1a2eb94c0a289b76ac7c2163075447d6fed9dbb32846242300f52d5c141d985ce89437e012af43171f2bd2f640e527a370800b51b83b344") +set(qtactiveqt_HASH "e1a3d412cb51eac6cd3b107a0aba710edbb84720c5ee2d2908b8fbfa01e464b68698d09c9e0ea2e76dbf3cb0eed5ae04907d97c1ce17d487767c66e8b0738698") +set(qtdatavis3d_HASH "9f57efebe40baa2ff1fdce049f4bab6383bda76519e86ac36d0cc45e4a43f4503b22294efe8dbe80d14971260bfbf3ad1fe2a11b00edae65f678358c75e23397") +set(qtdeviceutilities_HASH "31c6be3de9dc19f9b8549cee1231ae99e935f4d186e51113bca3f69a8ac75b183993d0954ca6f81ecfe7eff9d62bdd7821ecbf34328cbfa4359ec06ca69459d1") +set(qtlottie_HASH "ed60cb385a4a252f1bc3ceb64fa9a62babdd12a7595fd61c847e9a363d8c91f897603d1cdfe11585e7bcbf303ccc273ad1b51af1cbda17e31335e95c76585942") +set(qtscxml_HASH "21933952c5eecce2cfe45c8c7b50d249b71f49538ee6736a7180534abd44b6032ea9e4d2aa9b658b78f60ffd61cd065046da6df5abed13483237e8d8dcd9fe56") +set(qtvirtualkeyboard_HASH "5d9b0936d937ee8a18a3badb6418dff66b7b600a71329b3ea9fe399b43d89745633d6a2ea7b7199cd9c25a6751bfec60a91d8364285334a98e61b2cf27421d31") +set(qtcharts_HASH "6b9b5081ae96af7fa122b6d9b59334d2bc69ebb44e91e544d39d62b570fa0cf763494162f7aa5c6960fbcd1197e856b19c2b278713e1d5e843e30fb25d9a2648") +set(qtconnectivity_HASH "8113dfb556d29c7e3cbac197498b532beba6a22fdfafe6d5fa778be11e8f83b318d06f6e159002c3e1bda39adae173dd2df06b819ca04066cc5a536b80da882b") +set(qtpositioning_HASH "c4ba9c6a1b73eb5db74eb405d2a5814e18309ad353536116bbf9042aa58d31607683593d797b78e662bb246941baa61f1856357b1a6c2fc1bf0a7bcf18fe921e") +set(qtlocation_HASH "e0b0c8f4093436aa53661fbcea885ee86565ff8e61bae4b567be24e7251e56b77071b78e160903ddc487b36931ce6f1a525c74135cd360cdd1d189da4463a96d") +set(qtmultimedia_HASH "fe0dd9a534d30fa47129c4dbefb789ce1fc5b3d2a59b7583c986262a26a0638e2147edc77cf7c484af9c01acce9aaccaaa4a406c12bde324555790a956859341") +set(qtremoteobjects_HASH "a917d766538040706d5bb78590bd2a577a98759ebfd516dce9c55d3c5a34411907e55de9da04d47f2b37e927541b915802fa66fceb03826c88bed4f8e8e75fa9") +set(qtsensors_HASH "1daf326529075d978a6deda1ed2f77f4c32468962fae44837ad7f54c6052ae2ac475df6e40f954375d0d7a1bd1ce3c7947668f1a726fca2556fab5e972f08805") +set(qtserialbus_HASH "ad92c88e13da77477eb9bc9a1b81ef316c56ea456ed962e010ef8e1e00409d12c7527b1230447ad9a2fa18f6737a8ab84a37712bc948dda7f1b0acb388c2dda8") +set(qtserialport_HASH "6d20025bedcd4f049f99efc775380d1d3578daa59e8f008961fa0e5c495d57992265917fad5471b917f60a4eb4e72491184e1281021320aed94cbedde22f2d71") +set(qtwebchannel_HASH "146bf4b190a5d9af36f17cff9340df8faa2465ccb47fec767157d4c47a9ff4554bd3917d6694da1ee6914e34ac3793b6c99673712b12b65b1f3e9f59e274933f") +set(qtwebengine_HASH "02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0") +set(qtwebsockets_HASH "b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67") +set(qtwebview_HASH "ad572e4921c92bd160d84b88987bd125b9f9c5a9f2123f552cf7840f15146d76e13ea621e3f0506c308cbe836f0e6a9cbfd4847ae93fe6fbf6122b0dfc8bbca7") +set(qtinterfaceframework_REF "062662be9975e186a64c19a43b04f13c3e2aebfc") +set(qtapplicationmanager_HASH "d5f09e13d364169f4bfca933c612b8b9e950a229d2ff81f58cdf4eae2a31f4b9d1200d4a71dbb20a947fbf9034a82091eee989aaa47ab4b1b707b6bf23d490a2") +set(qtlanguageserver_HASH "22c13eef40382b45b8f3c07d2aae95c09a24f438ba214dd0e19f601578386883f35df41630ebf512f263cbd0c3c5c296ba19d1dcd0e323381150dcf47cbf7661") +set(qthttpserver_HASH "50b5f96f0a63aca5f73d639c0ea08f525b3df4e416767fc4612872bb5b7edb8332711d7682f47b91c630c9e6f8e7d3c9ca2674d521fa054d6265dec06467a414") +set(qtquick3dphysics_HASH "49125a76427ce6eee85be5ca543b4f88877d782415c054ff09062769cad8cd10932eda58e9320b722c8eb6e6bf8b5bf717df9ace2514b5112652032cf5737cc2") +set(qtspeech_HASH "aaf6a788b5d602708d2b6d0528d43190405135a291834ab719c3886709f43254050d0845d7531689b4426961793bddf42d45b9c7ce381da9c6b9cf6043cf60d3") +set(qtgrpc_HASH "b74514d4c181dd3ebb64fe0943064e074ab65a7a172dff747d1315c460dbcea03ae3488b0d8e01285d54c18ec819b68218170bf974e8d2f0943f842d6c95a2ca") +set(qtquickeffectmaker_HASH "8896045c56c5a05feb3bc2ea3610376585d8f5d2afa30e9a0cb48b96eace31ec98e753bc72669e8c1255a205754ee01a44c89b41f4cc8124ae30fc2b3a4c797f") # Keep for beta/rc -#set(qttools_qlitehtml_REF 0) -#set(qttools_litehtml_REF 0) -#set(qttools_litehtml_HASH 0) -#set(qtwebengine_chromium_REF 0) \ No newline at end of file +#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) +#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) \ No newline at end of file diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 49b944565365e7..b59345a2933d12 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.4.3) +set(QT_VERSION 6.5.0) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) @@ -17,10 +17,6 @@ if(PORT MATCHES "(qtquickcontrols2)") return() endif() -if(PORT MATCHES "qtlocation") # No 6.3.1 tag/branch - set(QT_VERSION 6.3.0) -endif() - ### Setting up the git tag. set(QT_PORTS qt @@ -58,7 +54,7 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2) ## New in 6.2 qtconnectivity qtpositioning - qtlocation + qtlocation # back in 6.5 as tech preview qtmultimedia qtremoteobjects qtsensors @@ -87,13 +83,20 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0) qtquick3dphysics qtspeech) endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0) + list(APPEND QT_PORTS + ## New in 6.5.0 + qtgrpc + qtquickeffectmaker + ) +endif() # 1. By default, modules come from the official release # 2. These modules are mirrored to github and have tags matching the release -set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager qthttpserver) +set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager) # 3. These modules are mirrored to github and have branches matching the release -set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation) +set(QT_FROM_GITHUB_BRANCH qtdeviceutilities) # 4. These modules are not mirrored to github and not part of the release -set(QT_FROM_QT_GIT qtinterfaceframework qtquick3dphysics) +set(QT_FROM_QT_GIT qtinterfaceframework) # For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT #set(QT_FROM_QT_GIT ${QT_PORTS}) #list(POP_FRONT QT_FROM_QT_GIT) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index a2b6e4e626833b..cc7e2974ffa91f 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -10,15 +10,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") set(${PORT}_PATCHES allow_outside_prefix.patch - clang-cl_source_location.patch config_install.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch fix_egl_2.patch - clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. installed_dir.patch GLIB2-static.patch # alternative is to force pkg-config + clang-cl_source_location.patch + clang-cl_QGADGET_fix.diff ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -273,7 +273,12 @@ set(TOOL_NAMES qtpaths qtpaths6 windeployqt + windeployqt6 macdeployqt + macdeployqt6 + androiddeployqt6 + syncqt + tracepointgen ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} @@ -332,6 +337,7 @@ list(APPEND other_files target_qt.conf qt-cmake-private-install.cmake qt-testrunner.py + sanitizer-testrunner.py ) foreach(_config debug release) @@ -437,6 +443,12 @@ string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEX string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") +if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake" + "PACKAGE_PREFIX_DIR}/bin/syncqt" + "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt") +endif() + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") if(EXISTS "${configfile}") file(READ "${configfile}" _contents) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f3b562bd353f81..dface61df82515 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.4.3", - "port-version": 3, + "version": "6.5.0", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/windeployqt.debug.bat b/ports/qtbase/windeployqt.debug.bat index 54a50ff8d1f89a..796dc4f3e8a393 100644 --- a/ports/qtbase/windeployqt.debug.bat +++ b/ports/qtbase/windeployqt.debug.bat @@ -6,5 +6,5 @@ set BAKCD=!CD! cd /D %mypath%\..\..\..\debug\bin set PATH=!CD!;%PATH% cd %BAKCD% -"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +"%mypath%\windeployqt6.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* endlocal diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 0641ee353e024f..3ecfab09ef3251 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.4.3", + "version": "6.5.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 515c6930f508ae..049b5cc1d6166f 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index ff6633b743d4a2..d7f7a527ace005 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 20949a208c0431..7bb7968a9690d3 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index a112c4760c9e08..b3529abe489edd 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 82ab496affecd1..74c35875349bd6 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.4.3", + "version": "6.5.0", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9ced6ea943b706..7070bd42622875 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/portfile.cmake b/ports/qtgrpc/portfile.cmake new file mode 100644 index 00000000000000..142bb026d49347 --- /dev/null +++ b/ports/qtgrpc/portfile.cmake @@ -0,0 +1,16 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qtprotobufgen qtgrpcgen) +# native_grpc ->grpc WrapgRPC +# grp -> qt[network] +# qtprotobufgen -> protobuf WrapProtobuf +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json new file mode 100644 index 00000000000000..b83052017a7002 --- /dev/null +++ b/ports/qtgrpc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "qtgrpc", + "version": "6.5.0", + "description": "Qt framework based gRPC clients and services.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "grpc", + "default-features": false + }, + { + "name": "protobuf", + "default-features": false + }, + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtgrpc", + "host": true, + "default-features": false + } + ] +} diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index c6f2a6750bf835..7229f547be8bb3 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/no_target_promotion_latest.patch b/ports/qtimageformats/no_target_promotion_latest.patch index 1b76e36b58ed74..244e09f4b1bd6f 100644 --- a/ports/qtimageformats/no_target_promotion_latest.patch +++ b/ports/qtimageformats/no_target_promotion_latest.patch @@ -17,5 +17,5 @@ index 7fdd7ddbd..f189c472c 100644 +if(TARGET JPEG::JPEG) + set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) +endif() - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case - find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index a6682002535aa1..dd2898c541d1c2 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.4.3", + "version": "6.5.0", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 0a76f2969dbd41..769e8f8eed4c23 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -49,3 +49,5 @@ if(NOT VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/6.5.0/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index eecf56e9d5d66a..05ebe030cbf7e4 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 9ba4f70e5704c3..add387cc35f578 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.4.3", + "version": "6.5.0", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake index 15fa294cde72d4..d4afa6dfbc7342 100644 --- a/ports/qtlocation/portfile.cmake +++ b/ports/qtlocation/portfile.cmake @@ -1,7 +1,5 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") -# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -# include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") # set(${PORT}_PATCHES) @@ -17,8 +15,8 @@ message(STATUS "Upstream decided to split this into qtpositioning and qtlocation # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" # ) -# qt_install_submodule(PATCHES ${${PORT}_PATCHES} - # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - # CONFIGURE_OPTIONS_RELEASE - # CONFIGURE_OPTIONS_DEBUG - # ) +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index be27b210af053c..f6eb06da44f63a 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, @@ -17,6 +17,16 @@ ], "platform": "linux" }, - "qtpositioning" + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtshadertools", + "default-features": false + } ] } diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 99a5af264f5449..af54a5807c473f 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.4.3", + "version": "6.5.0", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 306dd5e727ca8d..2a248fa310ff58 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 4ba4f643dbb44f..c7b711bf55ea71 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtmultimedia", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 8c38f4aca0ea1b..6346e699cb53dd 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/open62541_v1.3_support.patch b/ports/qtopcua/open62541_v1.3_support.patch deleted file mode 100644 index 84a34419e0e074..00000000000000 --- a/ports/qtopcua/open62541_v1.3_support.patch +++ /dev/null @@ -1,361 +0,0 @@ -diff --git a/src/plugins/opcua/open62541/qopen62541.h b/src/plugins/opcua/open62541/qopen62541.h -index aed1262..a4f63df 100644 ---- a/src/plugins/opcua/open62541/qopen62541.h -+++ b/src/plugins/opcua/open62541/qopen62541.h -@@ -11,6 +11,8 @@ - #elif defined(__GNUC__) //includes mingw - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-parameter" -+#pragma GCC diagnostic ignored "-Wmissing-field-initializers" -+#pragma GCC diagnostic ignored "-Wmissing-braces" - #elif defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunused-parameter" -diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp -index f62ad6c..8714e7a 100644 ---- a/src/plugins/opcua/open62541/qopen62541backend.cpp -+++ b/src/plugins/opcua/open62541/qopen62541backend.cpp -@@ -176,7 +176,7 @@ void Open62541AsyncBackend::writeAttributes(quint64 handle, UA_NodeId id, QOpcUa - - void Open62541AsyncBackend::enableMonitoring(quint64 handle, UA_NodeId id, QOpcUa::NodeAttributes attr, const QOpcUaMonitoringParameters &settings) - { -- UaDeleter nodeIdDeleter(&id, UA_NodeId_deleteMembers); -+ UaDeleter nodeIdDeleter(&id, UA_NodeId_clear); - - QOpen62541Subscription *usedSubscription = nullptr; - -@@ -328,7 +328,7 @@ void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNod - UA_TranslateBrowsePathsToNodeIdsRequest req; - UA_TranslateBrowsePathsToNodeIdsRequest_init(&req); - UaDeleter requestDeleter( -- &req,UA_TranslateBrowsePathsToNodeIdsRequest_deleteMembers); -+ &req,UA_TranslateBrowsePathsToNodeIdsRequest_clear); - - req.browsePathsSize = 1; - req.browsePaths = UA_BrowsePath_new(); -@@ -466,7 +466,7 @@ void Open62541AsyncBackend::readNodeAttributes(const QList &node - - UA_ReadRequest req; - UA_ReadRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_ReadRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_ReadRequest_clear); - - req.nodesToReadSize = nodesToRead.size(); - req.nodesToRead = static_cast(UA_Array_new(nodesToRead.size(), &UA_TYPES[UA_TYPES_READVALUEID])); -@@ -503,7 +503,7 @@ void Open62541AsyncBackend::writeNodeAttributes(const QList &no - - UA_WriteRequest req; - UA_WriteRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_WriteRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_WriteRequest_clear); - - req.nodesToWriteSize = nodesToWrite.size(); - req.nodesToWrite = static_cast(UA_Array_new(nodesToWrite.size(), &UA_TYPES[UA_TYPES_WRITEVALUE])); -@@ -600,7 +600,7 @@ void Open62541AsyncBackend::addNode(const QOpcUaAddNodeItem &nodeToAdd) - { - UA_AddNodesRequest req; - UA_AddNodesRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_AddNodesRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_AddNodesRequest_clear); - req.nodesToAddSize = 1; - req.nodesToAdd = UA_AddNodesItem_new(); - UA_AddNodesItem_init(req.nodesToAdd); -@@ -644,7 +644,7 @@ void Open62541AsyncBackend::deleteNode(const QString &nodeId, bool deleteTargetR - { - UA_DeleteNodesRequest request; - UA_DeleteNodesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_DeleteNodesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_DeleteNodesRequest_clear); - - request.nodesToDeleteSize = 1; - request.nodesToDelete = UA_DeleteNodesItem_new(); -@@ -673,7 +673,7 @@ void Open62541AsyncBackend::addReference(const QOpcUaAddReferenceItem &reference - { - UA_AddReferencesRequest request; - UA_AddReferencesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_AddReferencesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_AddReferencesRequest_clear); - - request.referencesToAddSize = 1; - request.referencesToAdd = UA_AddReferencesItem_new(); -@@ -712,7 +712,7 @@ void Open62541AsyncBackend::deleteReference(const QOpcUaDeleteReferenceItem &ref - { - UA_DeleteReferencesRequest request; - UA_DeleteReferencesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_DeleteReferencesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_DeleteReferencesRequest_clear); - - request.referencesToDeleteSize = 1; - request.referencesToDelete = UA_DeleteReferencesItem_new(); -@@ -810,10 +810,6 @@ void Open62541AsyncBackend::clientStateCallback(UA_Client *client, - - // UA_Client_disconnect() must be called from outside this callback or open62541 will crash - backend->m_disconnectAfterStateChangeTimer.start(); -- -- // Use a queued connection to make sure the subscription is not deleted if the callback was triggered -- // inside of one of its methods. -- QMetaObject::invokeMethod(backend, "cleanupSubscriptions", Qt::QueuedConnection); - } - - void Open62541AsyncBackend::inactivityCallback(UA_Client *client) -@@ -875,7 +871,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e - return; - } - -- UaDeleter clientCertDeleter(&localCertificate, &UA_ByteString_deleteMembers); -+ UaDeleter clientCertDeleter(&localCertificate, &UA_ByteString_clear); - - success = loadFileToByteString(pkiConfig.privateKeyFile(), &privateKey); - -@@ -887,7 +883,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e - return; - } - -- UaDeleter privateKeyDeleter(&privateKey, &UA_ByteString_deleteMembers); -+ UaDeleter privateKeyDeleter(&privateKey, &UA_ByteString_clear); - - success = loadAllFilesInDirectory(pkiConfig.trustListDirectory(), &trustList, &trustListSize); - -diff --git a/src/plugins/opcua/open62541/qopen62541client.cpp b/src/plugins/opcua/open62541/qopen62541client.cpp -index cecd9a4..d3e8863 100644 ---- a/src/plugins/opcua/open62541/qopen62541client.cpp -+++ b/src/plugins/opcua/open62541/qopen62541client.cpp -@@ -163,6 +163,7 @@ QStringList QOpen62541Client::supportedSecurityPolicies() const - , "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15" - , "http://opcfoundation.org/UA/SecurityPolicy#Basic256" - , "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256" -+ , "http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep" - #endif - }; - } -diff --git a/src/plugins/opcua/open62541/qopen62541node.cpp b/src/plugins/opcua/open62541/qopen62541node.cpp -index 9885959..cbfba03 100644 ---- a/src/plugins/opcua/open62541/qopen62541node.cpp -+++ b/src/plugins/opcua/open62541/qopen62541node.cpp -@@ -29,7 +29,7 @@ QOpen62541Node::~QOpen62541Node() - if (m_client) - m_client->unregisterNode(this); - -- UA_NodeId_deleteMembers(&m_nodeId); -+ UA_NodeId_clear(&m_nodeId); - } - - bool QOpen62541Node::readAttributes(QOpcUa::NodeAttributes attr, const QString &indexRange) -diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp -index 610596c..15fccb0 100644 ---- a/src/plugins/opcua/open62541/qopen62541subscription.cpp -+++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp -@@ -146,13 +146,13 @@ void QOpen62541Subscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttrib - - UA_SetPublishingModeRequest req; - UA_SetPublishingModeRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_SetPublishingModeRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_SetPublishingModeRequest_clear); - req.publishingEnabled = value.toBool(); - req.subscriptionIdsSize = 1; - req.subscriptionIds = UA_UInt32_new(); - *req.subscriptionIds = m_subscriptionId; - UA_SetPublishingModeResponse res = UA_Client_Subscriptions_setPublishingMode(m_backend->m_uaclient, req); -- UaDeleter responseDeleter(&res, UA_SetPublishingModeResponse_deleteMembers); -+ UaDeleter responseDeleter(&res, UA_SetPublishingModeResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD) { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Failed to set publishing mode:" << res.responseHeader.serviceResult; -@@ -181,14 +181,14 @@ void QOpen62541Subscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttrib - - UA_SetMonitoringModeRequest req; - UA_SetMonitoringModeRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_SetMonitoringModeRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_SetMonitoringModeRequest_clear); - req.monitoringMode = static_cast(value.value()); - req.monitoredItemIdsSize = 1; - req.monitoredItemIds = UA_UInt32_new(); - *req.monitoredItemIds = monItem->monitoredItemId; - req.subscriptionId = m_subscriptionId; - UA_SetMonitoringModeResponse res = UA_Client_MonitoredItems_setMonitoringMode(m_backend->m_uaclient, req); -- UaDeleter responseDeleter(&res, UA_SetMonitoringModeResponse_deleteMembers); -+ UaDeleter responseDeleter(&res, UA_SetMonitoringModeResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD) { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Failed to set monitoring mode:" << res.responseHeader.serviceResult; -@@ -219,7 +219,7 @@ bool QOpen62541Subscription::addAttributeMonitoredItem(quint64 handle, QOpcUa::N - { - UA_MonitoredItemCreateRequest req; - UA_MonitoredItemCreateRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_MonitoredItemCreateRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_MonitoredItemCreateRequest_clear); - req.itemToMonitor.attributeId = QOpen62541ValueConverter::toUaAttributeId(attr); - UA_NodeId_copy(&id, &(req.itemToMonitor.nodeId)); - if (settings.indexRange().size()) -@@ -244,7 +244,7 @@ bool QOpen62541Subscription::addAttributeMonitoredItem(quint64 handle, QOpcUa::N - } - - UA_MonitoredItemCreateResult res; -- UaDeleter resultDeleter(&res, UA_MonitoredItemCreateResult_deleteMembers); -+ UaDeleter resultDeleter(&res, UA_MonitoredItemCreateResult_clear); - - if (attr == QOpcUa::NodeAttribute::EventNotifier && settings.filter().canConvert()) - res = UA_Client_MonitoredItems_createEvent(m_backend->m_uaclient, m_subscriptionId, -@@ -436,7 +436,7 @@ void QOpen62541Subscription::createEventFilter(const QOpcUaMonitoringParameters: - - convertSelectClause(filter, &uaFilter->selectClauses, &uaFilter->selectClausesSize); - if (!convertWhereClause(filter, &uaFilter->whereClause)) -- UA_ExtensionObject_deleteMembers(out); -+ UA_ExtensionObject_clear(out); - } - - bool QOpen62541Subscription::convertSelectClause(const QOpcUaMonitoringParameters::EventFilter &filter, -@@ -458,8 +458,9 @@ bool QOpen62541Subscription::convertSelectClause(const QOpcUaMonitoringParameter - QOpen62541ValueConverter::scalarFromQt( - filter.selectClauses().at(i).browsePath().at(j), &select[i].browsePath[j]); - } -- QOpen62541ValueConverter::scalarFromQt(filter.selectClauses().at(i).indexRange(), -- &select[i].indexRange); -+ if (!filter.selectClauses().at(i).indexRange().isEmpty()) -+ QOpen62541ValueConverter::scalarFromQt(filter.selectClauses().at(i).indexRange(), -+ &select[i].indexRange); - select[i].attributeId = QOpen62541ValueConverter::toUaAttributeId(filter.selectClauses().at(i).attributeId()); - } - -@@ -548,7 +549,7 @@ bool QOpen62541Subscription::convertWhereClause(const QOpcUaMonitoringParameters - } else { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Unknown filter operand type for event filter" << - filter.whereClause().at(i).filterOperands().at(j).typeName(); -- UA_ContentFilter_deleteMembers(result); -+ UA_ContentFilter_clear(result); - return false; - } - } -@@ -703,7 +704,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 nodeHandle, Q - - UA_ModifyMonitoredItemsRequest req; - UA_ModifyMonitoredItemsRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_ModifyMonitoredItemsRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_ModifyMonitoredItemsRequest_clear); - req.subscriptionId = m_subscriptionId; - req.itemsToModifySize = 1; - req.itemsToModify = UA_MonitoredItemModifyRequest_new(); -@@ -780,7 +781,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 nodeHandle, Q - - UA_ModifyMonitoredItemsResponse res = UA_Client_MonitoredItems_modify(m_backend->m_uaclient, req); - UaDeleter responseDeleter( -- &res, UA_ModifyMonitoredItemsResponse_deleteMembers); -+ &res, UA_ModifyMonitoredItemsResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD || res.results[0].statusCode != UA_STATUSCODE_GOOD) { - p.setStatusCode(static_cast(res.responseHeader.serviceResult == UA_STATUSCODE_GOOD ? res.results[0].statusCode : res.responseHeader.serviceResult)); -diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -index 5a8562c..61a504a 100644 ---- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -@@ -124,69 +124,67 @@ QVariant toQVariant(const UA_Variant &value) - return QVariant(); - } - -- switch (value.type->typeIndex) { -- case UA_TYPES_BOOLEAN: -+ if (value.type == &UA_TYPES[UA_TYPES_BOOLEAN]) - return arrayToQVariant(value, QMetaType::Bool); -- case UA_TYPES_SBYTE: -+ else if (value.type == &UA_TYPES[UA_TYPES_SBYTE]) - return arrayToQVariant(value, QMetaType::SChar); -- case UA_TYPES_BYTE: -+ else if (value.type == &UA_TYPES[UA_TYPES_BYTE]) - return arrayToQVariant(value, QMetaType::UChar); -- case UA_TYPES_INT16: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT16]) - return arrayToQVariant(value, QMetaType::Short); -- case UA_TYPES_UINT16: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT16]) - return arrayToQVariant(value, QMetaType::UShort); -- case UA_TYPES_INT32: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT32]) - return arrayToQVariant(value, QMetaType::Int); -- case UA_TYPES_UINT32: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT32]) - return arrayToQVariant(value, QMetaType::UInt); -- case UA_TYPES_INT64: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT64]) - return arrayToQVariant(value, QMetaType::LongLong); -- case UA_TYPES_UINT64: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT64]) - return arrayToQVariant(value, QMetaType::ULongLong); -- case UA_TYPES_FLOAT: -+ else if (value.type == &UA_TYPES[UA_TYPES_FLOAT]) - return arrayToQVariant(value, QMetaType::Float); -- case UA_TYPES_DOUBLE: -+ else if (value.type == &UA_TYPES[UA_TYPES_DOUBLE]) - return arrayToQVariant(value, QMetaType::Double); -- case UA_TYPES_STRING: -+ else if (value.type == &UA_TYPES[UA_TYPES_STRING]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_BYTESTRING: -+ else if (value.type == &UA_TYPES[UA_TYPES_BYTESTRING]) - return arrayToQVariant(value, QMetaType::QByteArray); -- case UA_TYPES_LOCALIZEDTEXT: -+ else if (value.type == &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]) - return arrayToQVariant(value); -- case UA_TYPES_NODEID: -+ else if (value.type == &UA_TYPES[UA_TYPES_NODEID]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_DATETIME: -+ else if (value.type == &UA_TYPES[UA_TYPES_DATETIME]) - return arrayToQVariant(value, QMetaType::QDateTime); -- case UA_TYPES_GUID: -+ else if (value.type == &UA_TYPES[UA_TYPES_GUID]) - return arrayToQVariant(value, QMetaType::QUuid); -- case UA_TYPES_XMLELEMENT: -+ else if (value.type == &UA_TYPES[UA_TYPES_XMLELEMENT]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_QUALIFIEDNAME: -+ else if (value.type == &UA_TYPES[UA_TYPES_QUALIFIEDNAME]) - return arrayToQVariant(value); -- case UA_TYPES_STATUSCODE: -+ else if (value.type == &UA_TYPES[UA_TYPES_STATUSCODE]) - return arrayToQVariant(value, QMetaType::UInt); -- case UA_TYPES_EXTENSIONOBJECT: -+ else if (value.type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) - return arrayToQVariant(value); -- case UA_TYPES_EXPANDEDNODEID: -+ else if (value.type == &UA_TYPES[UA_TYPES_EXPANDEDNODEID]) - return arrayToQVariant(value); -- case UA_TYPES_ARGUMENT: -+ else if (value.type == &UA_TYPES[UA_TYPES_ARGUMENT]) - return arrayToQVariant(value); -- case UA_TYPES_RANGE: -+ else if (value.type == &UA_TYPES[UA_TYPES_RANGE]) - return arrayToQVariant(value); -- case UA_TYPES_EUINFORMATION: -+ else if (value.type == &UA_TYPES[UA_TYPES_EUINFORMATION]) - return arrayToQVariant(value); -- case UA_TYPES_AXISINFORMATION: -+ else if (value.type == &UA_TYPES[UA_TYPES_AXISINFORMATION]) - return arrayToQVariant(value); -- case UA_TYPES_COMPLEXNUMBERTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]) - return arrayToQVariant(value); -- case UA_TYPES_DOUBLECOMPLEXNUMBERTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]) - return arrayToQVariant(value); -- case UA_TYPES_XVTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_XVTYPE]) - return arrayToQVariant(value); -- default: -- qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Variant conversion from Open62541 for typeName" << value.type->typeName << " not implemented"; -- return QVariant(); -- } -+ -+ qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Variant conversion from Open62541 for typeName" << value.type->typeName << " not implemented"; -+ return QVariant(); - } - - const UA_DataType *toDataType(QOpcUa::Types valueType) -@@ -672,7 +670,7 @@ void scalarFromQt(const QOpcUaExtensi - { - QByteArray temp = obj.encodedBody(); - UA_NodeId encodingId = Open62541Utils::nodeIdFromQString(obj.encodingTypeId()); -- UaDeleter nodeIdDeleter(&encodingId, UA_NodeId_deleteMembers); -+ UaDeleter nodeIdDeleter(&encodingId, UA_NodeId_clear); - createExtensionObject(temp, encodingId, ptr, obj.encoding()); - } - diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 3dfeca0a4746da..ff5602572be1d4 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES open62541_v1.3_support.patch) +set(${PORT}_PATCHES ) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index fc2397de976ddf..b38dcc63cf9c44 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtopcua", - "version": "6.4.3", - "port-version": 2, + "version": "6.5.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 4a89009aac84bc..7f7c4c33785a53 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 1167148cdf9e3a..ad84adda890c7d 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtquick3d", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 7c85a586d38125..4438577bf20955 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.4.3", + "version": "6.5.0", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/portfile.cmake b/ports/qtquickeffectmaker/portfile.cmake new file mode 100644 index 00000000000000..effa2d5b11050e --- /dev/null +++ b/ports/qtquickeffectmaker/portfile.cmake @@ -0,0 +1,14 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qqem) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json new file mode 100644 index 00000000000000..7a3cc4c0f54964 --- /dev/null +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "qtquickeffectmaker", + "version": "6.5.0", + "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "native", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtquick3d", + "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false + } + ] +} diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index b1f8fc9aa080e1..5d82eb7c51f978 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.4.3", + "version": "6.5.0", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 2d27cc8d9cc9bc..23a33b09036e73 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index b196eed46dd927..fc3b51026fc442 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.4.3", + "version": "6.5.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index f7db1f3e45bb15..c18ba91fe735c5 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d5a9868b332561..5ddcf226a3dcdf 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.4.3", + "version": "6.5.0", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index c15abfd6d9cb81..240f5f5b1b45f5 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 2ae2a15243cc59..93e8fecbae47cb 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.4.3", + "version": "6.5.0", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index c64335551b024e..905620cfd1365d 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtspeech", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index ff593dc7b09f7a..9d33739b65e921 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/devendor-litehtml.patch b/ports/qttools/devendor-litehtml.patch index 442244b62c6183..ed3b43a1527256 100644 --- a/ports/qttools/devendor-litehtml.patch +++ b/ports/qttools/devendor-litehtml.patch @@ -54,3 +54,16 @@ endif() - -endif() +diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt +index 5d2bf2b67c..abd9b513d3 100644 +--- a/src/assistant/CMakeLists.txt ++++ b/src/assistant/CMakeLists.txt +@@ -34,7 +34,7 @@ if(TARGET qlitehtml) + # but found in the system, because they are imported only to the subdirectory scope + # where find_package was called. But that's fine, we wouldn't be able to set compiler flags + # on them anyway. +- if(TARGET litehtml) ++ if(0) + qt_internal_set_exceptions_flags(litehtml OFF) + qt_disable_warnings(litehtml) + endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 7a0c771b8790bb..849875d76b2224 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qttools", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 7e7d5c682bc9f3..18ff8ebdbe8088 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 7709bdb2ffa554..fd1170b9458786 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.4.3", + "version": "6.5.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 62a197ac2b25dd..2799ce9f14be0d 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.4.3", + "version": "6.5.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 5531260cb82d3e..4ed4777ddba8a2 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index dbe7936eccd391..a9a9f8b5d27314 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -1,8 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES - ) +set(${PORT}_PATCHES "") set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) @@ -106,6 +105,7 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} -DNodejs_EXECUTABLE=${NODEJS} + -DQT_FEATURE_webengine_jumbo_build=0 OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index e7bac0c5f2bc66..3df78cd7b47a30 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 7961411c0d34c9..473152094b3ef7 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index b3c721ba184ab2..4735c17327bf0f 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtwebview", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index d55a7293018052..2a1561f9b8900f 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.29 - SHA512 0610e666943f29f4fcf6188f2673837a24da749c2071f2463667bfef67262aba6425612db82d9f0553f7717dc7b8214e01dfafcf29145510d39a9e2024a749fc + REF QuantLib-v1.30 + SHA512 7948f33fac124e615051863a1780ed2f98a626577174b54d0a276e604d3b034828e3d6c0c528687c4c0b974829dde830daf6be70f8de51467c9fc0f9a76eb525 HEAD_REF master + PATCHES remove-amortizingbonds-all.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/quantlib/remove-amortizingbonds-all.patch b/ports/quantlib/remove-amortizingbonds-all.patch new file mode 100644 index 00000000000000..abbeb90c9227a6 --- /dev/null +++ b/ports/quantlib/remove-amortizingbonds-all.patch @@ -0,0 +1,12 @@ +diff --git a/ql/CMakeLists.txt b/ql/CMakeLists.txt +index fc137f41d..7ac42a58b 100644 +--- a/ql/CMakeLists.txt ++++ b/ql/CMakeLists.txt +@@ -2220,7 +2220,6 @@ set(QL_GENERATED_HEADERS + ${PROJECT_BINARY_DIR}/ql/cashflows/all.hpp + ${PROJECT_BINARY_DIR}/ql/currencies/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/all.hpp +- ${PROJECT_BINARY_DIR}/ql/experimental/amortizingbonds/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/asian/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/averageois/all.hpp + ${PROJECT_BINARY_DIR}/ql/experimental/barrieroption/all.hpp diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index 8c6d48583490c7..7b9e0cbc652db0 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quantlib", - "version": "1.29", + "version": "1.30", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/ports/rtabmap/fix_qt_deploy_plugins.patch b/ports/rtabmap/fix_qt_deploy_plugins.patch deleted file mode 100644 index 979ee8313d2889..00000000000000 --- a/ports/rtabmap/fix_qt_deploy_plugins.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt -index f0cef72c..f007eb83 100644 ---- a/app/src/CMakeLists.txt -+++ b/app/src/CMakeLists.txt -@@ -53,7 +53,14 @@ ENDIF() - INSTALL(TARGETS rtabmap_app - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime - BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime) -- -+ -+qt_generate_deploy_app_script( -+ TARGET rtabmap_app -+ FILENAME_VARIABLE deploy_script -+ NO_UNSUPPORTED_PLATFORM_ERROR -+) -+install(SCRIPT ${deploy_script}) -+ - IF(APPLE AND BUILD_AS_BUNDLE) - INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" ${PROJECT_NAME} - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 710db46e5ad6eb..2147226e9d6e83 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 47fa00e760cd9089d42dc27cc0120f2dc2ad4b32b6a05e87fb5320fd6fe3971e68958984714895640989543be9252fd0fb96ccebf0d00d70afbad224022a7a53 HEAD_REF master PATCHES - fix_qt_deploy_plugins.patch fix_autouic.patch ) @@ -118,24 +117,22 @@ if("tools" IN_LIST FEATURES) # Remove duplicate files that were added by qtdeploy # that would be already deployed by vcpkg_copy_tools - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tmp) - file(GLOB RTABMAP_REL_LIBS ${CURRENT_PACKAGES_DIR}/tmp/rtabmap*) - file(COPY ${RTABMAP_REL_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tmp") + file(GLOB RTABMAP_REL_LIBS "${CURRENT_PACKAGES_DIR}/tmp/rtabmap*") + file(COPY ${RTABMAP_REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/translations") - file(RENAME ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) #qt.conf - file(WRITE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "[Paths] - Prefix = .") + file(COPY "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qt.conf" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "./../../../" "./../../") # Debug - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/tmp) - file(GLOB RTABMAP_DBG_LIBS ${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*) - file(COPY ${RTABMAP_DBG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/tmp") + file(GLOB RTABMAP_DBG_LIBS "${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*") + file(COPY ${RTABMAP_DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/plugins") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/translations") - endif() endif() diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index 86754dd8dba660..ecbc94570e5b81 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtabmap", "version": "0.21.0", + "port-version": 1, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": "BSD-3-Clause", diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake deleted file mode 100644 index ed9443f4116d88..00000000000000 --- a/ports/spix/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO faaxm/spix - REF v0.5 - SHA512 fdc35ff4920a83d4b2d0abe84eae7c8f46cb259e525d4445b091eb01990bcdeade7e60a00795f4acccc09f0702fa61d17ba6c7b8bbf19ff218e8bd42e1eb7f7c - - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSPIX_BUILD_EXAMPLES=OFF - -DSPIX_BUILD_TESTS=OFF - -DSPIX_QT_MAJOR=6 -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json deleted file mode 100644 index f35646bb39a4c4..00000000000000 --- a/ports/spix/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "spix", - "version": "0.5", - "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", - "homepage": "https://github.com/faaxm/spix", - "license": "MIT", - "dependencies": [ - "anyrpc", - { - "name": "qtbase", - "default-features": false - }, - "qtdeclarative", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index c4fcadf9b168b0..f8e6ba6422b225 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -46,6 +46,10 @@ endif() if(NOT SQLITE3_SKIP_TOOLS) add_executable(sqlite3-bin shell.c) + set_target_properties(sqlite3-bin PROPERTIES + OUTPUT_NAME sqlite3 + PDB_NAME "sqlite3${CMAKE_EXECUTABLE_SUFFIX}.pdb" + ) target_link_libraries(sqlite3-bin PRIVATE sqlite3) if (WITH_ZLIB) @@ -55,7 +59,7 @@ if(NOT SQLITE3_SKIP_TOOLS) endif() install(TARGETS sqlite3-bin sqlite3 - RUNTIME DESTINATION tools + RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index f1a0d572f6c220..b42f2da21a9941 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -78,8 +78,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unoff file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") +if("tool" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES sqlite3 DESTINATION "${CURRENT_PACKAGES_DIR}/tools" AUTO_CLEAN) endif() configure_file( diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 744147e558e27b..be282c11e0eb13 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "version": "3.40.1", - "port-version": 2, + "port-version": 3, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "license": "blessing", diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index a12ecf107bf62d..0cf6056ba3259b 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -6,10 +6,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu REF "v${VERSION}" - SHA512 1461b52bc18a8b0345beb70fdd46e07df497a13be840bcc061158ea1d0e61c8745806d1ad21cb2723db80f5ed762c3741f9c0ded2b2013df46da0e8bb6b77b83 + SHA512 8feeb08404cad58724f0f6478bc785b56d8c725b549f1fdc07d3578c4e14bdbdbd8bcda1cdfd366a39417eda60765825e87cf781c68e6723a8246cb357b41439 HEAD_REF master PATCHES remove-make.inc.patch + superfluous-configure.patch ) vcpkg_cmake_configure( diff --git a/ports/superlu/superfluous-configure.patch b/ports/superlu/superfluous-configure.patch new file mode 100644 index 00000000000000..09b974be193877 --- /dev/null +++ b/ports/superlu/superfluous-configure.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d733990..11f429a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -230,7 +230,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/superlu.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/SRC/superlu_config.h) +-configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_SOURCE_DIR}/SRC/superlu_config.h) + + # Following is to configure a header file for FORTRAN code + configure_file(${SuperLU_SOURCE_DIR}/SRC/superlu_config.h.in ${SuperLU_BINARY_DIR}/FORTRAN/superlu_config.h) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 0fab3f8db50543..a9d521ae331b25 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,7 +1,6 @@ { "name": "superlu", - "version": "5.3.0", - "port-version": 1, + "version": "6.0.0", "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "license": "BSD-3-Clause-LBNL", diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index c89c4481da93c1..fefd403bc8a24e 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) @@ -6,7 +5,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneTBB REF "v${VERSION}" - SHA512 72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4 + SHA512 2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c HEAD_REF onetbb_2021 ) @@ -47,4 +46,4 @@ include(CMakeFindDependencyMacro) find_dependency(Threads) ${_contents}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 4a591ba63a2b59..b6fe456e7034f4 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tbb", - "version": "2021.8.0", + "version": "2021.9.0", "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/oneapi-src/oneTBB", "license": "Apache-2.0", diff --git a/ports/wangle/fix_dependency.patch b/ports/wangle/fix_dependency.patch index 6b80a68f8d993c..d8316073b7e647 100644 --- a/ports/wangle/fix_dependency.patch +++ b/ports/wangle/fix_dependency.patch @@ -1,17 +1,26 @@ diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt -index 8df7c76..f605f25 100644 +index 977bbe4..155f9cc 100644 --- a/wangle/CMakeLists.txt +++ b/wangle/CMakeLists.txt -@@ -62,7 +62,7 @@ find_package(folly CONFIG REQUIRED) +@@ -64,18 +64,23 @@ set(CMAKE_INSTALL_DIR lib/cmake/wangle CACHE STRING + find_package(folly CONFIG REQUIRED) + find_package(fizz CONFIG REQUIRED) - find_package(fmt CONFIG REQUIRED) +-find_package(fmt CONFIG REQUIRED) find_package(OpenSSL REQUIRED) -find_package(Glog REQUIRED) +-find_package(gflags CONFIG QUIET) +find_package(glog CONFIG REQUIRED) - find_package(gflags CONFIG QUIET) ++find_package(gflags CONFIG REQUIRED) ++find_package(Boost REQUIRED ++ COMPONENTS ++ filesystem ++ thread ++) ++ if (gflags_FOUND) message(STATUS "Found gflags from package config") -@@ -70,8 +70,8 @@ if (gflags_FOUND) + message(STATUS "gflags_CONFIG=${gflags_CONFIG}") else() find_package(Gflags REQUIRED) endif() @@ -22,35 +31,49 @@ index 8df7c76..f605f25 100644 find_package(Threads REQUIRED) if (UNIX AND NOT APPLE) find_package(Librt) -@@ -153,24 +153,23 @@ target_include_directories( - PUBLIC - $ - $ -+ PRIVATE - ${FIZZ_INCLUDE_DIR} - ${FOLLY_INCLUDE_DIR} - ${Boost_INCLUDE_DIR} -- ${OPENSSL_INCLUDE_DIR} -- ${GLOG_INCLUDE_DIRS} - ${GFLAGS_INCLUDE_DIRS} -- ${LIBEVENT_INCLUDE_DIR} -- ${DOUBLE_CONVERSION_INCLUDE_DIRS} +@@ -166,6 +171,14 @@ target_include_directories( + ${LIBEVENT_INCLUDE_DIR} + ${DOUBLE_CONVERSION_INCLUDE_DIRS} ) ++set(Boost_LIBRARIES Boost::boost Boost::filesystem Boost::thread ) ++set(FOLLY_LIBRARIES Folly::folly) ++set(FIZZ_LIBRARIES fizz::fizz) ++set(GLOG_LIBRARIES glog::glog) ++set(GFLAGS_LIBRARIES gflags::gflags) ++set(LIBEVENT_LIB libevent::core libevent::extra) ++set(DOUBLE_CONVERSION_LIBRARIES double-conversion::double-conversion) ++ target_link_libraries(wangle PUBLIC ${FOLLY_LIBRARIES} ${FIZZ_LIBRARIES} - ${Boost_LIBRARIES} -- ${OPENSSL_LIBRARIES} -- ${GLOG_LIBRARIES} -+ OpenSSL::SSL -+ OpenSSL::Crypto -+ glog::glog - ${GFLAGS_LIBRARIES} -- ${LIBEVENT_LIB} -- ${DOUBLE_CONVERSION_LIBRARIES} -+ libevent::core -+ libevent::extra -+ double-conversion::double-conversion - ${CMAKE_DL_LIBS} - ${LIBRT_LIBRARIES} - Threads::Threads) +diff --git a/wangle/cmake/wangle-config.cmake.in b/wangle/cmake/wangle-config.cmake.in +index e0fd0dc..5f6cf14 100644 +--- a/wangle/cmake/wangle-config.cmake.in ++++ b/wangle/cmake/wangle-config.cmake.in +@@ -15,13 +15,19 @@ set_and_check(WANGLE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") + set_and_check(WANGLE_CMAKE_DIR "${PACKAGE_PREFIX_DIR}/share/wangle") + + include(CMakeFindDependencyMacro) +-find_dependency(folly REQUIRED) +-find_dependency(fizz REQUIRED) +-find_dependency(glog REQUIRED) +-find_dependency(Threads REQUIRED) +-find_dependency(Libevent REQUIRED) +-find_dependency(OpenSSL REQUIRED) +-find_dependency(double-conversion REQUIRED) ++find_dependency(folly CONFIG) ++find_dependency(fizz CONFIG) ++find_dependency(gflags CONFIG) ++find_dependency(glog CONFIG) ++find_dependency(Threads) ++find_dependency(Libevent CONFIG) ++find_dependency(OpenSSL) ++find_dependency(double-conversion CONFIG) ++find_dependency(Boost ++ COMPONENTS ++ filesystem ++ thread ++) + + if (NOT TARGET wangle::wangle) + include("${WANGLE_CMAKE_DIR}/wangle-targets.cmake") diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index bf8313befecfdd..15bafaa769a07a 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -11,6 +11,17 @@ vcpkg_from_github( fix_dependency.patch ) +file(REMOVE + "${SOURCE_PATH}/wangle/cmake/FindDoubleConversion.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake" + "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake" +) + + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/wangle" OPTIONS diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json index fb51f4338a1ea7..a7493e597e8a64 100644 --- a/ports/wangle/vcpkg.json +++ b/ports/wangle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wangle", "version-string": "2022.03.21.00", + "port-version": 1, "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", "homepage": "https://github.com/facebook/wangle", "license": "Apache-2.0", @@ -13,6 +14,7 @@ "double-conversion", "fizz", "folly", + "gflags", "glog", "libevent", "openssl", diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json index 89f8f67ad2a069..35562d0fd2c155 100644 --- a/ports/xeus/vcpkg.json +++ b/ports/xeus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xeus", "version": "0.24.3", - "port-version": 2, + "port-version": 3, "description": "C++ implementation of the Jupyter kernel protocol", "homepage": "https://github.com/jupyter-xeus/xeus", "license": "BSD-3-Clause", @@ -9,7 +9,7 @@ "cppzmq", { "name": "libuuid", - "platform": "linux" + "platform": "!windows & !osx" }, "nlohmann-json", "openssl", diff --git a/ports/xlsxio/export-targets.patch b/ports/xlsxio/export-targets.patch deleted file mode 100644 index 112473771de0ea..00000000000000 --- a/ports/xlsxio/export-targets.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05c7ee5..28a0206 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,7 +87,8 @@ INCLUDE_DIRECTORIES(${ANYZIP_INCLUDE_DIRS}) - INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS}) - - # build definitions --SET(ALLTARGETS) -+SET(ALLTARGETS_LIB) -+SET(ALLTARGETS_EXE) - SET(LINKTYPES) - IF(BUILD_STATIC) - LIST(APPEND LINKTYPES "STATIC") -@@ -106,7 +107,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - ENDIF() - TARGET_INCLUDE_DIRECTORIES(xlsxio_read_${LINKTYPE} PRIVATE lib) - TARGET_LINK_LIBRARIES(xlsxio_read_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPAT_LIBRARIES}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_read_${LINKTYPE}) - - ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) - SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}") -@@ -115,7 +116,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_write.def") - ENDIF() - TARGET_LINK_LIBRARIES(xlsxio_write_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_write_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_write_${LINKTYPE}) - - IF(WITH_WIDE) - ADD_LIBRARY(xlsxio_readw_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c lib/xlsxio_read_sharedstrings.c) -@@ -127,7 +128,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - ENDIF() - TARGET_INCLUDE_DIRECTORIES(xlsxio_readw_${LINKTYPE} PRIVATE lib) - TARGET_LINK_LIBRARIES(xlsxio_readw_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPATW_LIBRARIES}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_readw_${LINKTYPE}) -+ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_readw_${LINKTYPE}) - - #ADD_LIBRARY(xlsxio_writew_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) - #SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL") -@@ -137,7 +138,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) - # SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_writew.def") - #ENDIF() - #TARGET_LINK_LIBRARIES(xlsxio_writew_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) -- #SET(ALLTARGETS ${ALLTARGETS} xlsxio_writew_${LINKTYPE}) -+ #SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_writew_${LINKTYPE}) - ENDIF() - - SET(EXELINKTYPE ${LINKTYPE}) -@@ -148,35 +149,35 @@ ENDFOREACH() - IF(BUILD_TOOLS) - ADD_EXECUTABLE(xlsxio_xlsx2csv src/xlsxio_xlsx2csv.c) - TARGET_LINK_LIBRARIES(xlsxio_xlsx2csv xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_xlsx2csv) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_xlsx2csv) - - ADD_EXECUTABLE(xlsxio_csv2xlsx src/xlsxio_csv2xlsx.c) - TARGET_LINK_LIBRARIES(xlsxio_csv2xlsx xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} xlsxio_csv2xlsx) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_csv2xlsx) - ENDIF() - - IF(BUILD_EXAMPLES) - ADD_EXECUTABLE(example_xlsxio_write_getversion examples/example_xlsxio_write_getversion.c) - TARGET_LINK_LIBRARIES(example_xlsxio_write_getversion xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write_getversion) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write_getversion) - - ADD_EXECUTABLE(example_xlsxio_write examples/example_xlsxio_write.c) - TARGET_LINK_LIBRARIES(example_xlsxio_write xlsxio_write_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write) - - ADD_EXECUTABLE(example_xlsxio_read examples/example_xlsxio_read.c) - TARGET_LINK_LIBRARIES(example_xlsxio_read xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read) - - ADD_EXECUTABLE(example_xlsxio_read_advanced examples/example_xlsxio_read_advanced.c) - TARGET_LINK_LIBRARIES(example_xlsxio_read_advanced xlsxio_read_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read_advanced) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read_advanced) - - IF(WITH_WIDE) - ADD_EXECUTABLE(example_xlsxio_readw examples/example_xlsxio_read.c) - SET_TARGET_PROPERTIES(example_xlsxio_readw PROPERTIES COMPILE_DEFINITIONS "XML_UNICODE") - TARGET_LINK_LIBRARIES(example_xlsxio_readw xlsxio_readw_${EXELINKTYPE}) -- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_readw) -+ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_readw) - ENDIF() - ENDIF() - -@@ -200,7 +201,43 @@ IF(BUILD_DOCUMENTATION) - ENDIF() - - # installation specifications --INSTALL(TARGETS ${ALLTARGETS} -+INSTALL(TARGETS ${ALLTARGETS_LIB} -+ EXPORT xlsxioTargets -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin -+) -+INSTALL(EXPORT xlsxioTargets -+ NAMESPACE xlsxio:: -+ DESTINATION cmake -+) -+FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" -+[[INCLUDE(CMakeFindDependencyMacro) -+IF (@WITH_LIBZIP@) -+ FIND_DEPENDENCY(LibZip) -+ELSE() -+ FIND_DEPENDENCY(minizip CONFIG) -+ENDIF() -+IF (@EXPAT_DIR@) -+ FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) -+ FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) -+ELSE() -+ FIND_DEPENDENCY(EXPAT) -+ENDIF() -+ -+IF(@WITH_WIDE@) -+ IF(@EXPAT_DIR@) -+ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw libexpatw NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) -+ ELSE() -+ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw) -+ ENDIF() -+ENDIF() -+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/xlsxioTargets.cmake") -+]]) -+CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" @ONLY) -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION cmake) -+ -+INSTALL(TARGETS ${ALLTARGETS_EXE} - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin diff --git a/ports/xlsxio/fix-dependencies.patch b/ports/xlsxio/fix-dependencies.patch index 7a02d8f9de7635..70b2cdfa58dbef 100644 --- a/ports/xlsxio/fix-dependencies.patch +++ b/ports/xlsxio/fix-dependencies.patch @@ -1,16 +1,41 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 490ee5c..05c7ee5 100644 +index 7e86706..f2bdc36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -49,9 +49,8 @@ IF(WITH_LIBZIP) - SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) - SET(ANYZIP_DEF USE_LIBZIP) +@@ -57,7 +57,9 @@ ELSEIF(WITH_MINIZIP_NG) + SET(ANYZIP_LIBRARIES minizip${MINIZIP_NG_SUFFIX}) + SET(ANYZIP_DEF USE_MINIZIP;USE_MINIZIP_NG) ELSE() - FIND_PACKAGE(Minizip REQUIRED) -- SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) -- SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) -+ FIND_PACKAGE(minizip CONFIG REQUIRED) -+ SET(ANYZIP_LIBRARIES minizip::minizip) ++ FIND_PACKAGE(Minizip NAMES unofficial-minizip REQUIRED) ++ SET(MINIZIP_INCLUDE_DIRS "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") ++ SET(MINIZIP_LIBRARIES unofficial::minizip::minizip) + SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) + SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) SET(ANYZIP_DEF USE_MINIZIP) +@@ -68,7 +70,8 @@ IF(EXPAT_DIR) + FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) + FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) + ELSE() +- FIND_PACKAGE(EXPAT REQUIRED) ++ FIND_PACKAGE(EXPAT NAMES expat REQUIRED) ++ SET(EXPAT_LIBRARIES expat::expat) + ENDIF() + # dependancy: expatw (if wide library was requested) + IF(WITH_WIDE) +@@ -225,13 +228,13 @@ FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" + IF (@WITH_LIBZIP@) + FIND_DEPENDENCY(LibZip) + ELSE() +- FIND_DEPENDENCY(minizip CONFIG) ++ FIND_DEPENDENCY(unofficial-minizip CONFIG) + ENDIF() + IF (@EXPAT_DIR@) + FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) + FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) + ELSE() +- FIND_DEPENDENCY(EXPAT) ++ FIND_DEPENDENCY(expat CONFIG) ENDIF() - # dependancy: expat + + IF(@WITH_WIDE@) diff --git a/ports/xlsxio/portfile.cmake b/ports/xlsxio/portfile.cmake index 7d7915e9c361c4..ad0230c1b4eab5 100644 --- a/ports/xlsxio/portfile.cmake +++ b/ports/xlsxio/portfile.cmake @@ -1,29 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brechtsanders/xlsxio - REF e3acace39e5fb153f5ce3500a4952c2bf93175bd - SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea + REF "${VERSION}" + SHA512 67b9a4e275446f3ca08e91d31f05236855e761c06ed84ea3aea8c25a7cd6729191f6c95b9efe07392775a75e2713e7ec2c6d216b8d310e7b46bee531cccba8be HEAD_REF master PATCHES fix-dependencies.patch - export-targets.patch # https://github.com/brechtsanders/xlsxio/pull/105 ) file(REMOVE "${SOURCE_PATH}/CMake/FindMinizip.cmake") -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - libzip WITH_LIBZIP -) - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} + -DCMAKE_POLICY_DEFAULT_CMP0012=NEW -DBUILD_SHARED=${BUILD_SHARED} -DBUILD_STATIC=${BUILD_STATIC} -DWITH_WIDE=OFF @@ -41,4 +34,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") diff --git a/ports/xlsxio/vcpkg.json b/ports/xlsxio/vcpkg.json index 376964779ed258..56522fdc432f60 100644 --- a/ports/xlsxio/vcpkg.json +++ b/ports/xlsxio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xlsxio", - "version-date": "2021-03-24", - "port-version": 1, + "version": "0.2.34", "description": "Cross-platform C library for reading values from and writing values to .xlsx files", "homepage": "https://github.com/brechtsanders/xlsxio", "license": "MIT", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 845a7ece6da375..f3bdede54a682d 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a2a1876f2f625494b16da42b27ace343255d691", + "version": "7.1.0", + "port-version": 0 + }, { "git-tree": "25ea14090fceba8ae684e0c6ab047a719250ef56", "version": "7.0.11", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 6209820624f767..add7640efdd236 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "785c086e68c5e4d5257587ee6deeae566140b8fe", + "version": "1.11.65", + "port-version": 0 + }, { "git-tree": "495471c4071406ec6929d77a553dc03ebd6df095", "version": "1.11.4", diff --git a/versions/baseline.json b/versions/baseline.json index 80810a20869b48..bb256a6971f224 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -25,8 +25,8 @@ "port-version": 3 }, "ace": { - "baseline": "7.0.11", - "port-version": 2 + "baseline": "7.1.0", + "port-version": 0 }, "acl": { "baseline": "2.3.1", @@ -377,7 +377,7 @@ "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.11.4", + "baseline": "1.11.65", "port-version": 0 }, "azmq": { @@ -1650,7 +1650,7 @@ }, "collada-dom": { "baseline": "2.5.0", - "port-version": 8 + "port-version": 9 }, "colmap": { "baseline": "2023-03-12", @@ -2534,7 +2534,7 @@ }, "fmilib": { "baseline": "2.4.1", - "port-version": 1 + "port-version": 2 }, "fmt": { "baseline": "9.1.0", @@ -2542,7 +2542,7 @@ }, "folly": { "baseline": "2022.10.31.00", - "port-version": 5 + "port-version": 6 }, "font-chef": { "baseline": "1.1.0", @@ -2814,7 +2814,7 @@ }, "glib": { "baseline": "2.76.1", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.76.0", @@ -2958,7 +2958,7 @@ }, "gstreamer": { "baseline": "1.20.5", - "port-version": 5 + "port-version": 6 }, "gtest": { "baseline": "1.13.0", @@ -2973,11 +2973,11 @@ "port-version": 0 }, "gtkmm": { - "baseline": "4.6.0", - "port-version": 2 + "baseline": "4.10.0", + "port-version": 0 }, "gtl": { - "baseline": "1.1.5", + "baseline": "1.1.8", "port-version": 0 }, "gts": { @@ -3270,7 +3270,7 @@ }, "imgui": { "baseline": "1.89.4", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", @@ -4025,8 +4025,8 @@ "port-version": 0 }, "libgpiod": { - "baseline": "1.6.3", - "port-version": 2 + "baseline": "2.0.1", + "port-version": 0 }, "libgpod": { "baseline": "2019-08-29", @@ -4058,7 +4058,7 @@ }, "libheif": { "baseline": "1.15.1", - "port-version": 0 + "port-version": 1 }, "libhsplasma": { "baseline": "2022-05-19", @@ -4114,7 +4114,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.5.1", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "1.0.6", @@ -4566,7 +4566,7 @@ }, "libtorch": { "baseline": "1.12.1", - "port-version": 2 + "port-version": 3 }, "libtorrent": { "baseline": "2.0.8", @@ -5046,7 +5046,7 @@ }, "mathgl": { "baseline": "8.0.1", - "port-version": 0 + "port-version": 1 }, "matio": { "baseline": "1.5.23", @@ -5102,7 +5102,7 @@ }, "mesa": { "baseline": "23.0.1", - "port-version": 0 + "port-version": 1 }, "meschach": { "baseline": "1.2b", @@ -5138,7 +5138,7 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 3 + "port-version": 4 }, "mikktspace": { "baseline": "2020-10-06", @@ -5185,8 +5185,8 @@ "port-version": 0 }, "minitrace": { - "baseline": "2019.02.06", - "port-version": 2 + "baseline": "2023-04-23", + "port-version": 0 }, "miniupnpc": { "baseline": "2.1", @@ -5198,7 +5198,7 @@ }, "minizip": { "baseline": "1.2.13", - "port-version": 0 + "port-version": 1 }, "minizip-ng": { "baseline": "3.0.7", @@ -6382,7 +6382,7 @@ }, "python3": { "baseline": "3.10.7", - "port-version": 5 + "port-version": 6 }, "qca": { "baseline": "2.3.5", @@ -6413,15 +6413,15 @@ "port-version": 1 }, "qt": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qt-advanced-docking-system": { "baseline": "3.8.2", "port-version": 2 }, "qt3d": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qt5": { @@ -6597,63 +6597,67 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qt6betablock": { "baseline": "6.2.0-beta", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtbase": { - "baseline": "6.4.3", - "port-version": 3 + "baseline": "6.5.0", + "port-version": 0 }, "qtcharts": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.4.3", + "baseline": "6.5.0", + "port-version": 0 + }, + "qtgrpc": { + "baseline": "6.5.0", "port-version": 0 }, "qthttpserver": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtkeychain": { @@ -6665,123 +6669,127 @@ "port-version": 1 }, "qtlanguageserver": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtlocation": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.4.3", - "port-version": 2 + "baseline": "6.5.0", + "port-version": 0 }, "qtpositioning": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtquickcontrols2": { "baseline": "deprecated", "port-version": 0 }, + "qtquickeffectmaker": { + "baseline": "6.5.0", + "port-version": 0 + }, "qtquicktimeline": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtspeech": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtsvg": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qttools": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qttranslations": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "quadtree": { "baseline": "2022-04-24", "port-version": 0 }, "quantlib": { - "baseline": "1.29", + "baseline": "1.30", "port-version": 0 }, "quaternions": { @@ -7058,7 +7066,7 @@ }, "rtabmap": { "baseline": "0.21.0", - "port-version": 0 + "port-version": 1 }, "rtaudio": { "baseline": "2021-11-16", @@ -7590,7 +7598,7 @@ }, "sqlite3": { "baseline": "3.40.1", - "port-version": 2 + "port-version": 3 }, "sqlitecpp": { "baseline": "3.2.0", @@ -7713,8 +7721,8 @@ "port-version": 0 }, "superlu": { - "baseline": "5.3.0", - "port-version": 1 + "baseline": "6.0.0", + "port-version": 0 }, "symengine": { "baseline": "0.9.0", @@ -7753,7 +7761,7 @@ "port-version": 0 }, "tbb": { - "baseline": "2021.8.0", + "baseline": "2021.9.0", "port-version": 0 }, "tcb-span": { @@ -8382,7 +8390,7 @@ }, "wangle": { "baseline": "2022.03.21.00", - "port-version": 0 + "port-version": 1 }, "wasmedge": { "baseline": "0.12.0-alpha.1", @@ -8594,7 +8602,7 @@ }, "xeus": { "baseline": "0.24.3", - "port-version": 2 + "port-version": 3 }, "xframe": { "baseline": "0.3.0", @@ -8605,8 +8613,8 @@ "port-version": 4 }, "xlsxio": { - "baseline": "2021-03-24", - "port-version": 1 + "baseline": "0.2.34", + "port-version": 0 }, "xmlsec": { "baseline": "1.2.37", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index ef1e53e018a3d0..ce5b0896eb8397 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c3011f64673cff7d61bac99def8048f4027f32", + "version": "2.5.0", + "port-version": 9 + }, { "git-tree": "52229b10acbed6e24eefd37ef20b30e24c6c7e71", "version": "2.5.0", diff --git a/versions/f-/fmilib.json b/versions/f-/fmilib.json index 756e21d91a92ad..4d03231980f0ff 100644 --- a/versions/f-/fmilib.json +++ b/versions/f-/fmilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e875efe56416de71aa671c57a77817c67290f0a9", + "version": "2.4.1", + "port-version": 2 + }, { "git-tree": "aa8b7d569a23fd953d1e4de558a034a6d9f95e33", "version": "2.4.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 0dcc828ffc84ba..290ef385592883 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "204d88dbc53dc5ff37c58459c1af0c6f19f446db", + "version-string": "2022.10.31.00", + "port-version": 6 + }, { "git-tree": "2be8536b3faaf9f907284548e4db1f49b77054c1", "version-string": "2022.10.31.00", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 7b962de67072bb..4964168fe324d1 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82258d825872b8c0987fe62b759b7602edbed17b", + "version": "2.76.1", + "port-version": 1 + }, { "git-tree": "c44e4f3f2265fbdb713b8fecc8dd15418d99021e", "version": "2.76.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 7767d91c489775..86aac8dc08736f 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "631b03d07848f5a632168da7e3f9e1bc753d4085", + "version": "1.20.5", + "port-version": 6 + }, { "git-tree": "86757cb6fd9f50813cadb3779f1096fe1377eef9", "version": "1.20.5", diff --git a/versions/g-/gtkmm.json b/versions/g-/gtkmm.json index 4f27d572aa0354..59e00717c13036 100644 --- a/versions/g-/gtkmm.json +++ b/versions/g-/gtkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bede7b8a7ab28981640b17d73708e710c5e8701", + "version": "4.10.0", + "port-version": 0 + }, { "git-tree": "c20c4893b7e0aada402db3895d38d840123ae8c5", "version": "4.6.0", diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json index bc8ed1da425861..d78d1194f43e2d 100644 --- a/versions/g-/gtl.json +++ b/versions/g-/gtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1da92945b6f2d37dbf8c5e8f2c7804d7f02080fb", + "version": "1.1.8", + "port-version": 0 + }, { "git-tree": "1e858eb1464aecbfd828e88515da6c75dc9277bd", "version": "1.1.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index f3fd02c6bf9df9..c5b951ff357748 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68cf6847418f27dbd3ae70c557b1ef1357875fa1", + "version": "1.89.4", + "port-version": 1 + }, { "git-tree": "337ea84e098e85d4706ecdd807fe292933d9e6f8", "version": "1.89.4", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index 4e8ba921ec9082..afbc40cd205752 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5fde793827568c4be74cb76793650e37e3e5354", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "effc79de6dafb6ef6762bd2863a222c6090881e8", "version": "1.6.3", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 2b76372355c035..c21f23569efb0e 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2b6e5599374567a1f1f61821adc8064fcfaaa0f", + "version": "1.15.1", + "port-version": 1 + }, { "git-tree": "b1cec44f5cafb35417b528d35cad601c3b1c6952", "version": "1.15.1", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 777ed5143e29e6..a5cc0b5f568ec9 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2764640a1b2cc36636084470108de50f2b531085", + "version": "2.1.5.1", + "port-version": 1 + }, { "git-tree": "2b3b3fe0c258463586c0e421a2665ca1d2df9b4d", "version": "2.1.5.1", diff --git a/versions/l-/libtorch.json b/versions/l-/libtorch.json index 229759741e8de8..3d8f6af2599683 100644 --- a/versions/l-/libtorch.json +++ b/versions/l-/libtorch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f8ee520ffcef31a008c2c73b1155b38151ebae4", + "version": "1.12.1", + "port-version": 3 + }, { "git-tree": "1fb6e115393430795e4173a45155e80c5462cd00", "version": "1.12.1", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index e5bf286b143106..b411c10d7a9b71 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edd98363d2569c9ef358506313ce110045708f6a", + "version": "8.0.1", + "port-version": 1 + }, { "git-tree": "8fd2208b95f6ebc6f17a30cc79c3b57b1a8bcfb7", "version": "8.0.1", diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index df8cab3121592c..4d9607091924cd 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d76e69afa98f38f1b3102572a8a5516ce088b9ca", + "version": "23.0.1", + "port-version": 1 + }, { "git-tree": "87fb0741a264517b99f37f4ff2ba43264cdfe0f9", "version": "23.0.1", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index fe8427eaaf2f06..d021059291196b 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ea9d11c361ff46b14b9872df5b71b634ff1d709", + "version": "0.1.0-alpha4", + "port-version": 4 + }, { "git-tree": "756cbce0122778f80b0029e5efbec95f76e04457", "version": "0.1.0-alpha4", diff --git a/versions/m-/minitrace.json b/versions/m-/minitrace.json index 42a7e6e1cd7d4c..ffee09093e862f 100644 --- a/versions/m-/minitrace.json +++ b/versions/m-/minitrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6bb405d13f5270e92c492306f317cb01dc4ab30", + "version-date": "2023-04-23", + "port-version": 0 + }, { "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1", "version-string": "2019.02.06", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 4cd3992405c86b..e404bec6ac833b 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8831fffa825d9fafc38f1e3587046c49051ecba", + "version-semver": "1.2.13", + "port-version": 1 + }, { "git-tree": "c0843dcfad42a538a772797a3f50627b5c8d411a", "version-semver": "1.2.13", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index b418509a714c5b..88aa979324519f 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3a8a2c668d77aaf0fa1862c6b3eff5018519e19", + "version": "3.10.7", + "port-version": 6 + }, { "git-tree": "43e3e2453968d19d674b96aea99718541c96d852", "version": "3.10.7", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index cfa34d826643ae..3add2fcb82a57f 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd656220f58ebf6651801b9fc439ba5d8f6b62b", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6e93109d6a3a6a6ef65470ce467a01a931a723b9", "version": "6.4.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 90bd05b2fd4a7e..1b31dfb73af1a6 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56a3a7a27a022640d0f965aeb1d56ece4c63006d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c3c0d24660bf42af84e27538b011b36e831ba942", "version": "6.4.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 3d9f3174f48bdf..d293e8a548743e 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4a3c116018e4b6f97e056193c82af718bda10b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0a79c6cfb2113f764e603ee13a4c12493f16b6d5", "version": "6.4.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 0ca3bd6c7485c9..27a7c3c94d1ac3 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "906e0b257af28f5690907f94ad79bc95f3a34f5c", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f2ba14310d63294366c151fc33bc22807ddc4381", "version": "6.4.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 31fc3ff601feb7..08a6640edae562 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02767f9ffe5a4a96fa2555440e17e92d1795548d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "abe5601cca736c754b78f7451584d76fa06387f7", "version": "6.4.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index d7808b0279a492..d5535790adb5d2 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "501903e9d1d55ca5dbeee2ff61c8c846e77fe7b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "cc1cc5c1a5d6a7c4c10feebe8d43a069d3a375a7", "version": "6.4.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 7bafe6243fd88f..9d0dea1b2a64c4 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9cb7b445154fb5957aec5455428d0bde929fcda", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2cf33ba2051247bb8a97afec744df43f608f995f", "version": "6.4.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index fa3d2a68235e5d..3eb5bb87a0a787 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c864cedd1698478c95617d82ba56b1dd240ab2", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0ec02fcfbcdf7429b89d559491dce4912d93533a", "version": "6.4.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index ab1ed5496711e0..a4640ce6d08152 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e87723595352e8637721bea77ffc9c1ad73c031", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3c207cf03cd774a0540d8199ca4c3e5d1279949b", "version": "6.4.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 751dc6a846e808..cb08e903b8975a 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55f14b0a4149603a1d171ebf4cc99d8dfb2739c3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "b240e1a2bf68f450855c7a93d6ff755e9e519afb", "version": "6.4.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index e3a1a338904546..d4d5e0f1ebafaa 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0d4c48a9b7ef8047bb2068271fb433deddd3ffb", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d95042b70d48866fce13c9474b4bedd62ac9be7f", "version": "6.4.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index d6d53bb78e0497..b15350f5d10e06 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21885adf14cf548990d1a47fb4baf3c75bc00859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "30f0d972b16884ce41d64dea7550976b4bb102d5", "version": "6.4.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 52ace62f3b9bc4..833701a4f31f3b 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54a7e5b497830856aad12dec08b7bb01c37b4999", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6b0bc07f88766c3534b163684451151b4f7346ef", "version": "6.4.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json new file mode 100644 index 00000000000000..d028852436a744 --- /dev/null +++ b/versions/q-/qtgrpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8fb784c858ca56e7ed43e80c0d5937962a2f72b2", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 74f07476813b53..7ed7220ce5a300 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9467160ab402bfd2f04461aee718cb9043d3a094", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0725482920b4594c7f9345ef21124041aa648075", "version": "6.4.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 9c774a45babc71..8d8d9fc067243d 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a6f759bf37a0bbc86ccdac3eccbfa40816cbd79", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bf254edd44146eaac43755ff680855122d2a8705", "version": "6.4.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 43f58f66f17b77..882ef2e3a2343b 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c0fac0141ef882b26d1904189a1aafd4dc4540f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0bb5fdc2bde29cd083a90c67dc1892d68772dadc", "version": "6.4.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 6a2eb47fe688e7..219b349f4a3dbb 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "248be805b9a3c9d95efa723392d374a9c94a5c27", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9e626f373f4ca8f18e9bde990f75c34aef89baa2", "version": "6.4.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 27419f01233d17..86ed9fb5f74976 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d015b0691674d099f1a1ab1c6b812a914f3bad80", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9ff1609af9be7a187f0edcc495b0d646dc36a976", "version": "6.4.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 935d5a4b56cb8b..b24084b8ef0f97 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8d01536a9c595ddc58327caac428c86ffe2262", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d8887bee44785f3c285c103d31d6c1436908ea8f", "version": "6.4.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 38699392fbc042..06261e261a1939 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3129ca4a0ba4f6e94550a56d32228560cb3483f9", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "67ca11347716f0408dd58bec49c52b8bc3c04da5", "version": "6.4.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index a07f50f8969d00..e5a777ec545763 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a10258ebedf8a3f71b8d761b58933e40bf70fac3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "833b2e1397868c7a5ba8f195dca85ac73ddd93bc", "version": "6.4.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 385ec93f47309f..838c7cd9313bea 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "767609a9d9713dae6a4c0fd2696a1ec994e28e21", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e521ca0bc29e9c96290d6765997d4c7df3712599", "version": "6.4.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index ac1043269bf6ff..47523a1ab12b18 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e08f45ca76dba44e3de1c48d6210e1d987f44b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "4c9519c0e8f61a9f9cddd4711fb8d8a6139baef9", "version": "6.4.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 1dcc9a49c638d6..a02dc9496b15f5 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da142e2b032f345e88aed41ef444684523be056", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e6e37d5325bba76a2c912dcc537c36f5214e45d7", "version": "6.4.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 2904ac68634887..5ad1e9dd784ecc 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab3f7bbf20de8d370d5ac8711f2190d96db87f7e", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "a927a30de733a8bb6f1149dd4a5a37aeeca8f521", "version": "6.4.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 860df2f1db7d92..d3543e2862a7f5 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc5e1726976f64617ee280062596560c791d4b38", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2fe5d74e187c7131e0b799d59a9bdf056a921396", "version": "6.4.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json new file mode 100644 index 00000000000000..f7ef5feb071d96 --- /dev/null +++ b/versions/q-/qtquickeffectmaker.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fafa1b506a25f0b343afc09ee5708e885ac56076", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index c28cbcc86d0734..de8bf8cfdee373 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f9caf40f1987be65ca3ce699cd176c4453bea14", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "8272dedda604707ed4bdd252fb855ca828b41719", "version": "6.4.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 4a3f2991213d98..e6f4c86e0dfe66 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cce29bbf6dbad6125ffd59ca29bbc0fd8f9d1108", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bcb4cf681ccbf7b720b26eb93cf4d656a107652f", "version": "6.4.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 08194fe23a54f5..ee8d95fa04930d 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a900efa4d344d886cba9d538ecee24346957a76f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "60116e86139859df7acad954b48f839240e78272", "version": "6.4.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index f0773c11527406..99d0e1cb91a3dd 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2520f438dda2ec0a8b244be6e1b0fc839e26948d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "21c5259e771214cb14555b2b0310a4ef4c068294", "version": "6.4.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 120c5579c07092..99b6ab53a09409 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a3dea63a3bfc75f36c32fffd27ff7e300febc8f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3dba771f89dc1c260819b83479a1daba0a822936", "version": "6.4.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 8358f2985f1988..dbed7c2bea6ab3 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16e52bb2baeb3a3af3d096cf6357e2494b325d6", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "32ebc82d527f3da5977dcfae337c4eab9e6f228f", "version": "6.4.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 2fb92580b1b1df..bfb1122c8c95a7 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "664a5427ec4a5d715d4e09f9bbe1222810ddb898", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c935fae16c7d0dba049dae8b7cc5709c2cc237cf", "version": "6.4.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index da1c702029d652..e79adce1eab4dd 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6407a70cfbb2ced50ed116bd1e51b8f3a7e54c8a", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3e3478f6de5a8d655c7d97e40b158bc7dfdfa39c", "version": "6.4.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e25bfc50088a9e..54159cb07b97c4 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "816b0eb532cf6901c8448ccba8363cfe9938ef5b", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "864d53d5bedd0946c9790551a06258580647478f", "version": "6.4.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index a1df9ef99c4260..08e13092e4fd79 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f3e02443f5bc251e7fdaffdfe1079ac2d1492a42", "version": "6.4.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index a657006ad32972..c4fca0f9a0fdd3 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b75cda024ccc8c8ba3f9a196a9a6149309d93425", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "48b6fd21acccdffacd9390b9b860a5b2e3ba554a", "version": "6.4.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 5b282747e42b5c..da12f197a52681 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2591b11ad8fe48bb353ece5a06c8c27492cb1c1d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6cbb11db41affe7798e62dbec8ebb5aa8e728b5d", "version": "6.4.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index f241ad6db10523..09f6b847b9986d 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "860b82f5d06b7f0eed9ed449507a47d156cfb4ca", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f40d9bfc0c57c9facd1b4db9da9eaa7ba565692c", "version": "6.4.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 9a798ee8c08698..794c2aef273397 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40d6a94591187d5fdfb57beebbbad45aa26a1859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "27b0c979401491880b2dad92b728e14fb5b7e37b", "version": "6.4.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index c7d109d2ff7366..1e36fc3adc6f3d 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d44e1b4b4683a771c3457652baef60f290f1776", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "7a5dda5f36b2686d421d061f93a73da169815174", "version": "6.4.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 28cd5b519b5332..eeb9b6911441aa 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c325d5163eea00256739eb59ac084c0c386c2b0d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "89352bf06b1d966295a7b5e919836e9994eef0a9", "version": "6.4.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index ddab3b39655060..49fcca77d814ce 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250bcb4eb32ec73ee4376ec7af6a365c8f8f61f1", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "cef8861fee214027a5ade446692eafb6490fb7ea", "version": "6.4.3", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 9774fee3b57edc..fb1ea4d3f442d1 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a4c25e9a7ca2099d8a528f7477a43fd60a271bb", + "version": "1.30", + "port-version": 0 + }, { "git-tree": "0b303bae8ef48f28c1cf4cf88b717756c1a20a1b", "version": "1.29", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index fb84b55756988e..f063294b3cec2c 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a0ba7b4b9ea0239aa474d40263d96919a81958c", + "version": "0.21.0", + "port-version": 1 + }, { "git-tree": "557a37dc751f64ec6040505e57074251f2441822", "version": "0.21.0", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 19dcb07683bd77..358d74496a04cf 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "846077eab115952eeb4dda0eaae97a3eb776fa9f", + "version": "3.40.1", + "port-version": 3 + }, { "git-tree": "6bb52479b5ab874f6283e585a3bf2294f52966ca", "version": "3.40.1", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 5e425fa781d504..45548e8cd1de72 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8187a877fbae6bdc54d5922753a1d67141576be0", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "bcc27a8221ab0323b537025944ebc20ae56c36ac", "version": "5.3.0", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 23d443e1b7ff44..55cedc1cc90562 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a44303f590164f98542c516a049e1328a178bc2", + "version": "2021.9.0", + "port-version": 0 + }, { "git-tree": "d08a7732c5a162a88ac98871ebf98869d5490a97", "version": "2021.8.0", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index d764dcfead5c76..399ed59dc87b3d 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e79739dcf42e3dd4d0e32c595b27ece48c762bdd", + "version-string": "2022.03.21.00", + "port-version": 1 + }, { "git-tree": "6f0fec69eddf934964ee77b9923f68da2c3c7724", "version-string": "2022.03.21.00", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index 15c72b6b7dc6c5..eda395f433ba61 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b36c5dea30b1657552313a07c10623753918b1bf", + "version": "0.24.3", + "port-version": 3 + }, { "git-tree": "58ccbb03903ad023da77a9a53225dc4bd25df600", "version": "0.24.3", diff --git a/versions/x-/xlsxio.json b/versions/x-/xlsxio.json index da0b392025b73f..a56ac4283983af 100644 --- a/versions/x-/xlsxio.json +++ b/versions/x-/xlsxio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd38fc13e5e2b58d149261e8d692e1df7f93b88a", + "version": "0.2.34", + "port-version": 0 + }, { "git-tree": "6b4eb1ccf9e863a9291e03521af9ff4d62f5eb3d", "version-date": "2021-03-24",