| 1 |
graaff 10/02/21 11:03:44 |
| 2 |
|
| 3 |
Added: rmagick-2.13.0-magicklibsubversion.patch |
| 4 |
Log: |
| 5 |
Add upstream patch for compatibility with newer imagemagick versions, fixes #305245. |
| 6 |
(Portage version: 2.1.7.16/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: rmagick-2.13.0-magicklibsubversion.patch |
| 15 |
=================================================================== |
| 16 |
commit 70dfc29c883588a6bf7d609dd70193f3ce49509d |
| 17 |
Author: Omer Bar-or <omer@××××××.org> |
| 18 |
Date: Mon Feb 15 22:53:16 2010 -0800 |
| 19 |
|
| 20 |
Added check for MagickLibAddendum (replaced MagickLibSubversion). |
| 21 |
|
| 22 |
Applied minus a whitespace-only part that did not apply as-is. |
| 23 |
|
| 24 |
diff --git a/ext/RMagick/extconf.rb b/ext/RMagick/extconf.rb |
| 25 |
index 6446d40..78a6260 100644 |
| 26 |
--- a/ext/RMagick/extconf.rb |
| 27 |
+++ b/ext/RMagick/extconf.rb |
| 28 |
@@ -233,6 +233,7 @@ have_func("snprintf", headers) |
| 29 |
"LevelColorsImageChannel", # 6.5.6-4 |
| 30 |
"LevelizeImageChannel", # 6.4.2 |
| 31 |
"LiquidRescaleImage", # 6.3.8-2 |
| 32 |
+ "MagickLibAddendum", # 6.5.9-1 |
| 33 |
"OpaquePaintImageChannel", # 6.3.7-10 |
| 34 |
"QueueAuthenticPixels", # 6.4.5-6 |
| 35 |
"RemapImage", # 6.4.4-0 |
| 36 |
diff --git a/ext/RMagick/rmagick.h b/ext/RMagick/rmagick.h |
| 37 |
index e18a678..8aa6f3f 100644 |
| 38 |
--- a/ext/RMagick/rmagick.h |
| 39 |
+++ b/ext/RMagick/rmagick.h |
| 40 |
@@ -6,7 +6,7 @@ |
| 41 |
* Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or |
| 42 |
* |
| 43 |
* @file rmagick.h |
| 44 |
- * @version $Id: rmagick-2.13.0-magicklibsubversion.patch,v 1.1 2010/02/21 11:03:44 graaff Exp $ |
| 45 |
+ * @version $Id: rmagick-2.13.0-magicklibsubversion.patch,v 1.1 2010/02/21 11:03:44 graaff Exp $ |
| 46 |
* @author Tim Hunter |
| 47 |
******************************************************************************/ |
| 48 |
|
| 49 |
@@ -162,6 +162,13 @@ |
| 50 |
#define DestroyConstitute(void) ConstituteComponentTerminus(void) |
| 51 |
#endif |
| 52 |
|
| 53 |
+/** ImageMagick 6.5.9 replaced MagickLibSubversion with |
| 54 |
+ * MagickLibAddendum. |
| 55 |
+ */ |
| 56 |
+#if defined(HAVE_MAGICKLIBADDENDUM) |
| 57 |
+#define MagickLibSubversion MagickLibAddendum |
| 58 |
+#endif |
| 59 |
+ |
| 60 |
/** IM 6.4.1 replaced AllocateImage with AcquireImage. |
| 61 |
* Both have the same signature. |
| 62 |
*/ |
Archives