[DRE-commits] r4941 - in trunk/librmagick-ruby/debian: . patches
Vincent Fourmond
fourmond at alioth.debian.org
Mon Mar 15 21:28:35 UTC 2010
Author: fourmond
Date: 2010-03-15 21:28:34 +0000 (Mon, 15 Mar 2010)
New Revision: 4941
Modified:
trunk/librmagick-ruby/debian/changelog
trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff
Log:
[librmagick-ruby] Pulling the proper fix from upstream; unfortunately, upload is not yet possible as we are hitting bug #573983
Modified: trunk/librmagick-ruby/debian/changelog
===================================================================
--- trunk/librmagick-ruby/debian/changelog 2010-03-15 02:11:53 UTC (rev 4940)
+++ trunk/librmagick-ruby/debian/changelog 2010-03-15 21:28:34 UTC (rev 4941)
@@ -1,10 +1,11 @@
librmagick-ruby (2.13.0-2) NOTWORKINGYET; urgency=low
- * Add debian/patches/fix-missing-MagickLibSubversion.diff to work around
- missing symbols in the newer image magick libraries (closes: 573620)
+ * Pull debian/patches/fix-missing-MagickLibSubversion.diff from
+ upstream's git repository to fix missing symbols in the newer image
+ magick libraries (closes: 573620)
* Reflect versioned depencencies as a consequence
- -- Vincent Fourmond <fourmond at debian.org> Sun, 14 Mar 2010 01:22:51 +0100
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 15 Mar 2010 22:27:53 +0100
librmagick-ruby (2.13.0-1) unstable; urgency=low
Modified: trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff
===================================================================
--- trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff 2010-03-15 02:11:53 UTC (rev 4940)
+++ trunk/librmagick-ruby/debian/patches/fix-missing-MagickLibSubversion.diff 2010-03-15 21:28:34 UTC (rev 4941)
@@ -1,29 +1,32 @@
-Index: librmagick-ruby-2.13.0/ext/RMagick/rmpixel.c
+Description: fix missing MagickLibSubversion symbol
+Origin: upstream, slightly trimmed version of commit: http://github.com/rmagick/rmagick/commit/70dfc29c883588a6bf7d609dd70193f3ce49509d
+Index: librmagick-ruby-2.13.0/ext/RMagick/extconf.rb
===================================================================
---- librmagick-ruby-2.13.0.orig/ext/RMagick/rmpixel.c 2010-03-14 01:12:09.298414547 +0100
-+++ librmagick-ruby-2.13.0/ext/RMagick/rmpixel.c 2010-03-14 01:12:51.686764394 +0100
-@@ -528,14 +528,16 @@
- rb_raise(rb_eRangeError, "hue %g out of range [0.0, 360.0)", h);
- }
+--- librmagick-ruby-2.13.0.orig/ext/RMagick/extconf.rb 2009-12-24 07:03:02.000000000 +0100
++++ librmagick-ruby-2.13.0/ext/RMagick/extconf.rb 2010-03-15 20:27:17.822392038 +0100
+@@ -233,6 +233,7 @@
+ "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
+Index: librmagick-ruby-2.13.0/ext/RMagick/rmagick.h
+===================================================================
+--- librmagick-ruby-2.13.0.orig/ext/RMagick/rmagick.h 2009-12-21 11:34:56.000000000 +0100
++++ librmagick-ruby-2.13.0/ext/RMagick/rmagick.h 2010-03-15 20:27:17.822392038 +0100
+@@ -162,6 +162,13 @@
+ #define DestroyConstitute(void) ConstituteComponentTerminus(void)
+ #endif
-- // Ugly way of checking for change in ImageMagick 6.5.6-5 to see whether
-- // saturation/lightness should be out of 255 or out of 100.
-- if(MagickLibVersion < 0x656 ||
-- (MagickLibVersion == 0x656 && strcmp(MagickLibSubversion,"-5") <= 0) )
-- {
-- s = s/2.55;
-- l = l/2.55;
-- }
-+ /* Disabling this check in Debian as we know we'll be running a
-+ more recent version anyway. */
-+ /* // Ugly way of checking for change in ImageMagick 6.5.6-5 to see whether */
-+ /* // saturation/lightness should be out of 255 or out of 100. */
-+ /* if(MagickLibVersion < 0x656 || */
-+ /* (MagickLibVersion == 0x656 && strcmp(MagickLibSubversion,"-5") <= 0) ) */
-+ /* { */
-+ /* s = s/2.55; */
-+ /* l = l/2.55; */
-+ /* } */
-
- memset(name, 0, sizeof(name));
- if (alpha)
++/** 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.
+ */
More information about the Pkg-ruby-extras-commits
mailing list