From 5f6dbb284a16d3e0e85bb9ece7566703c213ba63 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Fri, 30 Jan 2026 16:33:49 +0800 Subject: minizip-ng: 4.0.8 -> 4.0.10 1.Changelog: https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.10 2.Remove 0001-crypt.h-Remove-register-keyword.patch as it was merged upstream. Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- .../0001-crypt.h-Remove-register-keyword.patch | 35 ----------------- .../recipes-core/minizip-ng/minizip-ng_4.0.10.bb | 43 +++++++++++++++++++++ .../recipes-core/minizip-ng/minizip-ng_4.0.8.bb | 44 ---------------------- 3 files changed, 43 insertions(+), 79 deletions(-) delete mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch create mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb delete mode 100644 meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch b/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch deleted file mode 100644 index c471b098d4..0000000000 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng/0001-crypt.h-Remove-register-keyword.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 469beab0747549599959a30188deb3b27df3a346 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 2 Apr 2025 11:19:54 +0800 -Subject: [PATCH] crypt.h: Remove register keyword - -Fixes: - | In file included from /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/test/test_compat.cc:17: - | /buildarea/tmp/work/core2-64-poky-linux/minizip-ng/4.0.8/git/compat/crypt.h:62:9: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister] - | 62 | register int keyshift = (int)((*(pkeys + 1)) >> 24); - | | ^~~~~~~~ - | 1 error generated. - -Upstream-Status: Submitted [https://github.com/zlib-ng/minizip-ng/pull/853] - -Signed-off-by: Mingli Yu ---- - compat/crypt.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/compat/crypt.h b/compat/crypt.h -index 41c6454..ccdd83a 100644 ---- a/compat/crypt.h -+++ b/compat/crypt.h -@@ -59,7 +59,7 @@ static int update_keys(unsigned long *pkeys, const z_crc_t *pcrc_32_tab, int c) - (*(pkeys + 1)) += (*(pkeys + 0)) & 0xff; - (*(pkeys + 1)) = (*(pkeys + 1)) * 134775813L + 1; - { -- register int keyshift = (int)((*(pkeys + 1)) >> 24); -+ int keyshift = (int)((*(pkeys + 1)) >> 24); - (*(pkeys + 2)) = CRC32((*(pkeys + 2)), keyshift); - } - return c; --- -2.34.1 - diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb new file mode 100644 index 0000000000..2e7f438821 --- /dev/null +++ b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.10.bb @@ -0,0 +1,43 @@ +SUMMARY = "Zlib manipulation Library" +DESCRIPTION = "minizip-ng is a zip manipulation library written in C that is supported \ +on Windows, macOS, and Linux." +HOMEPAGE = "https://github.com/zlib-ng/minizip-ng" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" + +SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ + file://run-ptest \ +" + +SRCREV = "f3ed731e27a97e30dffe076ed5e0537daae5c1bd" + + +RCONFLICTS:${PN} += "minizip" + +DEPENDS = "xz openssl bzip2" + +inherit cmake pkgconfig ptest + +EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \ + -DBUILD_SHARED_LIBS=ON \ +" + +PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}" +PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib" +PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng" +PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest" + + +do_install:append () { + # remove absolute paths + sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests + # encrypt and stream test need the LICENSE file + cp ${S}/LICENSE ${D}${PTEST_PATH}/tests +} + diff --git a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb b/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb deleted file mode 100644 index cf98c0cf2e..0000000000 --- a/meta-oe/recipes-core/minizip-ng/minizip-ng_4.0.8.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Zlib manipulation Library" -DESCRIPTION = "minizip-ng is a zip manipulation library written in C that is supported \ -on Windows, macOS, and Linux." -HOMEPAGE = "https://github.com/zlib-ng/minizip-ng" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE;md5=36964f044224efeedd694983c34e716f" - -SRC_URI = "git://github.com/zlib-ng/minizip-ng.git;protocol=https;branch=master \ - file://0001-crypt.h-Remove-register-keyword.patch \ - file://run-ptest \ -" - -SRCREV = "55db144e03027b43263e5ebcb599bf0878ba58de" - - -RCONFLICTS:${PN} += "minizip" - -DEPENDS = "xz openssl bzip2" - -inherit cmake pkgconfig ptest - -EXTRA_OECMAKE = "-DMZ_FORCE_FETCH_LIBS=OFF \ - -DBUILD_SHARED_LIBS=ON \ -" - -PACKAGECONFIG ??= "zlib ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'test', '', d)}" -PACKAGECONFIG[zlib] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib" -PACKAGECONFIG[zlib-ng] = "-DMZ_ZLIB=ON,-DMZ_ZLIB=OFF, zlib-ng" -PACKAGECONFIG[test] = "-DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=ON, -DMZ_BUILD_TESTS=OFF -DMZ_BUILD_UNIT_TESTS=OFF, googletest" - - -do_install:append () { - # remove absolute paths - sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/minizip/minizip.cmake -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp ${B}/test/gtest_minizip ${D}${PTEST_PATH}/tests - # encrypt and stream test need the LICENSE file - cp ${S}/LICENSE ${D}${PTEST_PATH}/tests -} - -- cgit v1.2.3-54-g00ecf