From cf060c2d7462d428806db058b6db2c68ee6bf81d Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 12 Aug 2026 01:43:24 +0900 Subject: [PATCH] [stormlib] update to 9.40 (#53274) Co-authored-by: Billy Robert O'Neal III Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/stormlib/disable-autolinking.patch | 15 +++++++ ports/stormlib/portfile.cmake | 51 ++++++++++++++---------- ports/stormlib/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/s-/stormlib.json | 5 +++ 5 files changed, 55 insertions(+), 22 deletions(-) create mode 100644 ports/stormlib/disable-autolinking.patch diff --git a/ports/stormlib/disable-autolinking.patch b/ports/stormlib/disable-autolinking.patch new file mode 100644 index 0000000000..4b5cf7414f --- /dev/null +++ b/ports/stormlib/disable-autolinking.patch @@ -0,0 +1,15 @@ +diff --git a/src/StormLib.h b/src/StormLib.h +index 023d045..6e6d8bd 100644 +--- a/src/StormLib.h ++++ b/src/StormLib.h +@@ -102,6 +102,10 @@ extern "C" { + // Z - S for static-linked CRT library, D for multithreaded DLL CRT library + // + ++#ifndef __STORMLIB_NO_STATIC_LINK__ ++#define __STORMLIB_NO_STATIC_LINK__ ++#endif ++ + #if defined(__STORMLIB_SELF__) && !defined(__STORMLIB_NO_STATIC_LINK__) + #define __STORMLIB_NO_STATIC_LINK__ // Define this if you don't want to link using pragmas when using msvc + #endif diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake index 2e89ae4a09..293207f87a 100644 --- a/ports/stormlib/portfile.cmake +++ b/ports/stormlib/portfile.cmake @@ -1,20 +1,31 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ladislav-zezula/StormLib - REF "v${VERSION}" - SHA512 5d989c02516e100eae9102080fd72053601f7e284fc38f0359cb7386b9d2e8bcc3768454e2d818085584971a986bebed3daf28b85d924c172417a82fae64c02a - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME StormLib) -vcpkg_copy_pdbs() - - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ladislav-zezula/StormLib + REF "v${VERSION}" + SHA512 8646b152f894d4f2d920b73007522b0d7508fbb2cac7c9439e7f5033228c33e09db587c46ffc18d6ce788d0d5f0b5a832aad528cf0dda87d082516ce4c6b55bf + HEAD_REF master + PATCHES + disable-autolinking.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME StormLib) +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/StormLib/StormLibConfig.cmake" + "# Generated by CMake" + "# Generated by CMake\n\ninclude(CMakeFindDependencyMacro)\nfind_dependency(ZLIB)\nfind_dependency(BZip2)" +) +vcpkg_copy_pdbs() + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c" + "${SOURCE_PATH}/src/libtommath/bn_mp_abs.c" +) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/stormlib/vcpkg.json b/ports/stormlib/vcpkg.json index 3a4a095db5..a4fd2e0f5a 100644 --- a/ports/stormlib/vcpkg.json +++ b/ports/stormlib/vcpkg.json @@ -1,7 +1,9 @@ { "name": "stormlib", - "version": "9.31", + "version": "9.40", "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", + "homepage": "http://www.zezula.net/en/mpq/stormlib.html", + "license": null, "dependencies": [ "bzip2", { diff --git a/versions/baseline.json b/versions/baseline.json index ed391935df..7372d6709d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9841,7 +9841,7 @@ "port-version": 0 }, "stormlib": { - "baseline": "9.31", + "baseline": "9.40", "port-version": 0 }, "str-view": { diff --git a/versions/s-/stormlib.json b/versions/s-/stormlib.json index c0d1bd7b81..c8a90b45ab 100644 --- a/versions/s-/stormlib.json +++ b/versions/s-/stormlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fd3558802d4f9c12a02c6d2f6e5b97f721af949", + "version": "9.40", + "port-version": 0 + }, { "git-tree": "8f87e328d28cd1a0e36131466c5eeeca0196b415", "version": "9.31",