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

(Portage version: 2.2_rc48/cvs/Linux x86_64)

4 files changed, 19 insertions, 43 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/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
-}