Accepting request 834244 from home:dirkmueller:branches:graphics

- update to 7.0.10.29:
  * Eliminate infinite loop for certain SVG styles
  * Add version element to JSON file format
  * Enabled support for AVIF encoding on Windows.
  * Clip path in 8bim profile is updated when the image is extended.
- remove ImageMagick-set-correct-colorspace.patch, ImageMagick-inkscape-commandilne.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/834244
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=522

ImageMagick-7.0.10-28.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ad35f1e8b3ce6f4e5be9412e70a9a1c12a56986ce6b5f637756c19fd807221f
-size 11915592

ImageMagick-7.0.10-28.tar.bz2.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJfOahfAAoJEImrY9SCdzd6RusP/25QULQxqAW+jxG9dvH/fDnt
-CnmVnjS3AmA7K9+5hVGk9doi5HeNjkiOQ2EyGLgdeiYYfixRCqNAcdqaj2DvBHuY
-GBX2ZsOWmx7eDaJzeMcQzGbL2fmSVlAHX8U8sN43gmYBLZnqK4+z4cdVbwIjvSEb
-CrdMagyIyqSwe6HLTO0KEHD61ctR0EYWLFfVgCMU/1x0bVTqANpFe9O0BevjM+zU
-G7FkPz/rBrk4iBK24Oh9+xSm2Hn0c8D9lS5p/SjjaChlP4YJDKxrNi9w9QdKy7uy
-NIKBPWCVlU3oj84m1YfLKF3Q0YJGy1HIiTarngIHakRWgBSvpVod08YkOyMGdUTg
-VfDv8qAYmsC+dHMIMUmnUbMo/yCcojXFbkUI4vCegxRanzMj6EziCbay+hGBgFw+
-TUbm0O/FoOEwSTprpWcCWY3MPuupvZ+QkcD1+JWuTjT6DgWZE+Y5BxPWhlK2gZ2x
-WHltAPZCEqecH2vBPwH1jkJGiviCTLagKvONjyjmML2dUCl6wwRo3+H06w1HEgvr
-FhAvXQbuivg0Vb4f3dLkli9Nj9buIfF91LjeJf5/q4zpEJmYwA9kK3uyc6XIULZ3
-RSPYRZkzgWuwMsiVm9a78P28C/PTqXHVGPml4AuhKvSt8v0lZqwbvn6sGeAIUkWb
-GAfRsGzAM870bzN1XHOt
-=MxzU
------END PGP SIGNATURE-----

ImageMagick-7.0.10-29.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a71f6029cf60036e53188164903680ecebb36241c270c88165b6a60ae2e4dddc
+size 11917790

ImageMagick-7.0.10-29.tar.bz2.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJfVP+OAAoJEImrY9SCdzd6UnYP/j1M4SwWPFyTtqU3jgoAGENc
+U6Cq3KSgFvUbp3iJlfntaMsEd54chPAbzfOVGyxjS/Zc0oDNXp0GuX54X9RlsV2L
+hnVst7pqgh0V93WsQ7oqJoE6tWGv15d3O1zwPvmZrfzPxiv6qQTq8BqhpRli7dbU
+3j01z+bxYy3UjewlaFX5MtCHfm+ZCvxdQbtHXqPnnkICAiL8LsPV1rP6qWARs6+u
+rjSaCduHQNFkZ8IUqd6pZWbtTgfDnMI0fCE9WEmidAkN8Kt9GmGjwD3XyXnTfq6M
+PxzMnh2Jlu3zsCtpU+NHDNIrb/dNt93kBIjCvSh9Sj4ZRIoTYpbkz6PV1h59Hf41
++9DPCOI0gsnK5vcNKo1fe+Vf9nukDP0BJ5EnVgvVQJANnwm/oGX/ySTTnVLVQzgG
+tDBrSc/+SiTdIiVWhQweS6pCHa1jBG+p+dzTZlzWnev1XJhBHBCQ3s+DQcOPpEjm
+tweIx6onRWh3Xm/T0sGawX0Fqqolb/JXZ4qw0JM1p4Je86yTf4+u6sSbvn5Dd9pK
+skQIme5Lh40N9dMLRbpAl5ZTu31rgyzJg3akuIC6MpQIvYQ/rlxtaF/+Uzklq1xY
+Uc/ubwClEU29FnQVFgtghk+tMORTf+y2afb9nASB3dhkRpl/h/Fl1xL0NF73yoP6
+lTPb3HmAd9av1WPRKktq
+=uYtH
+-----END PGP SIGNATURE-----

ImageMagick-inkscape-commandilne.patch

@@ -1,13 +0,0 @@
-Index: ImageMagick-7.0.10-28/config/delegates.xml.in
-===================================================================
---- ImageMagick-7.0.10-28.orig/config/delegates.xml.in	2020-08-16 18:11:37.000000000 +0200
-+++ ImageMagick-7.0.10-28/config/delegates.xml.in	2020-08-31 18:56:03.651420565 +0200
-@@ -111,7 +111,7 @@
-   <delegate decode="sid" command="&quot;@MrSIDDecodeDelegate@&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
-   <delegate decode="svg" command="&quot;@RSVGDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
-   <!-- Change export-file to export-png for inkscape < 1.0 -->
--  <delegate decode="svg:decode" stealth="True" command="&quot;@SVGDecodeDelegate@&quot; &quot;%s&quot; --export-file=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
-+  <delegate decode="svg:decode" stealth="True" command="&quot;@SVGDecodeDelegate@&quot; &quot;%s&quot; --export-filename=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
-   <delegate decode="tiff" encode="launch" mode="encode" command="&quot;@LaunchDelegate@&quot; &quot;%i&quot;"/>
-   <delegate decode="wdp" command="@MVDelegate@ &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot;; @MVDelegate@ &quot;%i.jxr&quot; &quot;%i&quot;; @MVDelegate@ &quot;%o.bmp&quot; &quot;%o&quot;"/>
-   <delegate decode="webp" command="&quot;@WebPDecodeDelegate@&quot; -pam &quot;%i&quot; -o &quot;%o&quot;"/>

ImageMagick-set-correct-colorspace.patch

@@ -1,22 +0,0 @@
-diff --git a/coders/plasma.c b/coders/plasma.c
-index 9e4ee8aa79..de62ca6dd4 100644
---- a/coders/plasma.c
-+++ b/coders/plasma.c
-@@ -44,6 +44,7 @@
- #include "MagickCore/blob-private.h"
- #include "MagickCore/cache.h"
- #include "MagickCore/channel.h"
-+#include "MagickCore/colorspace-private.h"
- #include "MagickCore/constitute.h"
- #include "MagickCore/exception.h"
- #include "MagickCore/exception-private.h"
-@@ -154,6 +155,8 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info,
-   if (image == (Image *) NULL)
-     return((Image *) NULL);
-   (void) SetImageStorageClass(image,DirectClass,exception);
-+  if (IsGrayColorspace(image->colorspace) != MagickFalse)
-+    (void) SetImageColorspace(image,sRGBColorspace,exception); 
-   for (y=0; y < (ssize_t) image->rows; y++)
-   {
-     q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
-

ImageMagick.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Sep 14 07:56:37 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- update to 7.0.10.29:
+  * Eliminate infinite loop for certain SVG styles
+  * Add version element to JSON file format
+  * Enabled support for AVIF encoding on Windows.
+  * Clip path in 8bim profile is updated when the image is extended.
+- remove ImageMagick-set-correct-colorspace.patch, ImageMagick-inkscape-commandilne.patch (upstream)
+
 -------------------------------------------------------------------
 Mon Aug 31 16:56:25 UTC 2020 - pgajdos@suse.com
 

ImageMagick.spec

@@ -20,7 +20,7 @@
 %define asan_build     0
 %define maj            7
 %define mfr_version    %{maj}.0.10
-%define mfr_revision   28
+%define mfr_revision   29
 %define quantum_depth  16
 %define source_version %{mfr_version}-%{mfr_revision}
 %define clibver        7
@@ -48,10 +48,6 @@ Patch0:         ImageMagick-configuration-SUSE.patch
 Patch2:         ImageMagick-library-installable-in-parallel.patch
 #%%ifarch s390x s390 ppc64 ppc
 Patch3:         ImageMagick-s390-disable-tests.patch
-# https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3
-Patch4:         ImageMagick-set-correct-colorspace.patch
-# fix inkscape commandline [bsc#1174272]
-Patch5:         ImageMagick-inkscape-commandilne.patch
 #%%endif
 BuildRequires:  chrpath
 BuildRequires:  fdupes
@@ -337,8 +333,6 @@ preserved.
 %ifarch s390x s390 ppc ppc64
 %patch3 -p1
 %endif
-%patch4 -p1
-%patch5 -p1
 
 %build
 # bsc#1088463