From a860584a83f45e34be0c4d0868a914b0ba0aadaf Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 26 Feb 2026 19:01:40 +0900 Subject: [PATCH 1/3] [libmaxminddb] update to 1.13.2 --- ports/libmaxminddb/portfile.cmake | 56 +++++++++++++++---------------- ports/libmaxminddb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmaxminddb.json | 5 +++ 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index dcaf6beb2b252c..b4e35bf267285c 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -1,28 +1,28 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO maxmind/libmaxminddb - REF "${VERSION}" - SHA512 b5fe1eeffca697a7163fd3e66ae489eb144f5c35e601fcd29b37ec7996f7a485da6cd06431e452050731e09e889e96bc58e32b06c40fbef30f7e79781e492d85 - HEAD_REF main -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_SHARED_LIBRARY_PREFIX=lib - -DCMAKE_STATIC_LIBRARY_PREFIX=lib - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d -) -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO maxmind/libmaxminddb + REF "${VERSION}" + SHA512 681bbfd830cf7ff8f0d2945043a9da977de470e9796984d11c31c237d83b936f6f6ebd95def02869b39030d5c7d4734c3b573875ba8a924421c7d90f63ce7977 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_SHARED_LIBRARY_PREFIX=lib + -DCMAKE_STATIC_LIBRARY_PREFIX=lib + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index b6488950b5dd72..7f2c5a85910546 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmaxminddb", - "version": "1.12.2", + "version": "1.13.2", "description": "C library for the MaxMind DB file format", "homepage": "https://github.com/maxmind/libmaxminddb", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9fdf86c187345d..0dc26e70a5131e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5141,7 +5141,7 @@ "port-version": 0 }, "libmaxminddb": { - "baseline": "1.12.2", + "baseline": "1.13.2", "port-version": 0 }, "libmediainfo": { diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index f1807e601beae1..febba0ffbb609e 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "347a4b0e8f23e6a35d5d4c34f6b7345525ac45f4", + "version": "1.13.2", + "port-version": 0 + }, { "git-tree": "7d86d8b0cf78e319edc3584aabaf2d896aefed59", "version": "1.12.2", From dcde1e11322db0a932d1e85ec4efe5819daee9a4 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 26 Feb 2026 19:02:50 +0900 Subject: [PATCH 2/3] revert end of lines --- ports/libmaxminddb/portfile.cmake | 56 +++++++++++++++---------------- versions/l-/libmaxminddb.json | 2 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index b4e35bf267285c..8f90d246e76fd9 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -1,28 +1,28 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO maxmind/libmaxminddb - REF "${VERSION}" - SHA512 681bbfd830cf7ff8f0d2945043a9da977de470e9796984d11c31c237d83b936f6f6ebd95def02869b39030d5c7d4734c3b573875ba8a924421c7d90f63ce7977 - HEAD_REF main -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF - -DCMAKE_SHARED_LIBRARY_PREFIX=lib - -DCMAKE_STATIC_LIBRARY_PREFIX=lib - OPTIONS_DEBUG - -DCMAKE_DEBUG_POSTFIX=d -) -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -# Handle copyright -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO maxmind/libmaxminddb + REF "${VERSION}" + SHA512 681bbfd830cf7ff8f0d2945043a9da977de470e9796984d11c31c237d83b936f6f6ebd95def02869b39030d5c7d4734c3b573875ba8a924421c7d90f63ce7977 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_SHARED_LIBRARY_PREFIX=lib + -DCMAKE_STATIC_LIBRARY_PREFIX=lib + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/maxminddb PACKAGE_NAME maxminddb) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Handle copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index febba0ffbb609e..00f06fe6e9722b 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "347a4b0e8f23e6a35d5d4c34f6b7345525ac45f4", + "git-tree": "b5a78d14200f3cf32ca364f9c1fd3ef793b26a5f", "version": "1.13.2", "port-version": 0 }, From f9a41ecf09ab0242b9b70754727b4925fda55c10 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 26 Feb 2026 19:22:30 +0900 Subject: [PATCH 3/3] link Thread::Thread instead of pthread --- ports/libmaxminddb/fix-link-thread.patch | 14 ++++++++++++++ ports/libmaxminddb/portfile.cmake | 2 ++ versions/l-/libmaxminddb.json | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ports/libmaxminddb/fix-link-thread.patch diff --git a/ports/libmaxminddb/fix-link-thread.patch b/ports/libmaxminddb/fix-link-thread.patch new file mode 100644 index 00000000000000..09cd837e512745 --- /dev/null +++ b/ports/libmaxminddb/fix-link-thread.patch @@ -0,0 +1,14 @@ +diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt +index ea69ce3..94fc75a 100644 +--- a/bin/CMakeLists.txt ++++ b/bin/CMakeLists.txt +@@ -13,7 +13,8 @@ if(NOT MSVC) + + target_compile_definitions(mmdblookup PRIVATE PACKAGE_VERSION="${PROJECT_VERSION}") + +- target_link_libraries(mmdblookup maxminddb pthread) ++ find_package(Threads) ++ target_link_libraries(mmdblookup maxminddb Threads::Threads) + + if (MAXMINDDB_INSTALL) + install( diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index 8f90d246e76fd9..df47e204275ad6 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF "${VERSION}" SHA512 681bbfd830cf7ff8f0d2945043a9da977de470e9796984d11c31c237d83b936f6f6ebd95def02869b39030d5c7d4734c3b573875ba8a924421c7d90f63ce7977 HEAD_REF main + PATCHES + fix-link-thread.patch ) vcpkg_cmake_configure( diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index 00f06fe6e9722b..6ea2bda48b4641 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b5a78d14200f3cf32ca364f9c1fd3ef793b26a5f", + "git-tree": "78d917b1427ce9c81d078f928c69161de4b2c84d", "version": "1.13.2", "port-version": 0 },