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

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 44 insertions, 19 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/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
-}