From ed66920b6711b20d45fd73fc335b4be0506c1fb8e48e42956f5f38f2bc9a14d2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 21 May 2013 11:01:34 +0000 Subject: [PATCH 1/2] - update to 6.8.5-7: * fixes reading XPM OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=152 --- ImageMagick-6.8.5-6.tar.bz2 | 3 --- ImageMagick-6.8.5-7.tar.bz2 | 3 +++ ImageMagick.changes | 6 ++++++ ImageMagick.spec | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 ImageMagick-6.8.5-6.tar.bz2 create mode 100644 ImageMagick-6.8.5-7.tar.bz2 diff --git a/ImageMagick-6.8.5-6.tar.bz2 b/ImageMagick-6.8.5-6.tar.bz2 deleted file mode 100644 index 84aa748..0000000 --- a/ImageMagick-6.8.5-6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29158d19ea0dadf10b314c859b167a654922fa2701ded572fa9983ad603876a3 -size 11041079 diff --git a/ImageMagick-6.8.5-7.tar.bz2 b/ImageMagick-6.8.5-7.tar.bz2 new file mode 100644 index 0000000..dabf047 --- /dev/null +++ b/ImageMagick-6.8.5-7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a531e2d1b49ebdfca2f2ebfee0de0921315c5d97f784e939e68eaf3c7201926e +size 10891300 diff --git a/ImageMagick.changes b/ImageMagick.changes index 6d774ea..1a0c033 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/ImageMagick.spec b/ImageMagick.spec index c5aef23..603cbfe 100644 --- a/ImageMagick.spec +++ b/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 @@ -391,4 +391,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog From b8b7f2e6e587f09fba5d783dbc775cb3fb2c543e0db798a402724c95a66d1af9 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 23 May 2013 09:58:16 +0000 Subject: [PATCH 2/2] - 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 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=153 --- ImageMagick-6.8.5.7-no-XPMCompliance.patch | 13 +++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 4 ++++ 3 files changed, 24 insertions(+) create mode 100644 ImageMagick-6.8.5.7-no-XPMCompliance.patch 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