Add upstream patch for compatibility with newer imagemagick versions, fixes #305245.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

3 files changed, 57 insertions, 3 deletions

diff --git a/dev-ruby/rmagick/ChangeLog b/dev-ruby/rmagick/ChangeLog
index 2306799dd21d..19a9739f2b75 100644
--- a/dev-ruby/rmagick/ChangeLog
+++ b/dev-ruby/rmagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/rmagick
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.169 2010/01/05 20:02:22 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/ChangeLog,v 1.170 2010/02/21 11:03:45 graaff Exp $
+
+  21 Feb 2010; Hans de Graaff <graaff@gentoo.org> rmagick-2.13.0-r1.ebuild,
+  +files/rmagick-2.13.0-magicklibsubversion.patch:
+  Add upstream patch for compatibility with newer imagemagick versions,
+  fixes #305245.
 
   05 Jan 2010; Hans de Graaff <graaff@gentoo.org> rmagick-2.13.0-r1.ebuild:
   Install pre-generated docs with USE=doc.
diff --git a/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch b/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
new file mode 100644
index 000000000000..5519e0ae27dd
--- /dev/null
+++ b/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
@@ -0,0 +1,47 @@
+commit 70dfc29c883588a6bf7d609dd70193f3ce49509d
+Author: Omer Bar-or <omer@bar-or.org>
+Date:   Mon Feb 15 22:53:16 2010 -0800
+
+    Added check for MagickLibAddendum (replaced MagickLibSubversion).
+
+Applied minus a whitespace-only part that did not apply as-is.
+
+diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb
+index 6446d40..78a6260 100644
+--- a/ext/RMagick/extconf.rb
++++ b/ext/RMagick/extconf.rb
+@@ -233,6 +233,7 @@ have_func("snprintf", headers)
+    "LevelColorsImageChannel",        # 6.5.6-4
+    "LevelizeImageChannel",           # 6.4.2
+    "LiquidRescaleImage",             # 6.3.8-2
++   "MagickLibAddendum",              # 6.5.9-1
+    "OpaquePaintImageChannel",        # 6.3.7-10
+    "QueueAuthenticPixels",           # 6.4.5-6
+    "RemapImage",                     # 6.4.4-0
+diff --git a/ext/RMagick/rmagick.h b/ext/RMagick/rmagick.h
+index e18a678..8aa6f3f 100644
+--- a/ext/RMagick/rmagick.h
++++ b/ext/RMagick/rmagick.h
+@@ -6,7 +6,7 @@
+  * Changes since Nov. 2009 copyright &copy; by Benjamin Thomas and Omer Bar-or
+  *
+  * @file     rmagick.h
+- * @version  $Id: rmagick-2.13.0-magicklibsubversion.patch,v 1.1 2010/02/21 11:03:44 graaff Exp $
++ * @version  $Id: rmagick-2.13.0-magicklibsubversion.patch,v 1.1 2010/02/21 11:03:44 graaff Exp $
+  * @author   Tim Hunter
+  ******************************************************************************/
+ 
+@@ -162,6 +162,13 @@
+ #define DestroyConstitute(void) ConstituteComponentTerminus(void)
+ #endif
+ 
++/** ImageMagick 6.5.9 replaced MagickLibSubversion with
++ * MagickLibAddendum.
++ */
++#if defined(HAVE_MAGICKLIBADDENDUM)
++#define MagickLibSubversion MagickLibAddendum
++#endif
++
+ /** IM 6.4.1 replaced AllocateImage with AcquireImage.
+  * Both have the same signature.
+  */
diff --git a/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild b/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild
index 7091799f37cd..7ea7ba812675 100644
--- a/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild
+++ b/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild,v 1.3 2010/01/08 23:49:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/rmagick-2.13.0-r1.ebuild,v 1.4 2010/02/21 11:03:45 graaff Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ruby19"
@@ -23,11 +23,13 @@ IUSE="doc"
 
 # hdri causes extensive changes in the imagemagick internals, and
 # rmagick is not ready to deal with those, see bug 184356.
-RDEPEND=">=media-gfx/imagemagick-6.3.5.10[-hdri]"
+RDEPEND=">=media-gfx/imagemagick-6.4.9[-hdri]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/RMagick-${PV}"
 
+RUBY_PATCHES=( "rmagick-2.13.0-magicklibsubversion.patch" )
+
 each_ruby_configure() {
 	pushd ext/RMagick
 	${RUBY} extconf.rb || die "extconf.rb failed"