From f9d8edeb40f0bd36db62ee1f2dd7d39482ba394d582ba10511a067fadad101bf Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Sep 2011 13:24:26 +0000 Subject: [PATCH 1/6] - update to 6.7.2.7: * Fix memory leak in text annotation. * The "-strip" option was excluding the PNG tRNS chunk. * Caption now wraps properly for Chinese text. * The PNG encoder would sometimes fail to respect the -define PNG:color-type option when the incoming image was PseudoClass. * Properly handled continued JPEG embedded profiles. * Revert -colorspace sRGB option patch. * Revert -type PaletteMatte option patch. * etc. see ChangeLog. - obsoletes reason-error-message.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=87 --- ImageMagick-6.7.1-0-reason-error-message.patch | 17 ----------------- ImageMagick-6.7.1-0.tar.bz2 | 3 --- ImageMagick-6.7.2-7.tar.bz2 | 3 +++ ImageMagick.changes | 15 +++++++++++++++ ImageMagick.spec | 10 ++++++---- 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 ImageMagick-6.7.1-0-reason-error-message.patch delete mode 100644 ImageMagick-6.7.1-0.tar.bz2 create mode 100644 ImageMagick-6.7.2-7.tar.bz2 diff --git a/ImageMagick-6.7.1-0-reason-error-message.patch b/ImageMagick-6.7.1-0-reason-error-message.patch deleted file mode 100644 index ae9a70d..0000000 --- a/ImageMagick-6.7.1-0-reason-error-message.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: magick/exception.c -=================================================================== ---- magick/exception.c.orig -+++ magick/exception.c -@@ -457,7 +457,11 @@ MagickExport char *GetExceptionMessage(c - - *exception='\0'; - #if defined(MAGICKCORE_HAVE_STRERROR_R) -- (void) strerror_r(error,exception,sizeof(exception)); -+ #if !defined(_GNU_SOURCE) -+ (void) strerror_r(error,exception,sizeof(exception)); -+ #else -+ (void) CopyMagickString(exception,strerror_r(error, exception, sizeof(exception)),sizeof(exception)); -+ #endif - #else - (void) CopyMagickString(exception,strerror(error),sizeof(exception)); - #endif diff --git a/ImageMagick-6.7.1-0.tar.bz2 b/ImageMagick-6.7.1-0.tar.bz2 deleted file mode 100644 index fbe22c8..0000000 --- a/ImageMagick-6.7.1-0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8092d0cabc32470b3635931d7a2dfa0fb94ac2b1e2757db84c748b88103d745 -size 10204971 diff --git a/ImageMagick-6.7.2-7.tar.bz2 b/ImageMagick-6.7.2-7.tar.bz2 new file mode 100644 index 0000000..c0e494d --- /dev/null +++ b/ImageMagick-6.7.2-7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b16f2b3984bd1098fc1586d26f41201c40cbd89db4617df9e76e3ce612d2b336 +size 10222109 diff --git a/ImageMagick.changes b/ImageMagick.changes index a437062..591dfd5 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Sep 20 13:22:37 UTC 2011 - pgajdos@suse.com + +- update to 6.7.2.7: + * Fix memory leak in text annotation. + * The "-strip" option was excluding the PNG tRNS chunk. + * Caption now wraps properly for Chinese text. + * The PNG encoder would sometimes fail to respect the -define + PNG:color-type option when the incoming image was PseudoClass. + * Properly handled continued JPEG embedded profiles. + * Revert -colorspace sRGB option patch. + * Revert -type PaletteMatte option patch. + * etc. see ChangeLog. +- obsoletes reason-error-message.patch + ------------------------------------------------------------------- Sat Sep 17 09:36:34 UTC 2011 - jengelh@medozas.de diff --git a/ImageMagick.spec b/ImageMagick.spec index 92cc40e..b81c7dd 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -83,8 +83,8 @@ BuildRequires: libwebp-devel %endif %define xtp_version 5.4.3 -%define mfr_version 6.7.1 -%define mfr_revision 0 +%define mfr_version 6.7.2 +%define mfr_revision 7 %define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other @@ -106,7 +106,6 @@ Patch2: ImageMagick-6.6.8.9-doc.patch # see http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18435&hilit=include # for upstream progress Patch3: ImageMagick-6.6.9.1-inc-struct.diff -Patch4: ImageMagick-6.7.1-0-reason-error-message.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: imagemag = %{version} Obsoletes: imagemag < %{version} @@ -199,7 +198,6 @@ rm -rf xtp-%{xtp_version} %patch1 %patch2 %patch3 -p1 -%patch4 # remove together with inc-struct.diff ---- echo>header-test.c '#include "wand.h"' # echo>wand.h '#include "wand/MagickWand.h"' # @@ -504,4 +502,8 @@ HTML documentation for ImageMagick library and scene examples. + + + + %changelog From 416cc58d3a3e1eb16ceb17831001283bfad64afc34caac456b625a67c0ee5189 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Sep 2011 13:26:33 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=88 --- ImageMagick.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ImageMagick.spec b/ImageMagick.spec index b81c7dd..ceee442 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -506,4 +506,8 @@ HTML documentation for ImageMagick library and scene examples. + + + + %changelog From 879876929f8c1a8d2cc768851e7c9dac66b834f4d04a956fcbeafcd85cd3f2b0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Sep 2011 13:38:51 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=89 --- ImageMagick.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index ceee442..6ef3e43 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -90,7 +90,7 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other Version: %{mfr_version}.%{mfr_revision} Release: 1 -%define libver 4 +%define libver 5 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org Source: ImageMagick-%{source_version}.tar.bz2 @@ -510,4 +510,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog From 021a0ac875901cbeaa76be69b35348309019efb8fd68fcb6596678c173c90dd0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 20 Sep 2011 14:03:16 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=90 --- ImageMagick.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ImageMagick.spec b/ImageMagick.spec index 6ef3e43..d0debf8 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -512,4 +512,8 @@ HTML documentation for ImageMagick library and scene examples. + + + + %changelog From 2560f288b363a013c1183133a3e5b286b5296dd51cdabdfd40d22bf47c7add2b Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 07:40:39 +0000 Subject: [PATCH 5/6] fix baselibs.conf OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=91 --- ImageMagick.spec | 14 -------------- baselibs.conf | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index d0debf8..fdd9ccf 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -502,18 +502,4 @@ HTML documentation for ImageMagick library and scene examples. - - - - - - - - - - - - - - %changelog diff --git a/baselibs.conf b/baselibs.conf index 0257de7..6b521e4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,5 @@ -libMagickCore4 -libMagickWand4 +libMagickCore5 +libMagickWand5 ImageMagick-devel requires -ImageMagick- requires "libMagickCore4- = " From 8bc71f6d6af3a0ca33040b4fb5eaf2ebe3cbbe257d466f1e63467c2e46ddb5c6 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Sep 2011 07:42:44 +0000 Subject: [PATCH 6/6] one more fix OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=92 --- ImageMagick.spec | 2 ++ baselibs.conf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index fdd9ccf..f896b0d 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -502,4 +502,6 @@ HTML documentation for ImageMagick library and scene examples. + + %changelog diff --git a/baselibs.conf b/baselibs.conf index 6b521e4..ab1f5cf 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,5 +2,5 @@ libMagickCore5 libMagickWand5 ImageMagick-devel requires -ImageMagick- - requires "libMagickCore4- = " - requires "libMagickWand4- = " + requires "libMagickCore5- = " + requires "libMagickWand5- = "