diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-02-21 11:03:45 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-02-21 11:03:45 +0000 |
| commit | 33dad80c7e914a0e26bd9356b1f0ef2619a953ff (patch) | |
| tree | 6a1331c87d27ede7bac0eddf3a80a9e5b97d8552 /dev-ruby/rmagick/files | |
| parent | Stable on amd64 wrt bug #302396 (diff) | |
| download | gentoo-2-33dad80c7e914a0e26bd9356b1f0ef2619a953ff.tar.gz gentoo-2-33dad80c7e914a0e26bd9356b1f0ef2619a953ff.tar.bz2 gentoo-2-33dad80c7e914a0e26bd9356b1f0ef2619a953ff.zip | |
Add upstream patch for compatibility with newer imagemagick versions, fixes #305245.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Diffstat (limited to 'dev-ruby/rmagick/files')
| -rw-r--r-- | dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch | 47 |
1 files changed, 47 insertions, 0 deletions
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 © 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. + */ |