[zziplib] Update to v0.13.72 (#24011)

* Update zziplib to 0.13.72 * Modernize portfile * Fix formatting check Separately collect and display result from version scheme check. Ignore error from version scheme check when checking version values. Pass output also to console. * Update version scheme and license info * Update versions
2024-12-26 09:31:08 +08:00 · 2022-04-08 21:58:32 +02:00 · 2022-04-08 21:58:32 +02:00 · 621e15608e
commit 621e15608e
parent d72783cb3a
9 changed files with 58 additions and 93 deletions
--- a/.github/workflows/untrustedPR.yml
+++ b/.github/workflows/untrustedPR.yml
@ -47,7 +47,9 @@ jobs:
          # HEAD^^ refers to the "main" commit that was merged into
          git checkout HEAD^^ -- versions
          git restore --staged versions
-          ./vcpkg x-add-version --all --skip-formatting-check > .github-pr.x-add-version.out
+          ./vcpkg x-add-version --all --skip-formatting-check | grep 'instead of "version-string"' | tee .github-pr.version-string.out || true
+          git checkout -- versions
+          ./vcpkg x-add-version --all --skip-formatting-check --skip-version-format-check | tee .github-pr.x-add-version.out || true
          git diff > .github-pr.x-add-version.diff
          git reset HEAD~ --mixed

@ -57,6 +59,7 @@ jobs:
            const { promises: fs } = require('fs')
            const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim()
            const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim()
+            const version_string_out = (await fs.readFile('.github-pr.version-string.out', 'utf8')).trim()
            const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim()
            const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim()
            const missing_license = (await fs.readFile('.github-pr.missing-license', 'utf8')).trim()
@ -77,6 +80,9 @@ jobs:
              output += "```\n" + add_version_out + "\n```\n</details>\n\n"
              approve = false;
            }
+            if (version_string_out !== "") {
+              output += version_string_out + "\n\n"
+            }
            if (add_version !== "") {
              output += "<details><summary><b>After committing all other changes, the version database must be updated</b></summary>\n\n"
              output += "```sh\n"
--- a/ports/zziplib/always-find-unixcommands-on-unix.patch
+++ b/ports/zziplib/always-find-unixcommands-on-unix.patch
@ -1,13 +0,0 @@
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index 52555d4..de06eae 100644
--- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -27,7 +27,7 @@ set(ZZIP_VERSION "${PROJECT_VERSION}")
- set(ZZIP_PACKAGE_NAME "${PROJECT_NAME}lib")
- set(ZZIP_PACKAGE_VERSION "${PROJECT_VERSION}")
- 
-if(ZZIPCOMPAT)
-+if(UNIX)
- find_package ( UnixCommands REQUIRED ) # bash cp mv rm gzip tar
- endif()
- 
--- a/ports/zziplib/cmake-project-include.cmake
+++ b/ports/zziplib/cmake-project-include.cmake
@ -0,0 +1,3 @@
+if(WIN32)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS)
+endif()
--- a/ports/zziplib/fix-export-define.patch
+++ b/ports/zziplib/fix-export-define.patch
@ -1,13 +0,0 @@
-diff --git a/zzip/conf.h b/zzip/conf.h
-index 27b834a..7f01456 100644
--- a/zzip/conf.h
-+++ b/zzip/conf.h
-@@ -203,7 +203,7 @@
- #     endif
-
-
-#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS
-+#if defined ZZIP_EXPORTS || defined ZZIPLIB_EXPORTS || defined libzzip_EXPORTS // CMake export defines
- # undef ZZIP_DLL
- #define ZZIP_DLL 1
- #endif
--- a/ports/zziplib/install-dll-to-proper-folder.patch
+++ b/ports/zziplib/install-dll-to-proper-folder.patch
@ -1,27 +0,0 @@
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index a9f6e3a..f3a758b 100644
--- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -247,12 +247,14 @@ endif()
- 
- install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
- install(TARGETS libzzip 
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if(ZZIPFSEEKO)
- install(FILES ${libzzipfseeko_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
- install(TARGETS libzzipfseeko 
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-@@ -260,6 +262,7 @@ endif()
- if(ZZIPMMAPPED)
- install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
- install(TARGETS libzzipmmapped
-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
--- a/ports/zziplib/portfile.cmake
+++ b/ports/zziplib/portfile.cmake
@ -1,38 +1,19 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO gdraheim/zziplib
-    REF 24a6c6de1956189bffcd8dffd2ef3197c6f3df29 # v0.13.71
-    SHA512 246ee1d93f3f8a6889e9ab362e04e6814813844f2cdea0a782910bf07ca55ecd6d8b1c456b4180935464cebf291e7849af27ac0ed5cc080de5fb158f9f3aeffb
+    REF v0.13.72
+    SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
    PATCHES
-        install-dll-to-proper-folder.patch
        no-release-postfix.patch
-        fix-export-define.patch
-        always-find-unixcommands-on-unix.patch
 )

-if(VCPKG_CRT_LINKAGE STREQUAL "static")
-    set(MSVC_STATIC_RUNTIME ON)
-else()
-    set(MSVC_STATIC_RUNTIME OFF)
-endif()
+string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME)
+string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS)

-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(BUILD_STATIC_LIBS ON)
-else()
-    set(BUILD_STATIC_LIBS OFF)
-endif()
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(ZZIPLIBTOOL OFF)
-endif()
-
-set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS")
-set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS")
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
+        "-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
        -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME}
        -DZZIPMMAPPED=OFF
@ -42,15 +23,30 @@ vcpkg_configure_cmake(
        -DZZIPBINS=OFF
        -DZZIPTEST=OFF
        -DZZIPDOCS=OFF
-        -DZZIPCOMPAT=OFF
-        -DZZIPLIBTOOL=${ZZIPLIBTOOL}
+)
+vcpkg_cmake_install()
+
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipfseeko.pc"
+    "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/zzipmmapped.pc"
+    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipfseeko.pc"
+    "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc"
 )

-vcpkg_install_cmake()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 vcpkg_fixup_pkgconfig()
+
+file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl)
+file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl)
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright"
+"${PORT} is shipping under a dual MPL / LGPL license where each of them
+is separate and restrictions apply alternatively.
+
+---
+
+${lgpl}
+
+---
+
+${mpl}
+")
--- a/ports/zziplib/vcpkg.json
+++ b/ports/zziplib/vcpkg.json
@ -1,10 +1,18 @@
 {
  "name": "zziplib",
-  "version-string": "0.13.71",
-  "port-version": 3,
+  "version": "0.13.72",
  "description": "library providing read access on ZIP-archives",
  "homepage": "https://github.com/gdraheim/zziplib",
+  "license": "LGPL-2.0-or-later OR MPL-1.1",
  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
    "zlib"
  ]
 }
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -7705,8 +7705,8 @@
      "port-version": 3
    },
    "zziplib": {
-      "baseline": "0.13.71",
-      "port-version": 3
+      "baseline": "0.13.72",
+      "port-version": 0
    }
  }
 }
--- a/versions/z-/zziplib.json
+++ b/versions/z-/zziplib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "e09e8bf85eff5c115f9dcf5372f8bdbab590ab6b",
+      "version": "0.13.72",
+      "port-version": 0
+    },
    {
      "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886",
      "version-string": "0.13.71",