Fix compilation wrt #291737, thanks to Łukasz Michalik for reporting.

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

5 files changed, 22 insertions, 56 deletions

diff --git a/x11-misc/nitrogen/ChangeLog b/x11-misc/nitrogen/ChangeLog
index 60b704ea257e..58fe147f1b51 100644
--- a/x11-misc/nitrogen/ChangeLog
+++ b/x11-misc/nitrogen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/nitrogen
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/ChangeLog,v 1.10 2009/07/14 19:48:23 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/ChangeLog,v 1.11 2009/11/03 18:59:54 ssuominen Exp $
+
+  03 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  nitrogen-1.4-r1.ebuild, +files/nitrogen-1.4-png.patch:
+  Fix compilation wrt #291737, thanks to Łukasz Michalik for reporting.
 
   14 Jul 2009; <omp@gentoo.org> -nitrogen-1.2.ebuild:
   Remove older version.
diff --git a/x11-misc/nitrogen/Manifest b/x11-misc/nitrogen/Manifest
index 8dfb56fea717..2d891f1f716a 100644
--- a/x11-misc/nitrogen/Manifest
+++ b/x11-misc/nitrogen/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile-as-needed.patch 553 RMD160 fee7eda3c3ab1173a0712690beda08e3f95b2693 SHA1 992cca04c6adef8c82382179133ee071946d5461 SHA256 7f85ea30e53474ea71341c222b01990bb2edb6368a20f1f44dbdd765e1853d4b
+AUX nitrogen-1.4-png.patch 391 RMD160 0adb40ccb1f48ccaf8360b510b64c4cd8db1c0c7 SHA1 194d7b831277fb34b9019df828b14e3c0a71375b SHA256 09faa4d640a3047c31ca66f10f069e20445bdee6474149866d11194305792a44
 DIST nitrogen-1.4.tar.gz 286186 RMD160 ad06dacf1907adf2b6d60800e713eec2c780a258 SHA1 66ee28ab5d0d9015751ec6b1e3c0fa3bd9d02d44 SHA256 fc6a3dcacbf99a93927ec26a612655116b0eebe394a4b7879a9ca188aaa7dee4
-EBUILD nitrogen-1.4-r1.ebuild 986 RMD160 0a38d5b731333d0c0237284b605451305a681cd5 SHA1 68a583f2c222646f6d4b68c9e4f67f14a499859a SHA256 18f38848c537f6c09fb1c75977e46fecd7dcb67291ea9ad43d12864a1262c76d
-EBUILD nitrogen-1.4.ebuild 959 RMD160 c1a436ee42e9b72742f6268b8356f23396f924ea SHA1 e618aa793bd8b9255e828149ebad3e77ddb179e6 SHA256 825ca72398a2c016fc2c58076ae499a9d7584b8c003304623a33986e30c5a26f
-MISC ChangeLog 1445 RMD160 a31e5a11e9cce28dd2016b551fbad3fb7ed32b8d SHA1 1a6d47d8420f36e0906678c5afb82bdd722d95fe SHA256 3c66a2ab33a5d68350d4d73498affb9c4a121b4a17e714badd93624e380da232
+EBUILD nitrogen-1.4-r1.ebuild 1024 RMD160 d02b5aebbf963d44095a42d121b9f77a986f4811 SHA1 b014fee62f3e0bcb7ca4e28d7c9f2e8a9efbb855 SHA256 b5001021323cff9392c946cc5d3633a20bcc98fb260cda32abb1668ebca60d44
+MISC ChangeLog 1636 RMD160 bf69792d70c49662d1f1532843aa4ecab62e14bc SHA1 43f3fd381acccc2069dc14e8282cbd639b067f0a SHA256 e5515483687891b81160bae1d3fb15c309ed54a159b2deebc60f87fb95a41fae
 MISC metadata.xml 265 RMD160 aebf73b9ca0fce3fc0e428f3fc9719893dddfb04 SHA1 fe6b87c6b6e243a570b11cc3cae8b87397cd8b06 SHA256 a8c9f4ab3dcb6e69fe7b8381fe4eeb6748cc9e88c8116b3e34ad75f58198e908
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpc4Q4ACgkQvSApE0uP4Usj2gCdH/jLCUzsuGfqxWV4BEbpzCky
-O6wAoJ0Wns16iVFR5dfOmvp8N+7/T8JO
-=8S8J
------END PGP SIGNATURE-----
diff --git a/x11-misc/nitrogen/files/nitrogen-1.4-png.patch b/x11-misc/nitrogen/files/nitrogen-1.4-png.patch
new file mode 100644
index 000000000000..9ab152b2468c
--- /dev/null
+++ b/x11-misc/nitrogen/files/nitrogen-1.4-png.patch
@@ -0,0 +1,11 @@
+diff -ur nitrogen-1.4.orig/src/Thumbview.cc nitrogen-1.4/src/Thumbview.cc
+--- nitrogen-1.4.orig/src/Thumbview.cc	2008-07-30 22:16:53.000000000 +0300
++++ nitrogen-1.4/src/Thumbview.cc	2009-11-03 20:56:28.000000000 +0200
+@@ -23,7 +23,6 @@
+ #include "Thumbview.h"
+ #include "md5.h"
+ #include <glib/gstdio.h>
+-#include <png.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild
index b285d39b814f..d57a57d5b9ce 100644
--- a/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild,v 1.1 2009/07/14 19:47:04 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/nitrogen-1.4-r1.ebuild,v 1.2 2009/11/03 18:59:54 ssuominen Exp $
 
 inherit eutils autotools
 
@@ -24,8 +24,8 @@ DEPEND="${RDEPEND}
 src_unpack () {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}"/Makefile-as-needed.patch
+	epatch "${FILESDIR}"/${P}-png.patch \
+		"${FILESDIR}"/Makefile-as-needed.patch
 	eautoreconf
 }
 
diff --git a/x11-misc/nitrogen/nitrogen-1.4.ebuild b/x11-misc/nitrogen/nitrogen-1.4.ebuild
deleted file mode 100644
index 92032c04e523..000000000000
--- a/x11-misc/nitrogen/nitrogen-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/nitrogen/nitrogen-1.4.ebuild,v 1.4 2009/01/11 21:07:19 maekke Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="GTK+ background browser and setter for X."
-HOMEPAGE="http://projects.l3ib.org/nitrogen/"
-SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xinerama"
-
-RDEPEND=">=dev-cpp/gtkmm-2.10
-	>=x11-libs/gtk+-2.10
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	xinerama? ( x11-proto/xineramaproto )"
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/Makefile-as-needed.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable xinerama) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}