From 9eeece4d3f7d876e3c332dddc7bc0f4d07ce416fcb049b4aa9a7bfebb5f9412a Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 16 Jan 2015 15:17:05 +0000 Subject: [PATCH] - update to 6.9.0-3 * Don't read beyond the end of a tEXt keyword when checking for Raw profile. * Fixed enabling alpha in 32-bit BMP files. * Added support for writing 16-bit TGA files. * Improved performance of dds. * Fix ImageMagick crashes while read EXIF from TIFF. * Don't handle a "previous" image in the PNG or JNG decoder. * Don't override gamma with 1.0 when reading a grayscale PNG image. * Update progress monitor for every PNG row instead of every pass. * Reject input PNG with dimensions larger than specified with -limit width and -limit height. * etc., see ChangeLog OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=228 --- ImageMagick-6.7.6.1-no-dist-lzip.patch | 18 +++++++++--------- ImageMagick-6.9.0-0.tar.xz | 3 --- ImageMagick-6.9.0-0.tar.xz.asc | 17 ----------------- ImageMagick-6.9.0-3.tar.xz | 3 +++ ImageMagick-6.9.0-3.tar.xz.asc | 17 +++++++++++++++++ ImageMagick.changes | 18 ++++++++++++++++++ ImageMagick.spec | 6 +++--- 7 files changed, 50 insertions(+), 32 deletions(-) delete mode 100644 ImageMagick-6.9.0-0.tar.xz delete mode 100644 ImageMagick-6.9.0-0.tar.xz.asc create mode 100644 ImageMagick-6.9.0-3.tar.xz create mode 100644 ImageMagick-6.9.0-3.tar.xz.asc diff --git a/ImageMagick-6.7.6.1-no-dist-lzip.patch b/ImageMagick-6.7.6.1-no-dist-lzip.patch index 0da003a..f6df2ee 100644 --- a/ImageMagick-6.7.6.1-no-dist-lzip.patch +++ b/ImageMagick-6.7.6.1-no-dist-lzip.patch @@ -1,13 +1,13 @@ -Index: ImageMagick-6.7.6-1/configure.ac +Index: configure.ac =================================================================== ---- ImageMagick-6.7.6-1.orig/configure.ac -+++ ImageMagick-6.7.6-1/configure.ac -@@ -160,7 +160,7 @@ AC_SUBST(PACKAGE_VERSION_ADDENDUM)dnl - # Ensure that make can run correctly - AM_SANITY_CHECK - +--- configure.ac.orig 2015-01-16 14:05:25.789759058 +0100 ++++ configure.ac 2015-01-16 14:06:22.867489168 +0100 +@@ -44,7 +44,7 @@ + AX_PREFIX_CONFIG_H([magick/magick-baseconfig.h],[MagickCore]) + AC_CANONICAL_SYSTEM + AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-lzip dist-xz dist-zip]) +AM_INIT_AUTOMAKE([1.12 nostdinc color-tests foreign parallel-tests silent-rules subdir-objects dist-bzip2 dist-xz dist-zip]) - - # Enable support for silent build rules m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + + # diff --git a/ImageMagick-6.9.0-0.tar.xz b/ImageMagick-6.9.0-0.tar.xz deleted file mode 100644 index 599105c..0000000 --- a/ImageMagick-6.9.0-0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 -size 7893104 diff --git a/ImageMagick-6.9.0-0.tar.xz.asc b/ImageMagick-6.9.0-0.tar.xz.asc deleted file mode 100644 index b81caf0..0000000 --- a/ImageMagick-6.9.0-0.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJUaQLHAAoJEImrY9SCdzd6uaoQAK5l6mMnvWLXg/G2msI0/efV -K2l+4eGu+D8k0Xi9yfsXl7kl214vnCoWNbnMSAe/W+Vqdj057MhoaOknLfWR+dts -r5lDQdq0euZzFqDq7LUkWIp/+N7XPtnA0WiE8VBNPTO5jrC8iD/uRU/PF4UtaUg9 -dtpe5bN8VY+zYO7Vq/j3Bb9TDHAw5a7puoHRpUVGntyHGcNtqqto5//LmJxQFTbj -xX3uNygT+M8z3tKl37B04a2Ehm+XrxTP3Q4KalSyAY8kFFcmV2FoRX5ljW4B3ZOU -fUQaOXx36hbscuZWbR2wx3WBXacMa2r4LgoDByfxS1qEx7kbbRmXCcbASPbHdJcQ -OH4s8oXlJBTtgKAXgaQ8oRz+zKF45jPhGCgIdGlwzVU1mUHRLa8VgvJ4q1lJoI9K -wtf3ZIXgt49WYsKEoYvOrGieafBCAKbFeD4wESx3y9RxU8WmIwakGwpSBM8z1/oo -M7US9/rCULf5V04r7RvO9oRe41LiDEgayIZ8gOOEQyjuhGkRnquzHsOKmrvwvUcP -yWViKvyle9m4L42nfTpGW3s+ucnAZDMF0uG8maW6pLP7IYVA/rxMQcgfS9Xmklf6 -dqFpxroypLkblPDyO6X/88z8UnjWIV7yS5WjUWhxM+2vfkcv9aaYlX1Sj2mqW7xf -iycfL1wjrN2tLMt0d4Ht -=4YZ5 ------END PGP SIGNATURE----- diff --git a/ImageMagick-6.9.0-3.tar.xz b/ImageMagick-6.9.0-3.tar.xz new file mode 100644 index 0000000..ea80084 --- /dev/null +++ b/ImageMagick-6.9.0-3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 +size 7898568 diff --git a/ImageMagick-6.9.0-3.tar.xz.asc b/ImageMagick-6.9.0-3.tar.xz.asc new file mode 100644 index 0000000..c173404 --- /dev/null +++ b/ImageMagick-6.9.0-3.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJUqCfmAAoJEImrY9SCdzd6RYkP/2UjaTlWqw/LJknHZEwIKlT5 +FCcDrnwhL06FqlHFfSVgf/b67n50zLqzrKaloylYGFbUBmxyCI9MKJfKqqJmR/zw +mQ1gKlSz0yzX02GnA/35XHizrNyjec8J3l0Ll7EFaTVwAAptG3E13nQHnfSMosFr +xqqIZCCdJLVtVpRY4eWxUY5rZ0fbjzQDxCFYPZKW63qmxWg1SHGMAwJmOs6plO4R +xLIknO26FBQlz8UOALRVxEdXYR1Xz2l6Qr8MtBsU18RAreDl704KBGhV7JQAwxYD +08TW3DinujLMOAP4makrIyejmoBKc1374dABiKaEZQdtvee4mVOWwQmvCUIPNdAm +f9wYUV/l1EE2uA0xpfSM/NtP6bdZtq2MRERLHrkTe5NdIExmj5O6bOdDcDKKvJIL +z7UOjuC7XVvMdvzkP6ebspd819fsEBd6FF6K12CwCa3iRnYk0rcVrTadpS2fmrXu +Ak1rgd9p1RDgH+iD6XwTDHgF59opCsG1E4U5fGULH+xrlTKvxyBxPZVpq6A4wsQ0 +TXwyT0S+B6HNs+SHkiHxEPq9ohQQYW9wr/2dZrE4z0M6r+4lmFt9zuH9fLlFkBMo +VnMMgnpYNKp3lvO/C+chTyN0uiQ9r2COtazpXBDlkePQ51Urqr0dNSGsfeW17S8O +ih/M9v0syOjjVCMW39MZ +=Nt5d +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 60c70de..63fe350 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Jan 16 15:12:41 UTC 2015 - pgajdos@suse.com + +- update to 6.9.0-3 + * Don't read beyond the end of a tEXt keyword when checking for + Raw profile. + * Fixed enabling alpha in 32-bit BMP files. + * Added support for writing 16-bit TGA files. + * Improved performance of dds. + * Fix ImageMagick crashes while read EXIF from TIFF. + * Don't handle a "previous" image in the PNG or JNG decoder. + * Don't override gamma with 1.0 when reading a grayscale PNG + image. + * Update progress monitor for every PNG row instead of every pass. + * Reject input PNG with dimensions larger than specified with + -limit width and -limit height. + * etc., see ChangeLog + ------------------------------------------------------------------- Mon Dec 15 10:55:26 UTC 2014 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 72c0032..a704402 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ # # spec file for package ImageMagick # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -63,7 +63,7 @@ BuildRequires: zip %define maj 6 %define mfr_version %{maj}.9.0 -%define mfr_revision 0 +%define mfr_revision 3 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 2 @@ -247,7 +247,7 @@ HTML documentation for ImageMagick library and scene examples. %setup -q -n ImageMagick-%{source_version} %patch0 %patch1 -%patch2 -p1 +%patch2 %patch3 -p1 %patch4 -p1 %patch11 -p1