[zziplib] Update to 0.13.73 (#37043)

ports/ogre-next/fix-dependencies.patch

@@ -40,8 +40,8 @@ index 74cb0f4..2cad26a 100644
  if (ZLIB_FOUND)
    # Find zziplib
 -  find_package(ZZip)
-+  find_package(ZZip NAMES unofficial-zziplib CONFIG REQUIRED)
++  find_package(ZZip NAMES zziplib CONFIG REQUIRED)
-+  set(ZZip_LIBRARIES unofficial::zziplib::libzzip)
++  set(ZZip_LIBRARIES zziplib::libzzip)
    macro_log_feature(ZZip_FOUND "zziplib" "Extract data from zip archives" "http://zziplib.sourceforge.net" FALSE "" "")
  endif ()
  

ports/ogre-next/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ogre-next",
   "version": "2.3.3",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Ogre Next - scene-oriented, flexible 3D engine written in C++",
   "homepage": "https://github.com/OGRECave/ogre-next",
   "license": "MIT",

ports/zziplib/export-targets.patch

@@ -1,73 +0,0 @@
-diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
-index 1883272..16d4380 100644
---- a/zzip/CMakeLists.txt
-+++ b/zzip/CMakeLists.txt
-@@ -175,7 +175,7 @@ set(libzzipmmapped_HDRS mmapped.h memdisk.h)
- 
- add_library(libzzip ${libzzip_SRCS} )
- target_link_libraries(libzzip ZLIB::ZLIB )
--target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-+target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
- 
- if(ZZIPFSEEKO)
- add_library(libzzipfseeko ${libzzipfseeko_SRCS} )
-@@ -255,14 +255,14 @@ install(FILES ${outdir}/zziplib.pc ${outdir}/zzipmmapped.pc ${outdir}/zzipfseeko
- endif()
- 
- install(FILES ${libzzip_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
--install(TARGETS libzzip 
-+install(TARGETS libzzip EXPORT unofficial-zziplibTargets
-     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 
-+install(TARGETS libzzipfseeko EXPORT unofficial-zziplibTargets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-@@ -270,12 +270,28 @@ endif()
- 
- if(ZZIPMMAPPED)
- install(FILES ${libzzipmmapped_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
--install(TARGETS libzzipmmapped
-+install(TARGETS libzzipmmapped EXPORT unofficial-zziplibTargets
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
- 
-+install(EXPORT unofficial-zziplibTargets
-+    NAMESPACE unofficial::zziplib::
-+    DESTINATION share/unofficial-zziplib
-+)
-+
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in"
-+[[include(CMakeFindDependencyMacro)
-+find_dependency(ZLIB)
-+file(GLOB TARGET_FILES "${CMAKE_CURRENT_LIST_DIR}/*Targets.cmake")
-+foreach (TARGET_FILE ${TARGET_FILES})
-+    include("${TARGET_FILE}")
-+endforeach()
-+]])
-+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake" @ONLY)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-zziplib-config.cmake DESTINATION share/unofficial-zziplib)
-+
- if(ZZIP_COMPAT)
-   install(FILES ${outdir}/compat/zzip.h ${outdir}/compat/zziplib.h ${outdir}/compat/zzip-io.h 
-           DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-diff --git a/zzipwrap/CMakeLists.txt b/zzipwrap/CMakeLists.txt
-index ea7ea93..2d41f70 100644
---- a/zzipwrap/CMakeLists.txt
-+++ b/zzipwrap/CMakeLists.txt
-@@ -83,7 +83,7 @@ install(FILES ${outdir}/zzipwrap.pc
- endif()
- 
- install(FILES ${libzzipwrap_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/zzip )
--install(TARGETS libzzipwrap
-+install(TARGETS libzzipwrap EXPORT unofficial-zziplibTargets
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 

ports/zziplib/portfile.cmake

@@ -1,39 +1,35 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO gdraheim/zziplib
-    REF v0.13.72
+    REF "v${VERSION}"
-    SHA512 4bb089e74813c6fac9657cd96e44e4a6469bf86aba3980d885c4573e8db45e74fd07bbdfcec9f36297c72227c8c0b2c37dab1bc4326cef8529960e482fe501c8
+    SHA512 95557147d374d0e9074b83319350db9085b8ae98ff7cf7ab96a3209564597744252504adfaf4d17b0243ffb118adf2afabe7dd736e6514a7e74360cd0955e4f5
     PATCHES
         no-release-postfix.patch
-        export-targets.patch
 )
 
 string(COMPARE EQUAL VCPKG_CRT_LINKAGE "static" MSVC_STATIC_RUNTIME)
 string(COMPARE EQUAL VCPKG_LIBRARY_LINKAGE "static" BUILD_STATIC_LIBS)
 
-# on Windows hosts, the UnixCommands are not available; disable options that use them
-if(VCPKG_HOST_IS_WINDOWS)
-    set(ZZIPLIB_OPTIONS "-DZZIP_COMPAT=OFF;-DZZIP_PKGCONFIG=OFF")
-endif()
-
 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
+        -DZZIP_COMPAT=OFF
-        -DZZIPFSEEKO=OFF
+        -DZZIP_LIBLATEST=OFF
-        -DZZIPWRAP=OFF
+        -DZZIP_LIBTOOL=OFF
-        -DZZIPSDL=OFF
+        -DZZIP_TESTCVE=OFF
         -DZZIPBINS=OFF
-        -DZZIPTEST=OFF
         -DZZIPDOCS=OFF
-        ${ZZIPLIB_OPTIONS}
+        -DZZIPFSEEKO=OFF
+        -DZZIPMMAPPED=OFF
+        -DZZIPSDL=OFF
+        -DZZIPTEST=OFF
+        -DZZIPWRAP=OFF
 )
 vcpkg_cmake_install()
-
+vcpkg_cmake_config_fixup(PACKAGE_NAME zziplib)
-vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zziplib)
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
@@ -43,19 +39,16 @@ file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/zzipmmapped.pc"
 )
 
-vcpkg_fixup_pkgconfig()
+file(STRINGS "${CURRENT_PACKAGES_DIR}/include/zzip/_config.h" have_stdint_h REGEX "^#define ZZIP_HAVE_STDINT_H 1")
+if(have_stdint_h)
+    file(REMOVE "${CURRENT_PACKAGES_DIR}/include/zzip/stdint.h")
+endif()
 
-file(READ "${SOURCE_PATH}/docs/COPYING.LIB" lgpl)
+vcpkg_install_copyright(COMMENT [[
-file(READ "${SOURCE_PATH}/docs/COPYING.MPL" mpl)
+zziplib is shipping under a dual MPL / LGPL license where each of them
-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.
-
+]]
----
+    FILE_LIST
-
+        "${SOURCE_PATH}/docs/COPYING.LIB"
-${lgpl}
+        "${SOURCE_PATH}/docs/COPYING.MPL"
-
+)
----
-
-${mpl}
-")

ports/zziplib/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "zziplib",
-  "version": "0.13.72",
+  "version": "0.13.73",
-  "port-version": 3,
   "description": "library providing read access on ZIP-archives",
   "homepage": "https://github.com/gdraheim/zziplib",
   "license": "LGPL-2.0-or-later OR MPL-1.1",

versions/baseline.json

@@ -6294,7 +6294,7 @@
     },
     "ogre-next": {
       "baseline": "2.3.3",
-      "port-version": 2
+      "port-version": 3
     },
     "ois": {
       "baseline": "1.5.1",
@@ -9649,8 +9649,8 @@
       "port-version": 5
     },
     "zziplib": {
-      "baseline": "0.13.72",
+      "baseline": "0.13.73",
-      "port-version": 3
+      "port-version": 0
     }
   }
 }

versions/o-/ogre-next.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "047ac9285440f0328e3bfc6e40946af616c585cd",
+      "version": "2.3.3",
+      "port-version": 3
+    },
     {
       "git-tree": "1563ee76136a49e438bd5229b68635ce8fdc347a",
       "version": "2.3.3",

versions/z-/zziplib.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a525f08ad4196f5324f29cd4f77b50ad7d39af58",
+      "version": "0.13.73",
+      "port-version": 0
+    },
     {
       "git-tree": "4408845ee5c914b49838db10b1e7dec234ee5981",
       "version": "0.13.72",