commit: dcab6a69e2176863d65ff845227cb9de7474d5be Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Nov 3 23:11:06 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Nov 4 20:33:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcab6a69
media-libs/libmng: Drop old Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/libmng/Manifest | 1 - media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch | 39 ------------------- media-libs/libmng/files/libmng-2.0.2-stdio.patch | 14 ------- media-libs/libmng/libmng-2.0.2-r1.ebuild | 45 ---------------------- 4 files changed, 99 deletions(-) diff --git a/media-libs/libmng/Manifest b/media-libs/libmng/Manifest index a45b0f414a5..9a3d0e716c8 100644 --- a/media-libs/libmng/Manifest +++ b/media-libs/libmng/Manifest @@ -1,2 +1 @@ -DIST libmng-2.0.2.tar.xz 951844 BLAKE2B 2d0412b3243762029fd4487dafeee9cbc7a2c13e358e2d66f6a27624dff0d9398a1f7a9b9bdc4e40b7b57ead082b5fd894fcc94782e550d43371f2141996b453 SHA512 76ff107df43297837e075a4b57dac75ece501a57060884720a22518d9514ad0af64d69d22fe12a92d3bce3e50ae8ca3c8081680535743d2bde9ae9fa11e32687 DIST libmng-2.0.3.tar.xz 951808 BLAKE2B 18f29d270d8c646da1eef41da094271acd5ce86094441f7f4d78dadab9dbc147619c4226bc642722639eb6d1a49567c517acaadea823f38c7bdd8ee3f498b927 SHA512 764efd94643c17c449abcb8f676ec2aa750a2461cf46bc961343f8d443a16ac2caa135c27d846deb2351b9f25d6170c42a500d21f63c13276905fdd743b8fec6 diff --git a/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch deleted file mode 100644 index adb12c2d4a7..00000000000 --- a/media-libs/libmng/files/libmng-2.0.2-jpeg-9a.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/520906 - -This kludge is unnecessary with jpeg-9a and is in fact breaking the build... - -libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function) -libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function) -libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function) - -...because jmorecfg.h of jpeg-9a has this: - -#ifndef HAVE_BOOLEAN -#if defined FALSE || defined TRUE || defined QGLOBAL_H -/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */ -typedef int boolean; -#ifndef FALSE /* in case these macros already exist */ -#define FALSE 0 /* values of boolean */ -#endif -#ifndef TRUE -#define TRUE 1 -#endif -#else -typedef enum { FALSE = 0, TRUE = 1 } boolean; -#endif -#endif - ---- libmng_types.h -+++ libmng_types.h -@@ -199,11 +199,6 @@ - #undef FAR /* possibly defined by zlib or lcms */ - #endif - #define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */ --/* There has been a change in jpeg-9 : */ --#ifndef _WIN32 --#define HAVE_BOOLEAN --typedef int boolean; --#endif - #include <stdio.h> - #include <jpeglib.h> - #endif /* MNG_INCLUDE_IJG6B */ diff --git a/media-libs/libmng/files/libmng-2.0.2-stdio.patch b/media-libs/libmng/files/libmng-2.0.2-stdio.patch deleted file mode 100644 index 0a906d4c2f3..00000000000 --- a/media-libs/libmng/files/libmng-2.0.2-stdio.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/499480 - -Patch is from ArchLinux git libmng-2.0.2-3 - ---- libmng_types.h -+++ libmng_types.h -@@ -204,6 +204,7 @@ - #define HAVE_BOOLEAN - typedef int boolean; - #endif -+#include <stdio.h> - #include <jpeglib.h> - #endif /* MNG_INCLUDE_IJG6B */ - diff --git a/media-libs/libmng/libmng-2.0.2-r1.ebuild b/media-libs/libmng/libmng-2.0.2-r1.ebuild deleted file mode 100644 index d387f4f4e7e..00000000000 --- a/media-libs/libmng/libmng-2.0.2-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools-multilib - -DESCRIPTION="Multiple Image Networkgraphics lib (animated png's)" -HOMEPAGE="http://www.libmng.com/"; -SRC_URI="mirror://sourceforge/libmng/${P}.tar.xz" - -LICENSE="libmng" -SLOT="0/2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="lcms static-libs" - -RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-stdio.patch \ - "${FILESDIR}"/${P}-jpeg-9a.patch - emake distclean - autotools-multilib_src_prepare -} - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - --with-jpeg - $(use_with lcms lcms2) - --without-lcms - ) - - autotools-multilib_src_configure -} - -src_install() { - autotools-multilib_src_install - - dodoc CHANGES README* doc/{doc.readme,libmng.txt} - doman doc/man/*.{3,5} -}
