From 69256d68415f9ef9c0474c3cc2a47755d6ea253c Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 17 Dec 2025 03:55:51 +0900 Subject: [PATCH] [libconfig] update to 1.8.2 (#48899) --- ports/libconfig/portfile.cmake | 2 +- ports/libconfig/static-build.diff | 28 ++++++++++++++++------------ ports/libconfig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libconfig.json | 5 +++++ 5 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index 02a1993075..8fd898ea99 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hyperrealm/libconfig REF "v${VERSION}" - SHA512 1d9d7b21baf73259c09b503ca02942bdf847741378f8c3d7e138c9b4979c5304aae510595958fe1842b726778cedf2aaeb1844f8b209a61ccb24debea592bd0c + SHA512 c3ed6c8f500b449c4d94976745a3acba1c7176f87497d5cb0deb05e62f2ff009ca0636c7c9848601f6d92dd113d82983cbd1132735f0f2d4e40b32d257f4aaa7 HEAD_REF master PATCHES static-build.diff diff --git a/ports/libconfig/static-build.diff b/ports/libconfig/static-build.diff index b7aef3606e..60a6013b67 100644 --- a/ports/libconfig/static-build.diff +++ b/ports/libconfig/static-build.diff @@ -1,5 +1,5 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 5f44454..d488e7a 100644 +index 0f2f550..4003e6c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -49,7 +49,6 @@ set(libinc_cpp @@ -10,25 +10,29 @@ index 5f44454..d488e7a 100644 libconfigcpp.cc) if(MSVC) -@@ -82,8 +81,10 @@ set_version_info_from_makefile("Makefile.am" ${libname}) - set_version_info_from_makefile("Makefile.am" ${libname}++) +@@ -92,11 +91,13 @@ endif() if(BUILD_SHARED_LIBS) -+ target_sources(${libname}++ PRIVATE ${libsrc}) - target_compile_definitions(${libname}++ PRIVATE LIBCONFIG_STATIC) + if(BUILD_CXX) ++ target_sources(${libname}++ PRIVATE ${libsrc}) + target_compile_definitions(${libname}++ PRIVATE LIBCONFIG_STATIC) + endif() else() -+ target_link_libraries(${libname}++ PRIVATE ${libname}) target_compile_definitions(${libname} PUBLIC LIBCONFIG_STATIC) - target_compile_definitions(${libname}++ PUBLIC LIBCONFIG_STATIC LIBCONFIGXX_STATIC) + if(BUILD_CXX) ++ target_link_libraries(${libname}++ PRIVATE ${libname}) + target_compile_definitions(${libname}++ PUBLIC LIBCONFIG_STATIC LIBCONFIGXX_STATIC) + endif() endif() -@@ -134,8 +135,8 @@ if(MSVC) +@@ -154,9 +155,9 @@ if(MSVC) endif() if(WIN32) - target_link_libraries(${libname} shlwapi) -- target_link_libraries(${libname}++ shlwapi) -+ target_link_libraries(${libname} PRIVATE shlwapi) -+ target_link_libraries(${libname}++ PRIVATE shlwapi) ++ target_link_libraries(${libname} PRIVATE shlwapi) + if(BUILD_CXX) +- target_link_libraries(${libname}++ shlwapi) ++ target_link_libraries(${libname}++ PRIVATE shlwapi) + endif() endif() - target_include_directories(${libname} diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json index 76673d9584..e3b42b62f0 100644 --- a/ports/libconfig/vcpkg.json +++ b/ports/libconfig/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libconfig", - "version": "1.8.1", + "version": "1.8.2", "description": "C/C++ library for processing configuration files", "homepage": "https://github.com/hyperrealm/libconfig", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index edb46ae671..db906edece 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4685,7 +4685,7 @@ "port-version": 0 }, "libconfig": { - "baseline": "1.8.1", + "baseline": "1.8.2", "port-version": 0 }, "libconfuse": { diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 70de1a3a6d..e24e0caec2 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6283fb6ea57e7cdc8024e1d0eb893a1438f6e361", + "version": "1.8.2", + "port-version": 0 + }, { "git-tree": "56fc016e03a6c91fad520ee67122cfc8d6ca5242", "version": "1.8.1",