Accepting request 176404 from graphics

- workaround: fix reading xpm which uses symbolic color names which
  are said to be not XPMCompliant
  * http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462

- update to 6.8.5-7:
  * fixes reading XPM

OBS-URL: https://build.opensuse.org/request/show/176404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=92

ImageMagick-6.8.5-6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29158d19ea0dadf10b314c859b167a654922fa2701ded572fa9983ad603876a3
-size 11041079

ImageMagick-6.8.5-7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a531e2d1b49ebdfca2f2ebfee0de0921315c5d97f784e939e68eaf3c7201926e
+size 10891300

ImageMagick-6.8.5.7-no-XPMCompliance.patch

@@ -0,0 +1,13 @@
+Index: ImageMagick-6.8.5-7/coders/xpm.c
+===================================================================
+--- ImageMagick-6.8.5-7.orig/coders/xpm.c
++++ ImageMagick-6.8.5-7/coders/xpm.c
+@@ -382,7 +382,7 @@ static Image *ReadXPMImage(const ImageIn
+         image->storage_class=DirectClass;
+         image->matte=MagickTrue;
+       }
+-    status=QueryColorCompliance(target,XPMCompliance,&image->colormap[j],
++    status=QueryColorCompliance(target,X11Compliance,&image->colormap[j],
+       exception);
+     if (status == MagickFalse)
+       break;

ImageMagick.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu May 23 09:55:52 UTC 2013 - pgajdos@suse.com
+
+- workaround: fix reading xpm which uses symbolic color names which
+  are said to be not XPMCompliant
+  * http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
+
+-------------------------------------------------------------------
+Tue May 21 10:34:21 UTC 2013 - pgajdos@suse.com
+
+- update to 6.8.5-7:
+  * fixes reading XPM
+
 -------------------------------------------------------------------
 Mon May 13 09:01:39 UTC 2013 - pgajdos@suse.com
 

ImageMagick.spec

@@ -43,7 +43,7 @@ BuildRequires:  pango-devel
 BuildRequires:  pkgconfig
 
 %define mfr_version   6.8.5
-%define mfr_revision  6
+%define mfr_revision  7
 %define quantum_depth 8
 %define source_version %{mfr_version}-%{mfr_revision}
 %define libver  1
@@ -66,6 +66,8 @@ Patch3:         ImageMagick-6.8.4.0-rpath.patch
 # bugs
 # will ask upstream if needed, or if other solution exists
 Patch11:        ImageMagick-6.8.4.0-dont-build-in-install.patch
+# workaround for http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23462
+Patch12:        ImageMagick-6.8.5.7-no-XPMCompliance.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n perl-PerlMagick
@@ -128,6 +130,7 @@ BuildArch:      noarch
 %patch2  -p1
 %patch3  -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -391,4 +394,7 @@ HTML documentation for ImageMagick library and scene examples.
 
 
 
+
+
+
 %changelog