diff --git a/ImageMagick-6.8.5.7-no-XPMCompliance.patch b/ImageMagick-6.8.5.7-no-XPMCompliance.patch new file mode 100644 index 0000000..e70e5fa --- /dev/null +++ b/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; diff --git a/ImageMagick.changes b/ImageMagick.changes index 1a0c033..21a09ff 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/ImageMagick.spec b/ImageMagick.spec index 603cbfe..1e16d33 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -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" @@ -393,4 +396,5 @@ HTML documentation for ImageMagick library and scene examples. + %changelog