From 6b7485ab2b3b604ad7fea1456920a57ecc46eb0e Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 19 Nov 2021 13:25:29 +0100 Subject: media-libs/libpng-compat: Remove unused apng patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No reverse dependencies require the custom patching in the compat library. Signed-off-by: Michał Górny Signed-off-by: Sam James --- media-libs/libpng-compat/Manifest | 1 - media-libs/libpng-compat/libpng-compat-1.5.30.ebuild | 13 ++----------- media-libs/libpng-compat/metadata.xml | 3 --- 3 files changed, 2 insertions(+), 15 deletions(-) (limited to 'media-libs') diff --git a/media-libs/libpng-compat/Manifest b/media-libs/libpng-compat/Manifest index 4ca0b5989653..be88fa876a9a 100644 --- a/media-libs/libpng-compat/Manifest +++ b/media-libs/libpng-compat/Manifest @@ -1,3 +1,2 @@ DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e -DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236 DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild index 21c669bb96bf..a906a0b68259 100644 --- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild +++ b/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild @@ -10,14 +10,13 @@ inherit libtool multilib-minimal MY_P="libpng-${PV}" DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz - apng? ( https://dev.gentoo.org/~polynomial-c/${MY_P}-apng.patch.gz )" +SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" LICENSE="libpng" SLOT="1.5" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="apng cpu_flags_arm_neon" +IUSE="cpu_flags_arm_neon" RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] !=media-libs/libpng-1.5*" @@ -35,14 +34,6 @@ pkg_setup() { src_prepare() { default - if use apng; then - # fix windows path in patch file. Please check for each release if this can be removed again. - sed 's@scripts\\symbols.def@scripts/symbols.def@' \ - -i "${WORKDIR}"/${PN/-compat}-*-apng.patch || die - eapply "${WORKDIR}"/${PN/-compat}-*-apng.patch - # Don't execute symbols check with apng patch wrt #378111 - sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die - fi elibtoolize } diff --git a/media-libs/libpng-compat/metadata.xml b/media-libs/libpng-compat/metadata.xml index 28e5b3dcd419..3d35d7e68acf 100644 --- a/media-libs/libpng-compat/metadata.xml +++ b/media-libs/libpng-compat/metadata.xml @@ -5,9 +5,6 @@ base-system@gentoo.org Gentoo Base System - - support unofficial APNG (Animated PNG) spec - cpe:/a:libpng:libpng libpng -- cgit v1.2.3-65-gdbad