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