Fix building with libpng15 wrt #394971 by Elijah El Lazkani. Fix missing license entry for internal libgfx library.

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

4 files changed, 55 insertions, 27 deletions

diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index e8ed9ee2ea81..433076b48a6b 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/fireflies
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.23 2010/09/11 14:55:15 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.24 2011/12/17 11:48:29 ssuominen Exp $
+
+  17 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> fireflies-2.07-r1.ebuild,
+  +files/fireflies-2.07-libgfx-libpng15.patch:
+  Fix building with libpng15 wrt #394971 by Elijah El Lazkani. Fix missing
+  license entry for internal libgfx library.
 
 *fireflies-2.07-r1 (11 Sep 2010)
 
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index d7da53d937bf..a5acc1856abc 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -6,17 +6,20 @@ AUX fireflies-2.06-configure.patch 358 RMD160 956afb64007bf27aa6d3ea6f2647610032
 AUX fireflies-2.07-build_system.patch 1920 RMD160 1811c6d089bc1d12d54a52feaea5421e84ce2e0a SHA1 8309de5873740ca236380d4d5d3bb6a1e497ffa5 SHA256 096cfd6ce9c2183799930ea8bdb64e733ccb1592281cb7921b551000eb42ac46
 AUX fireflies-2.07-gcc43.patch 330 RMD160 b5e1a3094e9848d6d5f0635e912d020cbe16c69a SHA1 2c9fc09c82424838affe1f48e7bbec269fb6535c SHA256 8a17ccace374dbc5c1683051080ea39bac49443061977bde726731e4dcaf749c
 AUX fireflies-2.07-gcc44.patch 390 RMD160 b05e7844f3ce4efd1a74efc055f8fc8ab6a00525 SHA1 a9d01390c29f3da9cb55c0c32002fd952c3f75e0 SHA256 3d9cca98813125a881614d0c027d8251db211ea7c0c6e2fc35e53a4fbeff72b6
+AUX fireflies-2.07-libgfx-libpng15.patch 590 RMD160 3c36324e9bdfc1b222f1b91204a0eea0af433776 SHA1 c3a10b254f62cef16bd14a10a88165412daad460 SHA256 1c3f88c0a99ccb58ef35ff0f4a4239ee0d5d521eb053ff9019f30377b5ad29ed
 DIST fireflies-2.07.tar.gz 199917 RMD160 fb835d27da9679cd5545ae8fdbfe53f604987853 SHA1 83e773fef820e4a39119efd0d6b4000cb3d00147 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648
-EBUILD fireflies-2.07-r1.ebuild 1029 RMD160 6af72b86c797a99b35b1c4e7e9721e80c460c295 SHA1 e3d659b5edbeeb90f3f077d79d6d8933dd15bdee SHA256 43e7ecbf6b30d059f3c1741e27c426bc7fb3a20290b2d50c72ee2446230471ce
+EBUILD fireflies-2.07-r1.ebuild 1093 RMD160 e67632f20cb8db1613f5812a59c46071af3dab32 SHA1 f11cb4da3f5a3d1ec9fa697adbbba1c2ea4c54d7 SHA256 86b25f3923db5b7330560169d88de49bc9b4b54464a14fcd4a67e7f6c786f861
 EBUILD fireflies-2.07.ebuild 1155 RMD160 56ae0307f7ff689a0bf6b260cd6c511adab31891 SHA1 c2f0ffebb197f5bb82df5fe4951d87eae4102945 SHA256 6e33b714f0c7c41f711ec03fba26c4f3b15f1972f8557b1ac983951164c061e8
-MISC ChangeLog 3176 RMD160 2591176e953c6feb34e342e745b5cdca0b2557ce SHA1 65f344b018ead82e1cf82ced1d9e72f573280cfd SHA256 578fe517c8df68b85053e3b02858dbf246d5e39df15c95bd9872f77d59eb41bb
+MISC ChangeLog 3423 RMD160 2468ecb3bbac0dc3e41cc3254a56ee83206fe0b6 SHA1 f684cf93a981e33570df5710b23ede5ad9076959 SHA256 5240426b3747a3ce3ac6b2c149d87c2594e4888c4972667418690b1ebf6ab39f
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAkyLmF0ACgkQIiMqcbOVdxTNQwP/YBY45zYv/IYsdnSsFQba7tCP
-HvM77FDH278CZs1OTF8A99/41Feu46DaABT+vrgVR/WBiF2oIUZcM46RRQUqWXQj
-mixiOIttqWKGWPMbI4RmPIkKOONJqdYGWSTDjBgXcEDTcwhWPnPe3MgEfvd0j0xL
-GAaOXiI+Z9JNiQ8jzjc=
-=ouIY
+iQEcBAEBAgAGBQJO7IFyAAoJEEdUh39IaPFNrB8H/2NQhyrLCrpSjN93rCJrsrgk
+Vd06S7PN/6PqsbfJ5CxirAM50OfyVe3WsXnrgz8hXAbAPqLY+QsC8FRevFGbTSNw
+ULKsxRtfNMI4oM8c9qbZbZDKr287C1v+Pg5pC7C5ngARQtCz+YbAzXmfdnrTl260
+jmjt0ySdFxF0TsBToH1mTR3sZ/rU5UE/gEesNCljs6z6ykhtHDKxlJ+zq97vLN+X
+oLumPncJD7hdp4WJHXgQdBvTxD85wMkqmPsgIQ+uV9q7T8JcDO86CxUtae7yxzAI
+cCM/KTyq0wyidfZqJCXPX8qrP/QwYhJat5bvl5Y5k/VYxlctXWxbpizGYS9noM8=
+=BTSv
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
new file mode 100644
index 000000000000..23d471b8fd13
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng15.patch
@@ -0,0 +1,20 @@
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -39,7 +39,7 @@
+    // Because we didn't set up any error handlers, we need to be
+    // prepared to handle longjmps out of the library on error
+    // conditions.
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       fclose(fp);
+@@ -129,7 +129,7 @@
+       return false;
+    }
+ 
+-   if( setjmp(png_ptr->jmpbuf) )
++   if( setjmp(png_jmpbuf(png_ptr)) )
+    {
+       fclose(fp);
+       png_destroy_write_struct(&png_ptr,  (png_infopp)NULL);
diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
index 14248feb1143..cbfaa283d359 100644
--- a/x11-misc/fireflies/fireflies-2.07-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -1,44 +1,44 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.1 2010/09/11 14:55:15 xarthisius Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.2 2011/12/17 11:48:29 ssuominen Exp $
 
+EAPI=4
 inherit autotools eutils multilib
 
 DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
 HOMEPAGE="http://somewhere.fscked.org/proj/fireflies/"
 SRC_URI="http://somewhere.fscked.org/proj/${PN}/files/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="as-is GPL-2" # as-is is for libgfx, see src_unpack()
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/mesa
-	media-libs/libsdl
-	x11-libs/libX11"
+RDEPEND="media-libs/libsdl
+	x11-libs/libX11
+	virtual/opengl"
 DEPEND="${RDEPEND}"
 
+DOCS=( ChangeLog debian/README.Debian README )
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	tar xzf libgfx-1.0.1.tar.gz
+	tar -xzf libgfx-1.0.1.tar.gz
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build_system.patch \
+	epatch \
+		"${FILESDIR}"/${P}-build_system.patch \
 		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng15.patch
+
 	eautoreconf
 }
 
 src_configure() {
-	econf --with-confdir=/usr/share/xscreensaver/config \
+	econf \
+		--with-confdir=/usr/share/xscreensaver/config \
 		--with-bindir=/usr/$(get_libdir)/misc/xscreensaver
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TODO || die
-}