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

Package-Manager: portage-2.1.4.4

5 files changed, 26 insertions, 7 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/Manifest b/x11-misc/rss-glx/Manifest
index 537a32dde759..c84dd4498e7b 100644
--- a/x11-misc/rss-glx/Manifest
+++ b/x11-misc/rss-glx/Manifest
@@ -1,7 +1,8 @@
 AUX jwz-vroot.h 6234 RMD160 92aabe5424720238ccf2214260c7830718414d2f SHA1 0119753211cc0b3f7a13650e4173b6b11a416d11 SHA256 fcd4b00bff5f57b739d98dae40b98137f63a478abef2fcb3e0be8b256ea27f57
 AUX rss-glx-0.8.1-hyperspace-viewport.patch 507 RMD160 40bf26af531f3dd1504da4c3aa84ebad585df162 SHA1 1b483849ae1bdac7121b57847b82db8a0ee5bebc SHA256 3652e11e15cbe8262cb8cb65426e24cbd70751940feff7423a2c0be711dd8562
-AUX rss-glx-0.8.1-r1-gentoo.patch 1778 RMD160 c50926bac73cf98a4b7dec217f616c2fa881c10b SHA1 4f91ba9479ba2350992c6a8d8dfc9b19970a778e SHA256 f26e780b5e7979b6c4eb97c78078e377ba6c96e46c1c9b194af9064d8c65a9ec
+AUX rss-glx-0.8.1-r4-gentoo.patch 1778 RMD160 c50926bac73cf98a4b7dec217f616c2fa881c10b SHA1 4f91ba9479ba2350992c6a8d8dfc9b19970a778e SHA256 f26e780b5e7979b6c4eb97c78078e377ba6c96e46c1c9b194af9064d8c65a9ec
+AUX rss-glx-0.8.1-r4-imagemagick.patch 462 RMD160 e6a8e1d2d68d8f86c0f06564f76c87b845a138bc SHA1 69f01c027c31b6c7b0d87c66cdff2a8361be1377 SHA256 d680d2596fe724f0f1561f88947c14a313768a2e25285c1b004fe7d6347426c5
 DIST rss-glx_0.8.1.tar.bz2 5248755 RMD160 c12e91be3505129ca1e4d877309e53505b4a8f4e SHA1 188871d7940de8a7c3f9e622ddc131e46567eab5 SHA256 cf03409ed82f167b39a37b25d21a2de065bb728afeda561bdb2626e7b7ea42bb
-EBUILD rss-glx-0.8.1-r4.ebuild 4660 RMD160 c9eb5ceff37940f9f080ee75ea978d761258cbf2 SHA1 f60fe2efe0ff0b6a7ccac9784da61cd5bd8c9b11 SHA256 74d0f523b288e64d21367080a59d1797fe9d70228bc74842d1403c69acd303b5
-MISC ChangeLog 10032 RMD160 5d2cbfcbeda8f73c7f0c75e5eee23dac4d187beb SHA1 b156134a7cfcbbd7890032fb177cd1280599d54f SHA256 6423878d884d0c63606719b39048975c776990f612abd6e796705213894fa626
+EBUILD rss-glx-0.8.1-r4.ebuild 4709 RMD160 230b262cb89e752c3cb38610835b470d69508a3a SHA1 9cd5501a2a2df6fd743befe0169dc961e02caaec SHA256 0f3079b89dbcadf455d4f7e30b78ae6607c224e782723ad108e98f8230c62562
+MISC ChangeLog 10340 RMD160 5d0e1ebe0cd643df7d4c187e6a2dc418fce8c531 SHA1 6e0d98fd781163bbc4af5606a8b7c5a223a29a3b SHA256 40955bfe6a80a62512fac57fd09ac9ebd1b3677bd5e82062312dca6eb9fdc8b0
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
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*