From d1480a55844ebd006b046fc27bfc517337d476450e7a3011bb5e7be5c0e25ad6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2020 08:08:15 +0000 Subject: [PATCH 1/3] - version update to 7.0.10.28 * Distorted clip path after -extent (reference https://github.com/ImageMagick/ImageMagick/issues/2414). * Paths in Photoshop EPS files are corrupted on conversion (reference https://github.com/ImageMagick/ImageMagick/issues/2413). OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=518 --- ImageMagick-7.0.10-27.tar.bz2 | 3 --- ImageMagick-7.0.10-27.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.10-28.tar.bz2 | 3 +++ ImageMagick-7.0.10-28.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick.changes | 9 +++++++++ ImageMagick.spec | 2 +- 6 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.0.10-27.tar.bz2 delete mode 100644 ImageMagick-7.0.10-27.tar.bz2.asc create mode 100644 ImageMagick-7.0.10-28.tar.bz2 create mode 100644 ImageMagick-7.0.10-28.tar.bz2.asc diff --git a/ImageMagick-7.0.10-27.tar.bz2 b/ImageMagick-7.0.10-27.tar.bz2 deleted file mode 100644 index e711615..0000000 --- a/ImageMagick-7.0.10-27.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3242781067da557cab032f67ec0988c28dc28df90068baa3f1d43d30aeaf4b01 -size 11915341 diff --git a/ImageMagick-7.0.10-27.tar.bz2.asc b/ImageMagick-7.0.10-27.tar.bz2.asc deleted file mode 100644 index 5772845..0000000 --- a/ImageMagick-7.0.10-27.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJfMdvtAAoJEImrY9SCdzd6UK4P/358t800P1xwcQnG7VrcHkRf -q2qxC9qcuX6j0E168dbBKhv9DXo8s3au7zy6eyeJXu4N6HhgcWrvIaNUoIzxniWS -/+H/MR4MISL8Vd1Z5vekQJ80IX71s6JM4spcP5Zx7yCOgQPPIxl2qxgtW8cp09cN -SRSUb8QWZDcftg0ifLlI/Oiy+mZVeKi2D/OFS8dN8/uUjUk5yurFems475VUE/zu -TD/pGhaG6O5/dbyD/oQOpTNKQCq1M791lCHezPKiv9D2Oy6LJtc+Hp/RLbf6/cHD -k7Qy1H1fPNjMXr0lyOVJgtvs8T/7GkRQRUfhyLjj6kyBON6CiKcT3u/g/WjSNxYF -4fCWB53+/K73+7uGBHvVNXkMpuLsepIAr82MEuNX/5QIzlYp+rewdvSFxMjb7L5b -DreoVmsOApc1MnI0mphHEGWBAfSbRT3NOebm/6LnkdeieCW7MUunmmECxv2Aqghm -CgxdqII2g5R7uzWZNExWQKYNAjL74+Fl8Oqe/ob0qEUp3hSHyjSbFaT5u3FxwrDK -f/7y4URmv3Bg9ItOrtK/P7+U7aagVKwHV3p34+8OU8KsRBF2Uou1iEdZZ6VEoQH8 -ULmrztiyeEzr+MgnToWbYqYhFiChaHP+WFta17qg4MZFwKfWtFmMuY0ddpYaChdK -SDB/9OZdhgeUAv9K4qtw -=O3hl ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.10-28.tar.bz2 b/ImageMagick-7.0.10-28.tar.bz2 new file mode 100644 index 0000000..4d5f50f --- /dev/null +++ b/ImageMagick-7.0.10-28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ad35f1e8b3ce6f4e5be9412e70a9a1c12a56986ce6b5f637756c19fd807221f +size 11915592 diff --git a/ImageMagick-7.0.10-28.tar.bz2.asc b/ImageMagick-7.0.10-28.tar.bz2.asc new file mode 100644 index 0000000..303ed80 --- /dev/null +++ b/ImageMagick-7.0.10-28.tar.bz2.asc @@ -0,0 +1,17 @@ +-----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----- diff --git a/ImageMagick.changes b/ImageMagick.changes index df065cd..b16ae06 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 31 07:56:37 UTC 2020 - pgajdos@suse.com + +- version update to 7.0.10.28 + * Distorted clip path after -extent (reference + https://github.com/ImageMagick/ImageMagick/issues/2414). + * Paths in Photoshop EPS files are corrupted on conversion (reference + https://github.com/ImageMagick/ImageMagick/issues/2413). + ------------------------------------------------------------------- Tue Aug 11 10:35:44 UTC 2020 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index cb75601..031cdb4 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.10 -%define mfr_revision 27 +%define mfr_revision 28 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 7 From 15b01070b40784776b844616f338adca9fb8048e22cfc6a1cf9fb2818ff9843b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2020 13:31:04 +0000 Subject: [PATCH 2/3] - fix bsc#1106272 - added patches fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 + ImageMagick-set-correct-colorspace.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=519 --- ImageMagick-set-correct-colorspace.patch | 22 ++++++++++++++++++++++ ImageMagick.changes | 8 ++++++++ ImageMagick.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 ImageMagick-set-correct-colorspace.patch diff --git a/ImageMagick-set-correct-colorspace.patch b/ImageMagick-set-correct-colorspace.patch new file mode 100644 index 0000000..0655228 --- /dev/null +++ b/ImageMagick-set-correct-colorspace.patch @@ -0,0 +1,22 @@ +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); + diff --git a/ImageMagick.changes b/ImageMagick.changes index b16ae06..d6ca7b4 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 31 13:30:24 UTC 2020 - pgajdos@suse.com + +- fix bsc#1106272 +- added patches + fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 + + ImageMagick-set-correct-colorspace.patch + ------------------------------------------------------------------- Mon Aug 31 07:56:37 UTC 2020 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 031cdb4..eb06dd9 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,6 +48,8 @@ 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 #%%endif BuildRequires: chrpath BuildRequires: fdupes @@ -333,6 +335,7 @@ preserved. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif +%patch4 -p1 %build # bsc#1088463 From de53e7804470f183c1381c56cbf43b16dde6dcc628573cda9d537742648c33fc Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2020 17:07:04 +0000 Subject: [PATCH 3/3] - added patches fix inkscape commandline [bsc#1174272] + ImageMagick-inkscape-commandilne.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=520 --- ImageMagick-inkscape-commandilne.patch | 13 +++++++++++++ ImageMagick.changes | 7 +++++++ ImageMagick.spec | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 ImageMagick-inkscape-commandilne.patch diff --git a/ImageMagick-inkscape-commandilne.patch b/ImageMagick-inkscape-commandilne.patch new file mode 100644 index 0000000..cf47943 --- /dev/null +++ b/ImageMagick-inkscape-commandilne.patch @@ -0,0 +1,13 @@ +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 @@ + + + +- ++ + + + diff --git a/ImageMagick.changes b/ImageMagick.changes index d6ca7b4..85e6f53 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 31 16:56:25 UTC 2020 - pgajdos@suse.com + +- added patches + fix inkscape commandline [bsc#1174272] + + ImageMagick-inkscape-commandilne.patch + ------------------------------------------------------------------- Mon Aug 31 13:30:24 UTC 2020 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index eb06dd9..16e68f1 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -50,6 +50,8 @@ Patch2: ImageMagick-library-installable-in-parallel.patch 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 @@ -336,6 +338,7 @@ preserved. %patch3 -p1 %endif %patch4 -p1 +%patch5 -p1 %build # bsc#1088463