Fix building with libpng15 wrt #380679 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 33 insertions, 12 deletions

diff --git a/media-sound/gqmpeg/ChangeLog b/media-sound/gqmpeg/ChangeLog
index 4f3a5d5199d3..9b8365584508 100644
--- a/media-sound/gqmpeg/ChangeLog
+++ b/media-sound/gqmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gqmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.26 2011/08/25 20:39:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/ChangeLog,v 1.27 2011/09/14 08:52:30 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> gqmpeg-0.91.1.ebuild,
+  +files/gqmpeg-0.91.1-libpng15.patch:
+  Fix building with libpng15 wrt #380679 by Diego Elio Pettenò
 
   25 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> gqmpeg-0.91.1.ebuild:
   QA: add missing libpng dependency.
diff --git a/media-sound/gqmpeg/Manifest b/media-sound/gqmpeg/Manifest
index 33740fc93ad5..0543d92f3aea 100644
--- a/media-sound/gqmpeg/Manifest
+++ b/media-sound/gqmpeg/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gqmpeg-0.91.1-libpng15.patch 281 RMD160 b6376c945693f06c99af9b1a9d55dbc37e56014e SHA1 2b13da5ea9069f8d4beacafcd457b0e079823a65 SHA256 f9829ef0152b3bdb3347a0d9a0ab279cb23e83fd0a7b613a1f521da2a3eb9152
 DIST gqmpeg-0.91.1.tar.gz 1078478 RMD160 7e10b097bc2af3010f43c47a1f905e6103c8dd5f SHA1 23d81dbf49a2d44ceda58bea2b324716b42edbb5 SHA256 78502bf9b9119c9d4495a640e7467c67aa992b30d8b5b2a51c1db86ada045df5
-EBUILD gqmpeg-0.91.1.ebuild 864 RMD160 670f4d3a8bb01a14e4e97c1540c76fbc5ad68ab3 SHA1 1dd4b3430d2d62fcd673e5b991dc0c50698e4767 SHA256 9aa524bf3ba2033e3e7a36e379a8cace7b237a67de66292cc5ea3a3c6f7029d1
-MISC ChangeLog 3487 RMD160 53668cc8def6e22b2f7270883fafbf2a1c8c002c SHA1 580117d7d24d1d5c3458aaf7ffa195484dffea97 SHA256 09a4302fcd9dc4d95672aead5548ee608f741118125b81da58d4641616548200
+EBUILD gqmpeg-0.91.1.ebuild 909 RMD160 3308330262a4f377d841bba162e695b165c454a4 SHA1 2ef7b112ccbec5555b5bfe3ffd6cb2299720e43f SHA256 5f85c2a637180d9296c1343942c8c7e4170e3768dcbcd73741dcc48004483644
+MISC ChangeLog 3667 RMD160 3e5bad04afea3b071419fc2ecdf3e1b2bdcab37a SHA1 13c75e1cb25039b0d5227730aeb190e7a82cbfde SHA256 982d0b8a9da0ec858b302bda8c8bdbdaf49d466dc6af8e8d193ec9b8730daf84
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5WswQACgkQAiZjviIA2XioRQCghxU9//pdgKH4yB+0dIXrsgEr
-TIIAoKh1/ysyJIEFBG7KXUDyMfdT1tUN
-=1Y3n
+iF4EAREIAAYFAk5wa4UACgkQXkR9YqOcLPEUTAD/eQiro/+vsIp+0KJmYdumrhFi
+73kF84bieIFqjes7qCUA/2oiACwNA9kz+lHUo97PJUt3pifnLnxFQNEzsWAg+Mhw
+=a4u5
 -----END PGP SIGNATURE-----
diff --git a/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
new file mode 100644
index 000000000000..f89565b30e10
--- /dev/null
+++ b/media-sound/gqmpeg/files/gqmpeg-0.91.1-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/ui_pixbuf_save.c
++++ src/ui_pixbuf_save.c
+@@ -86,7 +86,7 @@ gboolean pixbuf_to_file_as_png (GdkPixbu
+ 	    	return FALSE;
+ 		}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp (png_jmpbuf(png_ptr)))
+ 		{
+ 		png_destroy_write_struct (&png_ptr, &info_ptr);
+ 		fclose (handle);
diff --git a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
index 4afe0b81e1a6..43b5e796a46b 100644
--- a/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
+++ b/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.11 2011/08/25 20:39:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gqmpeg/gqmpeg-0.91.1.ebuild,v 1.12 2011/09/14 08:52:30 ssuominen Exp $
 
-EAPI=2
+EAPI=4
+inherit eutils
 
 DESCRIPTION="front end to various audio players, including mpg123"
 HOMEPAGE="http://gqmpeg.sourceforge.net"
@@ -13,19 +14,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="nls"
 
-RDEPEND=">=x11-libs/gtk+-2.2:2
+RDEPEND="x11-libs/gtk+:2
 	media-sound/vorbis-tools
 	media-sound/mpg123
-	media-libs/libpng"
+	>=media-libs/libpng-1.4"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+}
+
 src_configure() {
 	econf $(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog FAQ NEWS README SKIN-SPECS* TODO
 }