mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-libs/minizip-ng: drop 3.0.8, 3.0.9
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
@@ -1,4 +1,2 @@
|
||||
DIST minizip-ng-3.0.10.tar.gz 771145 BLAKE2B 6bab59f830b8be929b6293c9408dd70165ffe094a71bcff82eab71f9d077f4d5360f6081e0ca631090810dfc58a81b03926c797e5c156d0f1437df78292a1f09 SHA512 38021137bebb8805279e729e0801ee15133e6379bdd1862d0dea60f13fb1d63402477f3ea9a6c22fc8c85eb13dd9b38d9536680806850060a44a5a9f015fa829
|
||||
DIST minizip-ng-3.0.8.tar.gz 643788 BLAKE2B aa937fe8d0e776c8a00754c7a5eae7769b096d044a1b65b124adc0531b757579d8e0e0f5a4784669d9d94a7ea512625160b8b02f908a29e027f31911adf0f524 SHA512 f9742c5fc54ac08d78d7e942e90a7e7f1bc40a2812e7555570bd152ed441dbc5a004b79d2edf32d3fbda64db493cd1a0512d16deb84c0791d3fc86718e9ad0b1
|
||||
DIST minizip-ng-3.0.9.tar.gz 646390 BLAKE2B ba823e371dd65788404c8628d1e3de74d28bb86a378eb19b2f9636d96b402e43831238a5296d22febe46c58f2e340d8439ad4117db513b949c9cd99a32fa5df6 SHA512 a52c43d0e208eb6acf56f80804fe99c265baec2a60f6cd80fc9ba160ca3c076e6c118be9108db84728310b14640cab0e0d301d4c763713c90bd344990a43f5fd
|
||||
DIST minizip-ng-4.0.0.tar.gz 766989 BLAKE2B c46bccb277ee5c712710aae41a7b46af4d60fb8fecad7489b97fc4475059f5f8cfbb1aa2d3693d25ada90f3089535e0d060c7a918df1d0fd635d57cbc93a317d SHA512 be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
https://github.com/zlib-ng/minizip-ng/pull/682
|
||||
|
||||
From 5aaa8bf0c348a27d9a7a0d82d4af26748278828c Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 16 Mar 2023 23:35:34 +0000
|
||||
Subject: [PATCH] CMake: set newer POSIX_C_SOURCE
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Enable POSIX 2008 as it's needed for strdup(), otherwise we get:
|
||||
```
|
||||
/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c: In function ‘mz_dir_make’:
|
||||
/var/tmp/portage/sys-libs/minizip-ng-3.0.9/work/minizip-ng-3.0.9/mz_os.c:286:19: error: implicit declaration of function ‘strdup’ [-Werror=implicit-function-declaration]
|
||||
286 | current_dir = strdup(path);
|
||||
| ^~~~~~
|
||||
```
|
||||
|
||||
The man page for strdup says:
|
||||
```
|
||||
strdup():
|
||||
_XOPEN_SOURCE >= 500
|
||||
|| /* Since glibc 2.12: */ _POSIX_C_SOURCE >= 200809L
|
||||
|| /* glibc <= 2.19: */ _BSD_SOURCE || _SVID_SOURCE
|
||||
```
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -455,7 +455,7 @@ endif()
|
||||
|
||||
# Unix specific
|
||||
if(UNIX)
|
||||
- list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
|
||||
+ list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
|
||||
list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
|
||||
|
||||
if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
|
||||
|
||||
@@ -1,93 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Worth keeping an eye on 'develop' branch upstream for possible backports,
|
||||
# as they copied this practice from sys-libs/zlib upstream.
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
|
||||
HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
|
||||
SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="compat openssl test zstd"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# Automagically prefers sys-libs/zlib-ng if installed, so let's
|
||||
# just depend on it as presumably it's better tested anyway.
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
app-arch/xz-utils
|
||||
sys-libs/zlib-ng
|
||||
virtual/libiconv
|
||||
compat? ( !sys-libs/zlib[minizip] )
|
||||
openssl? ( dev-libs/openssl:= )
|
||||
zstd? ( app-arch/zstd:= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( dev-cpp/gtest )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DMZ_COMPAT=$(usex compat)
|
||||
|
||||
-DMZ_BUILD_TESTS=$(usex test)
|
||||
-DMZ_BUILD_UNIT_TESTS=$(usex test)
|
||||
|
||||
-DMZ_FETCH_LIBS=OFF
|
||||
-DMZ_FORCE_FETCH_LIBS=OFF
|
||||
|
||||
# Compression library options
|
||||
-DMZ_ZLIB=ON
|
||||
-DMZ_BZIP2=ON
|
||||
-DMZ_LZMA=ON
|
||||
-DMZ_ZSTD=$(usex zstd)
|
||||
-DMZ_LIBCOMP=OFF
|
||||
|
||||
# Encryption support options
|
||||
-DMZ_PKCRYPT=ON
|
||||
-DMZ_WZAES=ON
|
||||
-DMZ_OPENSSL=$(usex openssl)
|
||||
-DMZ_LIBBSD=ON
|
||||
-DMZ_SIGNING=ON
|
||||
|
||||
# Character conversion options
|
||||
-DMZ_ICONV=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local myctestargs=(
|
||||
# TODO: investigate
|
||||
-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
|
||||
)
|
||||
|
||||
# TODO: A bunch of tests end up looping and writing over each other's files
|
||||
# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
|
||||
# but still hangs.
|
||||
cmake_src_test -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use test ; then
|
||||
# Test binaries, bug #874591
|
||||
rm "${ED}"/usr/bin/minigzip || die
|
||||
rm "${ED}"/usr/bin/minizip-ng || die
|
||||
fi
|
||||
|
||||
if use compat ; then
|
||||
ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
|
||||
ewarn "Please be careful!"
|
||||
fi
|
||||
}
|
||||
@@ -1,97 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Worth keeping an eye on 'develop' branch upstream for possible backports,
|
||||
# as they copied this practice from sys-libs/zlib upstream.
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
|
||||
HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
|
||||
SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
|
||||
IUSE="compat openssl test zstd"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# Automagically prefers sys-libs/zlib-ng if installed, so let's
|
||||
# just depend on it as presumably it's better tested anyway.
|
||||
RDEPEND="
|
||||
app-arch/bzip2
|
||||
app-arch/xz-utils
|
||||
sys-libs/zlib-ng
|
||||
virtual/libiconv
|
||||
compat? ( !sys-libs/zlib[minizip] )
|
||||
openssl? ( dev-libs/openssl:= )
|
||||
zstd? ( app-arch/zstd:= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( dev-cpp/gtest )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/minizip-3.0.9-strdup.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DMZ_COMPAT=$(usex compat)
|
||||
|
||||
-DMZ_BUILD_TESTS=$(usex test)
|
||||
-DMZ_BUILD_UNIT_TESTS=$(usex test)
|
||||
|
||||
-DMZ_FETCH_LIBS=OFF
|
||||
-DMZ_FORCE_FETCH_LIBS=OFF
|
||||
|
||||
# Compression library options
|
||||
-DMZ_ZLIB=ON
|
||||
-DMZ_BZIP2=ON
|
||||
-DMZ_LZMA=ON
|
||||
-DMZ_ZSTD=$(usex zstd)
|
||||
-DMZ_LIBCOMP=OFF
|
||||
|
||||
# Encryption support options
|
||||
-DMZ_PKCRYPT=ON
|
||||
-DMZ_WZAES=ON
|
||||
-DMZ_OPENSSL=$(usex openssl)
|
||||
-DMZ_LIBBSD=ON
|
||||
-DMZ_SIGNING=ON
|
||||
|
||||
# Character conversion options
|
||||
-DMZ_ICONV=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local myctestargs=(
|
||||
# TODO: investigate
|
||||
-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
|
||||
)
|
||||
|
||||
# TODO: A bunch of tests end up looping and writing over each other's files
|
||||
# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
|
||||
# but still hangs.
|
||||
cmake_src_test -j1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
if use test ; then
|
||||
# Test binaries, bug #874591
|
||||
rm "${ED}"/usr/bin/minigzip || die
|
||||
rm "${ED}"/usr/bin/minizip-ng || die
|
||||
fi
|
||||
|
||||
if use compat ; then
|
||||
ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
|
||||
ewarn "Please be careful!"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user