Add patch to fix compile with latest imagemagick. Thanks to Ian Abbott, closes bug #213643.

(Portage version: 2.1.4.4)

4 files changed, 22 insertions, 4 deletions

diff --git a/x11-misc/rss-glx/ChangeLog b/x11-misc/rss-glx/ChangeLog
index 88c3d8701a18..0539e21d20f1 100644
--- a/x11-misc/rss-glx/ChangeLog
+++ b/x11-misc/rss-glx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/rss-glx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.60 2008/01/07 04:11:56 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/ChangeLog,v 1.61 2008/04/04 17:54:56 je_fro Exp $
+
+  04 Apr 2008; Jeff Gardner <je_fro@gentoo.org>
+  -files/rss-glx-0.8.1-r1-gentoo.patch,
+  +files/rss-glx-0.8.1-r4-gentoo.patch,
+  +files/rss-glx-0.8.1-r4-imagemagick.patch, rss-glx-0.8.1-r4.ebuild:
+  Fix compile with new imagemagick. Thanks to Mark Peloquin for reporting
+  and Ian Abbott for the patch.
 
   07 Jan 2008; David Shakaryan <omp@gentoo.org> rss-glx-0.8.1-r4.ebuild:
   Add dev-util/pkgconfig to DEPEND. (bug #204594)
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-r4-gentoo.patch
index dfc3012aacdc..dfc3012aacdc 100644
--- a/x11-misc/rss-glx/files/rss-glx-0.8.1-r1-gentoo.patch
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-r4-gentoo.patch
diff --git a/x11-misc/rss-glx/files/rss-glx-0.8.1-r4-imagemagick.patch b/x11-misc/rss-glx/files/rss-glx-0.8.1-r4-imagemagick.patch
new file mode 100644
index 000000000000..772f55d24d1a
--- /dev/null
+++ b/x11-misc/rss-glx/files/rss-glx-0.8.1-r4-imagemagick.patch
@@ -0,0 +1,10 @@
+--- rss-glx_0.8.1/other_src/Makefile.in	2006-02-25 21:14:56.000000000 +0000
++++ rss-glx_0.8.1.new/other_src/Makefile.in	2008-03-27 16:00:53.000000000 +0000
+@@ -232,6 +232,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
++AM_CFLAGS = $(Wand_CFLAGS)
+ biof_SOURCES = driver.c biof.c
+ busyspheres_SOURCES = driver.c busyspheres.c
+ matrixview_SOURCES = driver.c matrixview.c matrixview_textures.c
diff --git a/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
index e1efead675b6..4ae2ef70ec20 100644
--- a/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild,v 1.8 2008/01/07 04:11:56 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rss-glx/rss-glx-0.8.1-r4.ebuild,v 1.9 2008/04/04 17:54:56 je_fro Exp $
 
 inherit flag-o-matic eutils
 
@@ -42,8 +42,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-r1-gentoo.patch
+	epatch "${FILESDIR}"/${PF}-gentoo.patch
 	epatch "${FILESDIR}"/${PN}-0.8.1-hyperspace-viewport.patch
+	epatch "${FILESDIR}"/${PF}-imagemagick.patch
 	cp "${FILESDIR}"/jwz-vroot.h include/vroot.h || die
 }
 
@@ -73,7 +74,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc README README.xscreensaver
 
 	# symlink to satisfy kde's kxs*