diff options
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/jpeg/files/jpeg-9-fix-jmorecfg-boolean-enum.patch | 16 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-9a.ebuild | 6 |
3 files changed, 8 insertions, 21 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog index 6df74866525b..ec97f7343965 100644 --- a/media-libs/jpeg/ChangeLog +++ b/media-libs/jpeg/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/jpeg # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.152 2014/01/24 13:59:22 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.153 2014/01/24 14:02:40 ssuominen Exp $ + + 24 Jan 2014; Samuli Suominen <ssuominen@gentoo.org> + -files/jpeg-9-fix-jmorecfg-boolean-enum.patch, jpeg-9a.ebuild: + Drop unrequired patch since upstream solved it differently (using ifndef + instead of undef) 24 Jan 2014; Samuli Suominen <ssuominen@gentoo.org> -jpeg-9-r1.ebuild: old diff --git a/media-libs/jpeg/files/jpeg-9-fix-jmorecfg-boolean-enum.patch b/media-libs/jpeg/files/jpeg-9-fix-jmorecfg-boolean-enum.patch deleted file mode 100644 index dcac126f2657..000000000000 --- a/media-libs/jpeg/files/jpeg-9-fix-jmorecfg-boolean-enum.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/479808 -http://lists.linuxtogo.org/pipermail/openembedded-core/2013-February/036049.html - -TRUE & FALSE have to be undefined in order to define the boolean enum - ---- jmorecfg.h -+++ jmorecfg.h -@@ -260,6 +260,8 @@ typedef void noreturn_t; - #define TRUE 1 - #endif - #else -+#undef TRUE -+#undef FALSE - typedef enum { FALSE = 0, TRUE = 1 } boolean; - #endif - diff --git a/media-libs/jpeg/jpeg-9a.ebuild b/media-libs/jpeg/jpeg-9a.ebuild index e780bda2ce0f..ff518885c710 100644 --- a/media-libs/jpeg/jpeg-9a.ebuild +++ b/media-libs/jpeg/jpeg-9a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9a.ebuild,v 1.1 2014/01/24 13:58:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9a.ebuild,v 1.2 2014/01/24 14:02:40 ssuominen Exp $ EAPI=5 inherit eutils libtool toolchain-funcs multilib-minimal @@ -21,9 +21,7 @@ RDEPEND="!media-libs/libjpeg-turbo:0 DEPEND="${RDEPEND}" src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch \ - "${FILESDIR}"/${PN}-9-fix-jmorecfg-boolean-enum.patch + epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch elibtoolize } |