* [gentoo-commits] gentoo-x86 commit in dev-ruby/rmagick/files: rmagick-2.13.0-magicklibsubversion.patch
@ 2010-02-21 11:03 Hans de Graaff (graaff)
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff (graaff) @ 2010-02-21 11:03 UTC (permalink / raw
To: gentoo-commits
graaff 10/02/21 11:03:44
Added: rmagick-2.13.0-magicklibsubversion.patch
Log:
Add upstream patch for compatibility with newer imagemagick versions, fixes #305245.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?rev=1.1&view=markup
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
Index: rmagick-2.13.0-magicklibsubversion.patch
===================================================================
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.
*/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-ruby/rmagick/files: rmagick-2.13.0-magicklibsubversion.patch
@ 2010-02-22 6:51 Hans de Graaff (graaff)
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff (graaff) @ 2010-02-22 6:51 UTC (permalink / raw
To: gentoo-commits
graaff 10/02/22 06:51:16
Modified: rmagick-2.13.0-magicklibsubversion.patch
Log:
Remove header from patch: not needed and will get handled by our CVS.
(Portage version: 2.1.7.16/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch?r1=1.1&r2=1.2
Index: rmagick-2.13.0-magicklibsubversion.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rmagick/files/rmagick-2.13.0-magicklibsubversion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rmagick-2.13.0-magicklibsubversion.patch 21 Feb 2010 11:03:44 -0000 1.1
+++ rmagick-2.13.0-magicklibsubversion.patch 22 Feb 2010 06:51:15 -0000 1.2
@@ -22,15 +22,6 @@
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-ruby/rmagick/files: rmagick-2.13.0-magicklibsubversion.patch
@ 2013-09-05 12:26 Manuel Rueger (mrueg)
0 siblings, 0 replies; 3+ messages in thread
From: Manuel Rueger (mrueg) @ 2013-09-05 12:26 UTC (permalink / raw
To: gentoo-commits
mrueg 13/09/05 12:26:01
Removed: rmagick-2.13.0-magicklibsubversion.patch
Log:
Cleanup old.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key )
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-05 12:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-21 11:03 [gentoo-commits] gentoo-x86 commit in dev-ruby/rmagick/files: rmagick-2.13.0-magicklibsubversion.patch Hans de Graaff (graaff)
-- strict thread matches above, loose matches on Subject: below --
2010-02-22 6:51 Hans de Graaff (graaff)
2013-09-05 12:26 Manuel Rueger (mrueg)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox