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

Package-Manager: portage-2.1.7.16/cvs/Linux x86_64

4 files changed, 70 insertions, 5 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/Manifest b/dev-ruby/rmagick/Manifest
index 5b386812ef57..3fdb38eaf723 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX rmagick-2.13.0-magicklibsubversion.patch 1744 RMD160 e2c796db017f34e02e84a57e81dedd206c8a6e51 SHA1 0e7429ebba04744e8f8a84dc04570e583d74f388 SHA256 5896f9224aa701c96a8e0fff89a575eb2f487b1168b24690ad79355c4b1062e1
 DIST RMagick-2.12.2.tar.bz2 1160212 RMD160 7cddbd8a932c1f49fbfa90c82e67e6542d6db2fc SHA1 aaebdc2cf5d029352d1cad936edcfaf7cc2e5e32 SHA256 239eca9cc0f196678327e0adc3b76bc9bc01fcd8f8660560b69f350ca8bda3ef
 DIST RMagick-2.13.0.tar.bz2 1184929 RMD160 80b0ec455695355989d4068464cdf8516e1d5b01 SHA1 c2b8e0124bacafcc318255f5b8e47faf551b37a2 SHA256 de2d765e62668ddb5071d310844112a86f7e02789d0c87f29bd82b3c8b4a5dd5
 EBUILD rmagick-2.12.2-r1.ebuild 2323 RMD160 d6bc708b22f3d23ae42e83f27b53bb22c3f59e87 SHA1 542441a51f5ba28fb34803efd4e8da8e9449c6a2 SHA256 efcafc7639db26ac07fdb52c25a9260c884ad0d8524584964b680c23e21aa616
 EBUILD rmagick-2.12.2.ebuild 2408 RMD160 68b0c115dd35051a4651aaf54645205286bf9abe SHA1 d9b9a24d4695202f67885adb6204ea78bd99a5b1 SHA256 e57f03c84baa4e95af2784f67dd340d5df56d713b7160faaa3ce8006a2398d22
-EBUILD rmagick-2.13.0-r1.ebuild 1410 RMD160 644acc2a4d37ab999da63ca09a981fadd9c29eb4 SHA1 9ce940eb47b530be3358edc4a50e5b3ae18569a0 SHA256 6080b218e1c94b6d0982fc5a8d68a6c550a3a7af1515957f01729b702e946a10
+EBUILD rmagick-2.13.0-r1.ebuild 1465 RMD160 0f491e00ff21fcc19f2b1836cf9bd9b5ab695a21 SHA1 0e259c9327c86b63ade83c9fcbcb1fae1c7fbb59 SHA256 b650b59db2ff6ca3706681cf4142d35af13ac00eef9fa940de835ed529f56f71
 EBUILD rmagick-2.13.0.ebuild 1943 RMD160 59782962fa048f3785ec71656c3b8b50dc01d083 SHA1 6c02416d892284e5e3df539a12fbecc689650962 SHA256 d3ef2dfb59f80ae4d060626dadc2fdc281369ac640b64a8f7e884bbdf6588f5e
-MISC ChangeLog 24137 RMD160 7d00e0b1896817f9ea7b27d9f9b7858f983057ac SHA1 65b082aaa8cc9a0e2638c1ddf46d6791b244f365 SHA256 12f8b23e27852d6660b8423152aceab91e8276f474d0cb930e251ea3c3efc5e9
+MISC ChangeLog 24354 RMD160 b2e916f5b2d72768893ff549342fc7e2cda03ee3 SHA1 e849b6de0d29d45826db1588753dad096b18d7bb SHA256 f07a9077e021088661f0faf61d29e70119f5d6926a16733fb1c73a953e47086d
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuBExwACgkQeM7EJeUH71NZEACgjnrIytnBX2nwdgdTp8OcS0Sa
+Y/MAn1XhmxsICYQkPTAufycng1P3JY9l
+=mynF
+-----END PGP SIGNATURE-----
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"