commit ImageMagick for openSUSE:Factory
Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at 2013-05-28 07:38:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ImageMagick (Old) and /work/SRC/openSUSE:Factory/.ImageMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ImageMagick" Changes: -------- --- /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick.changes 2013-05-16 15:36:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick.changes 2013-05-28 07:38:21.000000000 +0200 @@ -1,0 +2,13 @@ +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 + +------------------------------------------------------------------- Old: ---- ImageMagick-6.8.5-6.tar.bz2 New: ---- ImageMagick-6.8.5-7.tar.bz2 ImageMagick-6.8.5.7-no-XPMCompliance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.seKAkK/_old 2013-05-28 07:38:22.000000000 +0200 +++ /var/tmp/diff_new_pack.seKAkK/_new 2013-05-28 07:38:22.000000000 +0200 @@ -43,7 +43,7 @@ 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 @@ # 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 @@ %patch2 -p1 %patch3 -p1 %patch11 -p1 +%patch12 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -387,6 +390,9 @@ + + + ++++++ ImageMagick-6.8.5-6.tar.bz2 -> ImageMagick-6.8.5-7.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ImageMagick/ImageMagick-6.8.5-6.tar.bz2 /work/SRC/openSUSE:Factory/.ImageMagick.new/ImageMagick-6.8.5-7.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.8.5.7-no-XPMCompliance.patch ++++++ 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; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de