diff --git a/ports/libbson/disable-dynamic-when-static.patch b/ports/libbson/disable-dynamic-when-static.patch deleted file mode 100644 index 4bf375b05c17e7..00000000000000 --- a/ports/libbson/disable-dynamic-when-static.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 61e926747..6b4c5a911 100644 ---- a/src/libbson/CMakeLists.txt -+++ b/src/libbson/CMakeLists.txt -@@ -205,6 +205,7 @@ set (HEADERS_FORWARDING - ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h - ) - -+if(NOT MONGOC_ENABLE_STATIC_BUILD) - add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - if (MSVC AND MSVC_VERSION VERSION_LESS 1900) - message (STATUS "Disabling warning C4756 for VS 2013 and older") -@@ -282,6 +283,7 @@ if (WIN32) - # must be handled specially since we can't resolve them - set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) - endif () -+endif() - - if (MONGOC_ENABLE_STATIC_BUILD) - add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -367,7 +369,7 @@ set (BSON_HEADER_INSTALL_DIR - ) - - if (MONGOC_ENABLE_STATIC_INSTALL) -- set (TARGETS_TO_INSTALL bson_shared bson_static) -+ set (TARGETS_TO_INSTALL bson_static) - else () - set (TARGETS_TO_INSTALL bson_shared) - endif () -@@ -418,12 +420,14 @@ configure_file ( - ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc - @ONLY) - -+if(NOT MONGOC_ENABLE_STATIC_INSTALL) - install ( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/src/libbson-1.0.pc - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -+endif() - - if (MONGOC_ENABLE_STATIC_INSTALL) - configure_file ( diff --git a/ports/libbson/fix-include-directory.patch b/ports/libbson/fix-include-directory.patch index 02a35320dcbb91..398644f90ccdab 100644 --- a/ports/libbson/fix-include-directory.patch +++ b/ports/libbson/fix-include-directory.patch @@ -1,33 +1,13 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 88de79a..c3cfd7e 100644 +index e3eaca4..ef3644b 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -347,7 +347,7 @@ if (ENABLE_EXAMPLES) - endif () # ENABLE_EXAMPLES +@@ -302,7 +302,7 @@ endif () # ENABLE_EXAMPLES + # 8888888 888 888 88888P' "Y888 "Y888888 888 888 set (BSON_HEADER_INSTALL_DIR - "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}" + "${CMAKE_INSTALL_INCLUDEDIR}" ) - - if (MONGOC_ENABLE_STATIC_INSTALL) -diff --git a/src/libbson/src/libbson-1.0.pc.in b/src/libbson/src/libbson-1.0.pc.in -index b65abbc..33346f3 100644 ---- a/src/libbson/src/libbson-1.0.pc.in -+++ b/src/libbson/src/libbson-1.0.pc.in -@@ -7,4 +7,4 @@ Name: libbson - Description: The libbson BSON serialization library. - Version: @VERSION@ - Libs: -L${libdir} -lbson-@BSON_API_VERSION@ --Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -+Cflags: -I${includedir} -diff --git a/src/libbson/src/libbson-static-1.0.pc.in b/src/libbson/src/libbson-static-1.0.pc.in -index 6ee58d0..e03a95b 100644 ---- a/src/libbson/src/libbson-static-1.0.pc.in -+++ b/src/libbson/src/libbson-static-1.0.pc.in -@@ -7,4 +7,4 @@ Name: libbson static archive - Description: The libbson BSON serialization library. - Version: @VERSION@ - Libs: -L${libdir} -lbson-static-@BSON_API_VERSION@ @LIBBSON_LIBRARIES@ --Cflags: -I${includedir}/libbson-@BSON_API_VERSION@ -DBSON_STATIC -+Cflags: -I${includedir} -DBSON_STATIC + function(install_export_target target) + # Tell pkg-config where the headers are going: diff --git a/ports/libbson/fix-missing-header.patch b/ports/libbson/fix-missing-header.patch deleted file mode 100644 index eee0e1907bb244..00000000000000 --- a/ports/libbson/fix-missing-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 61e926747..715b304c0 100644 ---- a/src/libbson/CMakeLists.txt -+++ b/src/libbson/CMakeLists.txt -@@ -181,6 +181,7 @@ set (HEADERS - ${PROJECT_SOURCE_DIR}/src/bson/bson-compat.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-context.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-decimal128.h -+ ${PROJECT_SOURCE_DIR}/src/bson/bson-dsl.h # mongo-c-driver build time only - ${PROJECT_SOURCE_DIR}/src/bson/bson-endian.h - ${PROJECT_SOURCE_DIR}/src/bson/bson-error.h - ${PROJECT_SOURCE_DIR}/src/bson/bson.h diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 38341d152ec0a6..235ace6e827eb1 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,17 +1,13 @@ # This port needs to be updated at the same time as mongo-c-driver -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 + SHA512 e35878eed6fe56a383eeb07795bcb6bfbaa29cd3d63c0efd67748e10982c9c1294c2de2127471b1f154ea658747c3a98e8d9f9a1cbcf1f5bf4ec6aa6e7b276a6 HEAD_REF master PATCHES - disable-dynamic-when-static.patch fix-include-directory.patch # vcpkg legacy decision - fix-missing-header.patch # for building mongo-c-driver ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") @@ -26,7 +22,6 @@ vcpkg_cmake_configure( OPTIONS -DENABLE_BSON=ON -DENABLE_EXAMPLES=OFF - -DENABLE_ICU=OFF -DENABLE_MONGOC=OFF -DENABLE_SASL=OFF -DENABLE_SNAPPY=OFF @@ -59,6 +54,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver" ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright( diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index ba4d23c8a9676c..242b3d095df878 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libbson", - "version": "1.24.3", + "version": "1.25.0", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson", "license": null, diff --git a/ports/mongo-c-driver/disable-dynamic-when-static.patch b/ports/mongo-c-driver/disable-dynamic-when-static.patch deleted file mode 100644 index 4404dfcad42cf3..00000000000000 --- a/ports/mongo-c-driver/disable-dynamic-when-static.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index bf95bd0c1..c9900b7fa 100644 ---- a/src/libmongoc/CMakeLists.txt -+++ b/src/libmongoc/CMakeLists.txt -@@ -745,6 +745,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) - set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") - endif () - -+if (NOT MONGOC_ENABLE_STATIC_BUILD) - add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) - target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -786,7 +787,7 @@ target_include_directories ( - set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) - set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") - --if (MONGOC_ENABLE_STATIC_BUILD) -+else() - add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - if(ENABLE_COVERAGE) - target_compile_options(mongoc_static PRIVATE --coverage) -@@ -840,7 +841,11 @@ if (ENABLE_APPLE_FRAMEWORK) - endif () - - add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) -+if (NOT MONGOC_ENABLE_STATIC_BUILD) - target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) -+else() -+target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) -+endif() - - # mongoc-stat works if shared memory performance counters are enabled. - if (ENABLE_SHM_COUNTERS) -@@ -1161,7 +1166,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} - file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) - - if (MONGOC_ENABLE_STATIC_INSTALL) -- set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) -+ set (TARGETS_TO_INSTALL mongoc_static) - else () - set (TARGETS_TO_INSTALL mongoc_shared) - endif () -@@ -1226,10 +1231,12 @@ configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-1.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc - @ONLY) -+if(NOT MONGOC_ENABLE_STATIC_INSTALL) - install ( - FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-1.0.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -+endif() - if (MONGOC_ENABLE_STATIC_INSTALL) - configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-static-1.0.pc.in -@@ -1239,7 +1246,7 @@ if (MONGOC_ENABLE_STATIC_INSTALL) - FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-static-1.0.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) --endif () -+else() - # Deprecated alias for libmongoc-1.0.pc, see CDRIVER-2086. - if (MONGOC_ENABLE_SSL) - configure_file ( -@@ -1251,6 +1258,7 @@ if (MONGOC_ENABLE_SSL) - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) - endif () -+endif() - - include (CMakePackageConfigHelpers) - set (INCLUDE_INSTALL_DIRS "${MONGOC_HEADER_INSTALL_DIR}") diff --git a/ports/mongo-c-driver/fix-dependencies.patch b/ports/mongo-c-driver/fix-dependencies.patch index 90c9585c559a48..6dd310f1de4a62 100644 --- a/ports/mongo-c-driver/fix-dependencies.patch +++ b/ports/mongo-c-driver/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 71c13fd..8464824 100644 +index 1fe4c76..96be699 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -205,11 +205,9 @@ if (ENABLE_BSON STREQUAL SYSTEM) +@@ -347,11 +347,9 @@ if (USE_SYSTEM_LIBBSON) set (USING_SYSTEM_BSON TRUE) if (NOT TARGET mongo::bson_shared) @@ -14,11 +14,39 @@ index 71c13fd..8464824 100644 endif () set (BSON_STATIC_LIBRARIES mongo::bson_static) endif () +diff --git a/build/cmake/libmongoc-1.0-config.cmake.in b/build/cmake/libmongoc-1.0-config.cmake.in +index a068408..d0aeadd 100644 +--- a/build/cmake/libmongoc-1.0-config.cmake.in ++++ b/build/cmake/libmongoc-1.0-config.cmake.in +@@ -24,6 +24,9 @@ set (MONGOC_VERSION_FULL @libmongoc_VERSION_FULL@) + + include(CMakeFindDependencyMacro) + find_dependency (mongoc-1.0) ++if("@ENABLE_SNAPPY@" STREQUAL "ON") ++ find_dependency(Snappy CONFIG) ++endif() + + set(MONGOC_LIBRARY mongo::mongoc_shared) + set(MONGOC_LIBRARIES mongo::mongoc_shared) +diff --git a/build/cmake/libmongoc-static-1.0-config.cmake.in b/build/cmake/libmongoc-static-1.0-config.cmake.in +index bec3163..a32d5f3 100644 +--- a/build/cmake/libmongoc-static-1.0-config.cmake.in ++++ b/build/cmake/libmongoc-static-1.0-config.cmake.in +@@ -24,6 +24,9 @@ set (MONGOC_STATIC_VERSION_FULL @libmongoc_VERSION_FULL@) + + include(CMakeFindDependencyMacro) + find_dependency (mongoc-1.0) ++if("@ENABLE_SNAPPY@" STREQUAL "ON") ++ find_dependency(Snappy CONFIG) ++endif() + + set(MONGOC_STATIC_LIBRARY mongo::mongoc_static) + set(MONGOC_STATIC_LIBRARIES mongo::mongoc_static) diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index d108e5d..a097016 100644 +index 8d5e3f6..2fa6799 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -51,7 +51,7 @@ configure_file ( +@@ -50,7 +50,7 @@ endif () set (ZLIB_INCLUDE_DIRS "") if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") message (STATUS "Searching for zlib CMake packages") @@ -27,20 +55,10 @@ index d108e5d..a097016 100644 if (ZLIB_FOUND) message (STATUS " zlib found version \"${ZLIB_VERSION_STRING}\"") message (STATUS " zlib include path \"${ZLIB_INCLUDE_DIRS}\"") -@@ -146,7 +146,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) - if (ENABLE_SSL STREQUAL "OPENSSL" - OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) - # Sets OPENSSL_FOUND on success. -- include (FindOpenSSL) -+ find_package(OpenSSL REQUIRED) - endif () - - if (ENABLE_SSL STREQUAL LIBRESSL) -@@ -364,10 +364,10 @@ else () - endif () +@@ -469,9 +469,10 @@ endif () # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS. --include (FindSnappy) + include (FindSnappy) -if (SNAPPY_INCLUDE_DIRS) +if(ENABLE_SNAPPY) + find_package(Snappy CONFIG REQUIRED) @@ -49,45 +67,17 @@ index d108e5d..a097016 100644 - include_directories ("${SNAPPY_INCLUDE_DIRS}") endif () - set (MONGOC_ENABLE_SHM_COUNTERS 0) -diff --git a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -index feeca02..1ec92ae 100644 ---- a/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -+++ b/src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in -@@ -19,6 +19,10 @@ set (MONGOC_MINOR_VERSION @MONGOC_MINOR_VERSION@) - set (MONGOC_MICRO_VERSION @MONGOC_MICRO_VERSION@) - set (MONGOC_VERSION @MONGOC_VERSION@) - -+include(CMakeFindDependencyMacro) -+if("@ENABLE_SNAPPY@" STREQUAL "ON") -+ find_dependency(Snappy CONFIG) -+endif() - find_package (libbson-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) - - @PACKAGE_INIT@ -diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -index 6f05b0c..0e388e6 100644 ---- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -+++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -@@ -19,6 +19,10 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@) - set (MONGOC_STATIC_MICRO_VERSION @MONGOC_MICRO_VERSION@) - set (MONGOC_STATIC_VERSION @MONGOC_VERSION@) - -+include(CMakeFindDependencyMacro) -+if("@ENABLE_SNAPPY@" STREQUAL "ON") -+ find_dependency(Snappy CONFIG) -+endif() - find_package (libbson-static-1.0 "@MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@" REQUIRED) - - @PACKAGE_INIT@ + mongo_bool01 (MONGOC_ENABLE_SHM_COUNTERS ENABLE_SHM_COUNTERS) diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake -index 7fe7cf4..12611a3 100644 +index 31e6cbc..365fb5b 100644 --- a/src/libmongoc/src/mongoc-config.cmake +++ b/src/libmongoc/src/mongoc-config.cmake -@@ -1,3 +1,6 @@ +@@ -1,5 +1,8 @@ include(CMakeFindDependencyMacro) + find_dependency(bson-1.0 @libmongoc_VERSION@) +if("@ENABLE_SNAPPY@" STREQUAL "ON") + find_dependency(Snappy CONFIG) +endif() - find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@) - include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") + + # If we need to import a TLS package for our imported targets, do that now: + set(MONGOC_TLS_BACKEND [[@TLS_BACKEND@]]) diff --git a/ports/mongo-c-driver/fix-include-directory.patch b/ports/mongo-c-driver/fix-include-directory.patch index 411604fe36f129..bb63f33f2024e1 100644 --- a/ports/mongo-c-driver/fix-include-directory.patch +++ b/ports/mongo-c-driver/fix-include-directory.patch @@ -1,33 +1,13 @@ -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 86f59ae..d108e5d 100644 ---- a/src/libmongoc/CMakeLists.txt -+++ b/src/libmongoc/CMakeLists.txt -@@ -1172,7 +1172,7 @@ else () - endif () - - set (MONGOC_HEADER_INSTALL_DIR -- "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}" -+ "${CMAKE_INSTALL_INCLUDEDIR}" - ) - - install ( -diff --git a/src/libmongoc/src/libmongoc-1.0.pc.in b/src/libmongoc/src/libmongoc-1.0.pc.in -index 1b489d8..991603e 100644 ---- a/src/libmongoc/src/libmongoc-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-1.0.pc.in -@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library. - Version: @VERSION@ - Requires: libbson-1.0 - Libs: -L${libdir} -lmongoc-1.0 --Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -+Cflags: -I${includedir} -diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in -index d59ee64..c23bb62 100644 ---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in -@@ -8,4 +8,4 @@ Description: The libmongoc MongoDB client library. - Version: @VERSION@ - Requires: libbson-static-1.0 - Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@ --Cflags: -I${includedir}/libmongoc-@MONGOC_API_VERSION@ -DMONGOC_STATIC -+Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index 61cae9c..8d5e3f6 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -1250,7 +1250,7 @@ else () + endif () + + set (MONGOC_HEADER_INSTALL_DIR +- "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}" ++ "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + install ( diff --git a/ports/mongo-c-driver/fix-mingw.patch b/ports/mongo-c-driver/fix-mingw.patch index 2695cea12af271..d7fd3429f30404 100644 --- a/ports/mongo-c-driver/fix-mingw.patch +++ b/ports/mongo-c-driver/fix-mingw.patch @@ -1,43 +1,21 @@ -diff --git a/build/cmake/FindResSearch.cmake b/build/cmake/FindResSearch.cmake -index fcd791b..346f715 100644 ---- a/build/cmake/FindResSearch.cmake -+++ b/build/cmake/FindResSearch.cmake -@@ -2,7 +2,7 @@ include (CheckSymbolExists) +diff --git a/build/cmake/ResSearch.cmake b/build/cmake/ResSearch.cmake +index b3eecf3..f3131ec 100644 +--- a/build/cmake/ResSearch.cmake ++++ b/build/cmake/ResSearch.cmake +@@ -9,7 +9,7 @@ set(RESOLVE_LIB_NAME) + set(resolve_is_libc FALSE) - if (ENABLE_SRV STREQUAL ON OR ENABLE_SRV STREQUAL AUTO) - if (WIN32) -- set (RESOLV_LIBRARIES Dnsapi) -+ set (RESOLV_LIBRARIES dnsapi) - set (MONGOC_HAVE_DNSAPI 1) - set (MONGOC_HAVE_RES_NSEARCH 0) - set (MONGOC_HAVE_RES_NDESTROY 0) -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 2e1f854..95e6b6b 100644 ---- a/src/libmongoc/CMakeLists.txt -+++ b/src/libmongoc/CMakeLists.txt -@@ -688,7 +688,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-secure-channel.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-secure-channel.c - ) -- set (SSL_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib) -+ set (SSL_LIBRARIES secur32.lib crypt32.lib bcrypt.lib) - elseif (LIBRESSL) - message (STATUS "Compiling against LibreSSL") - set (SOURCES ${SOURCES} -@@ -714,7 +714,7 @@ if (MONGOC_ENABLE_SASL) - message (STATUS "Compiling against Windows SSPI") - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cluster-sspi.c) - set (SOURCES ${SOURCES} ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-sspi.c) -- set (SASL_LIBRARIES secur32.lib crypt32.lib Shlwapi.lib) -+ set (SASL_LIBRARIES secur32.lib crypt32.lib shlwapi.lib) - endif () - else () - message (STATUS "SASL disabled") + if(WIN32) +- set(RESOLVE_LIB_NAME Dnsapi) ++ set(RESOLV_LIBRARIES dnsapi) + set(_MONGOC_HAVE_DNSAPI 1) + else() + # Try to find the search functions for various configurations. diff --git a/src/libmongoc/src/mongoc/mongoc-client.c b/src/libmongoc/src/mongoc/mongoc-client.c -index 457c841..7b6d585 100644 +index 15517e6..bd762d0 100644 --- a/src/libmongoc/src/mongoc/mongoc-client.c +++ b/src/libmongoc/src/mongoc/mongoc-client.c -@@ -19,8 +19,8 @@ +@@ -18,8 +18,8 @@ #include "mongoc-config.h" #ifdef MONGOC_HAVE_DNSAPI /* for DnsQuery_UTF8 */ @@ -49,7 +27,7 @@ index 457c841..7b6d585 100644 #else #if defined(MONGOC_HAVE_RES_NSEARCH) || defined(MONGOC_HAVE_RES_SEARCH) diff --git a/src/libmongoc/src/mongoc/mongoc-socket.c b/src/libmongoc/src/mongoc/mongoc-socket.c -index e085adb..592bc89 100644 +index e7840d2..3bac0d9 100644 --- a/src/libmongoc/src/mongoc/mongoc-socket.c +++ b/src/libmongoc/src/mongoc/mongoc-socket.c @@ -25,7 +25,7 @@ diff --git a/ports/mongo-c-driver/pkgconfig.patch b/ports/mongo-c-driver/pkgconfig.patch deleted file mode 100644 index 65a94c20bc8834..00000000000000 --- a/ports/mongo-c-driver/pkgconfig.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 1b32e6c..2e1f854 100644 ---- a/src/libmongoc/CMakeLists.txt -+++ b/src/libmongoc/CMakeLists.txt -@@ -1207,6 +1207,22 @@ set (VERSION "${MONGOC_VERSION}") - set (prefix "${CMAKE_INSTALL_PREFIX}") - set (libdir "\${prefix}/${CMAKE_INSTALL_LIBDIR}") - -+set(MONGOC_REQUIRES_PRIVATE zlib) -+set(ZLIB_LIBRARIES "") -+if(ENABLE_SSL STREQUAL "OPENSSL") -+ string(APPEND MONGOC_REQUIRES_PRIVATE " openssl") -+ set(SSL_LIBRARIES "") -+endif() -+if(ENABLE_ICU) -+ string(APPEND MONGOC_REQUIRES_PRIVATE " icu-uc") -+ set(ICU_LIBRARIES "") -+endif() -+if(ENABLE_SNAPPY) -+ set(SNAPPY_LIBRARIES "-lsnappy") -+ if(CMAKE_BUILD_TYPE STREQUAL "Debug") -+ string(APPEND SNAPPY_LIBRARIES "d") -+ endif() -+endif() - foreach ( - FLAG - ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} -diff --git a/src/libmongoc/src/libmongoc-static-1.0.pc.in b/src/libmongoc/src/libmongoc-static-1.0.pc.in -index c23bb62..7b38f0a 100644 ---- a/src/libmongoc/src/libmongoc-static-1.0.pc.in -+++ b/src/libmongoc/src/libmongoc-static-1.0.pc.in -@@ -9,3 +9,4 @@ Version: @VERSION@ - Requires: libbson-static-1.0 - Libs: -L${libdir} -lmongoc-static-1.0 @MONGOC_LIBRARIES@ - Cflags: -I${includedir}/libmongoc -DMONGOC_STATIC -+Requires.private: @MONGOC_REQUIRES_PRIVATE@ diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index f04c6575adb457..ab1ef8c290f609 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,19 +1,15 @@ # This port needs to be updated at the same time as libbson -vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION} - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver REF "${VERSION}" - SHA512 242416638bf6722ccda67ecc15cf78f8531f1a4ae0e89fd66cde74221d7b98b859442f5b70628802972961e69156fd7afcc916d7a83cc134d5723eb0b6e15cc9 + SHA512 e35878eed6fe56a383eeb07795bcb6bfbaa29cd3d63c0efd67748e10982c9c1294c2de2127471b1f154ea658747c3a98e8d9f9a1cbcf1f5bf4ec6aa6e7b276a6 HEAD_REF master PATCHES - disable-dynamic-when-static.patch fix-include-directory.patch # vcpkg legacy decision fix-dependencies.patch fix-mingw.patch - pkgconfig.patch ) file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${VERSION}") @@ -25,7 +21,6 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS FEATURES - icu ENABLE_ICU snappy ENABLE_SNAPPY zstd ENABLE_ZSTD ) @@ -40,9 +35,7 @@ else() list(APPEND OPTIONS -DENABLE_SSL=OFF) endif() -if(VCPKG_TARGET_IS_ANDROID) - vcpkg_list(APPEND OPTIONS -DENABLE_SRV=OFF) -endif() +vcpkg_list(APPEND OPTIONS -DENABLE_SRV=OFF) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index ef533e5213f55c..3ad43b2e0da617 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.24.3", + "version": "1.25.0", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "license": null, @@ -25,12 +25,6 @@ "zlib" ], "features": { - "icu": { - "description": "Enable ICU support, necessary to use non-ASCII usernames or passwords", - "dependencies": [ - "icu" - ] - }, "openssl": { "description": "Use OpenSSL (even on Windows or Apple systems)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2bd55d130fd6bc..f5fcf3082a3009 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4061,7 +4061,7 @@ "port-version": 4 }, "libbson": { - "baseline": "1.24.3", + "baseline": "1.25.0", "port-version": 0 }, "libcaer": { @@ -5593,7 +5593,7 @@ "port-version": 2 }, "mongo-c-driver": { - "baseline": "1.24.3", + "baseline": "1.25.0", "port-version": 0 }, "mongo-cxx-driver": { diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 0fe63b070037c3..243ac42245a9fa 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8efce9b040408e5285963af828ebacd014507554", + "version": "1.25.0", + "port-version": 0 + }, { "git-tree": "3a3f08e9e91a77ee7b6b56f88d1e0013349c34e1", "version": "1.24.3", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index f94ce8b967aaba..8af2b0f4f4cd75 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1522f05022072a57328fcaabbcc2084e76b28c53", + "version": "1.25.0", + "port-version": 0 + }, { "git-tree": "c9ddb78bc06cb779848d6afffa88938870ae8a7b", "version": "1.24.3",