Fix building with libpng14.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 34 insertions, 31 deletions

diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index b99dba90f00f..7668c788dbc4 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fbdesk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.33 2009/05/03 19:37:51 dirtyepic Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.34 2010/03/11 12:24:56 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> fbdesk-1.4.1.ebuild,
+  +files/fbdesk-1.4.1-libpng14.patch:
+  Fix building with libpng14.
 
   03 May 2009; Ryan Hill <dirtyepic@gentoo.org> fbdesk-1.4.1.ebuild:
   Add missing freetype dependency for bug #227729.
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index ec89789fff58..1c7bdebe5ccc 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fbdesk-1.4.1-gcc-4.3.patch 3506 RMD160 b095682cb6df9ea625eb452df3bf3fbcc3d7e5af SHA1 c676ea7b2d89d5a8e0c842a91b08e4e5e92271b1 SHA256 25f296b0079afd84a9e9fe4e5b057638ee79b5baaa869b70920008d1057a54e0
+AUX fbdesk-1.4.1-libpng14.patch 260 RMD160 82978129d509f8d3b70a139cbe28912905e69ea8 SHA1 10b94c2f279abba97382ed3e64798fd3ef67fd8f SHA256 d73f722d414c5024377df767f24b2ce5c33f10816cd30710b04b09f011e4bec3
 DIST fbdesk-1.4.1.tar.gz 426550 RMD160 ce22936b73acd8273e9816f4c2a5458cc98cf45a SHA1 b5a2f446fa27406d9adb9a9608f1dc3c638d37ff SHA256 ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c
-EBUILD fbdesk-1.4.1.ebuild 978 RMD160 418d6df730e1d0c06a37f5ef577d817ebe5ece83 SHA1 e74f94882947ed13b8614e936ed2c5ad624ee946 SHA256 3c46b118b628729fdefef3e816a8c9d1f4553a9af7dcc7c03933060c6b2996d3
-MISC ChangeLog 4403 RMD160 7336ddc9faadad7b0a04090ea895d859557edbc2 SHA1 fdaa871a1a279b5ce790a67f3397e594b0db9319 SHA256 4703bc409e068933b7413bf97eca4bfdec66c6293e72027e579b663c05b4bcde
+EBUILD fbdesk-1.4.1.ebuild 928 RMD160 fe4544175e60481354b30b21761a04c4fe7a2c94 SHA1 af525f2e05fed5a255e7c7d9e9ea0c28943faacd SHA256 ae2fb86622df21626b00172efb5add96ced6cfc39c0a7832d01c5a2b85b11c0b
+MISC ChangeLog 4547 RMD160 669ee8270b7e41f8413a7c5439cf26a20454c65c SHA1 14f7c94081804cee46653bafa4217e27d1b70e16 SHA256 b122409bfa6558c98dd957923e696172b329a32cec8f19213ab678e57308e9e0
 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn98w0ACgkQiqiDRvmkBmJVHQCg34cIAKqNnPQLYKFPYkFSytMp
-rjwAoMkvxBK4JGOO/YxFzdAbL6DDqIo6
-=df3n
------END PGP SIGNATURE-----
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 48689a957118..628a1d316022 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.9 2009/05/03 19:37:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.10 2010/03/11 12:24:56 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
@@ -14,29 +15,25 @@ KEYWORDS="amd64 ia64 ppc sparc x86"
 IUSE="debug png"
 
 RDEPEND="png? ( media-libs/libpng )
-		media-libs/imlib2
-		>=media-libs/freetype-2
-		x11-libs/libXpm
-		x11-libs/libXft"
+	media-libs/imlib2
+	>=media-libs/freetype-2
+	x11-libs/libXpm
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
-		x11-proto/xextproto"
+	x11-proto/xextproto"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.3.patch \
+		"${FILESDIR}"/${P}-libpng14.patch
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable debug) \
-		$(use_enable png) || die "econf failed"
-
-	emake || die "emake failed"
+		$(use_enable png)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch
new file mode 100644
index 000000000000..472df8b742e5
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-libpng14.patch
@@ -0,0 +1,11 @@
+--- src/FbTk/ImagePNG.cc
++++ src/FbTk/ImagePNG.cc
+@@ -88,7 +88,7 @@
+     // check header
+     unsigned char tag[4];
+     fread(tag, 1, 4, fp);
+-    if (!png_check_sig(tag, 4)) {
++    if (png_sig_cmp(tag, 0, 4)) {
+         fclose(fp);
+         return 0;
+     }