[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/libpng/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/libpng/

[Sam James]

commit:     437a2672807d5af06d7c6185db20e3f318570f65
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 18:10:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 18:10:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=437a2672

media-libs/libpng: add rebased apng patch for 1.6.38

From a different sourceforge project though.

Bug: https://bugs.gentoo.org/824018
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libpng/Manifest             | 1 +
 media-libs/libpng/libpng-1.6.38.ebuild | 6 +++---
 media-libs/libpng/metadata.xml         | 2 ++
 profiles/base/package.use.mask         | 4 ----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 8709d00fea9f..15fc74f2917a 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,3 +1,4 @@
 DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f
 DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
+DIST libpng-1.6.38-apng.patch.gz 10766 BLAKE2B 3aa4bf28f5854f3dbafd1b1e92a1b80b23b59279286f730babcb091369c266ab93427223f79c8797139a6624bd41a3485064faedde47680048804ef6d41f892a SHA512 e8cb74d9be6bcbc474b6bbd6200ab5d5111e91d3ab601e5fda04213d2800a4051f04152fa5d47db690612ed06a488ff3b2608a8f0bac0cf207d486107d98da1f
 DIST libpng-1.6.38.tar.xz 1023168 BLAKE2B b855f85c69336c21891fc9c074e5c03bb074f2262bf99ed6915573664379efcf427834ea049391ffec21e83c89a574c2e888989792fcae4598761718772d29c8 SHA512 4e450636062fcc75ecc65715e0b23ddc1097b73b4c95ffd31bef627144c576f58660b2130105f5f5781212cf54f00c7b6dd3facefd7e9de70c76b981d499f81e

diff --git a/media-libs/libpng/libpng-1.6.38.ebuild b/media-libs/libpng/libpng-1.6.38.ebuild
index e2ba9967246d..c45e7a82df1b 100644
--- a/media-libs/libpng/libpng-1.6.38.ebuild
+++ b/media-libs/libpng/libpng-1.6.38.ebuild
@@ -7,8 +7,8 @@ inherit libtool multilib-minimal
 
 DESCRIPTION="Portable Network Graphics library"
 HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
-	apng? ( mirror://sourceforge/apng/${PN}-1.6.37-apng.patch.gz )"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+SRC_URI+=" apng? ( mirror://sourceforge/libpng-apng/${PN}$(ver_rs 1-2 '' $(ver_cut 1-2))/${PV}/${P}-apng.patch.gz )"
 
 LICENSE="libpng2"
 SLOT="0/16"
@@ -24,7 +24,7 @@ src_prepare() {
 	default
 
 	if use apng; then
-		eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
+		eapply "${WORKDIR}"/${PN}-*-apng.patch
 
 		# Don't execute symbols check with apng patch, bug #378111
 		sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die

diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 9fc5e446743d..e98eff7f2f6f 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -18,6 +18,8 @@
 		<remote-id type="github">pnggroup/libpng-EXPERIMENTAL</remote-id>
 		<remote-id type="github">glennrp/libpng-releases</remote-id>
 		<remote-id type="sourceforge">libpng</remote-id>
+		<remote-id type="sourceforge">apng</remote-id>
+		<remote-id type="sourceforge">libpng-apng</remote-id>
 	</upstream>
 	<slots>
 		<subslots>Reflect ABI compatibility for libpng.so.</subslots>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 67386b988015..ab2d36ce0217 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -19,10 +19,6 @@
 # bug #870211.
 dev-lang/rust llvm-libunwind
 
-# Sam James <sam@gentoo.org> (2022-09-15)
-# Patch not rebased and supporting it is not a priority: bug #824018.
->=media-libs/libpng-1.6.38 apng
-
 # Matt Jolly <Matt.Jolly@footclan.ninja (2022-09-09)
 # app-antivirus/clamav JIT support requires LLVM <=13
 # ebuild support is there but currently failing to link