From 13db75bbdc039c002757202ea927abd35079166f095a6c087f0bf597550d2d14 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 13 May 2019 06:03:33 +0000 Subject: [PATCH 1/6] - version update to 7.0.8.44 * Fixed a number of issues (reference https://imagemagick.org/discourse-server/viewforum.php?f=3). * Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues). OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=437 --- ImageMagick-7.0.8-42.tar.bz2 | 3 --- ImageMagick-7.0.8-42.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.8-44.tar.bz2 | 3 +++ ImageMagick-7.0.8-44.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick.changes | 9 +++++++++ ImageMagick.spec | 2 +- 6 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.0.8-42.tar.bz2 delete mode 100644 ImageMagick-7.0.8-42.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-44.tar.bz2 create mode 100644 ImageMagick-7.0.8-44.tar.bz2.asc diff --git a/ImageMagick-7.0.8-42.tar.bz2 b/ImageMagick-7.0.8-42.tar.bz2 deleted file mode 100644 index 5b97c71..0000000 --- a/ImageMagick-7.0.8-42.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3662d65b0524022985f247852babe2e758a8af16494f35dfa176e4166749db5 -size 11464478 diff --git a/ImageMagick-7.0.8-42.tar.bz2.asc b/ImageMagick-7.0.8-42.tar.bz2.asc deleted file mode 100644 index ef93b25..0000000 --- a/ImageMagick-7.0.8-42.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJcwGwIAAoJEImrY9SCdzd63S8QAI1lHLkaqGFcZHReCEL+tN6F -z+HzqKEqkIwx5aYrEb9L4XihY7KfHsxZ38WeyJ18RuTU8YeuwZHWWpvWC3+iPmG2 -1d1Dc1vmidoTkSBJic6kjMqXb69gTwBkhpuzLd4foECD+6x/DRxICpfVF/k2/Yc4 -yh0fKL/1h93nYyFnOkL1AF059g2RMPEeiuxFnPFGktMRLYRSgJxgkpc8jTPnG/Uz -kuCHlXM4b7VFEpFSU6neRCP9gJxuMWbuPLRlE+VYtFvWTEjzhsleeDrfJ+GsI0/L -xktXXfEmH+cqc72tH4yz365bH+rJq0ihR0VTBm5TT0bD4DzC6aYOhaEvl6fLuPGN -WRaZ9EoDpsF0MVk2RbHALuXpr3fBiBK84zoQIBLqdX1xfdvuYlgqTiF9Kwx12LiF -1KKs83IOwLj0eyrtLI9HilC8REvSqBB0Ks1Pc8spQlorveeyaSb+zq2kzYjYa6n9 -/FiHiJoGNRFeFn3CbWcSeQXWDV6Kf0L8/xyMChp5jnhYs4LeqLBv4WG9woOiJ9cj -UYINtc2jyQYZhsYHHos/Dnn2DsfFfQlRNp1a92Up7KgrNBoY51Yr6wLs5lW2yZga -shlZsD/3Yy2Jp1Xk0FEOj7YqWbFgk4z943w9+bjB69Dw5IY1WLjZO6GrtLyoXe85 -CLHpQzIKtYvsksXYh6jX -=XNM7 ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-44.tar.bz2 b/ImageMagick-7.0.8-44.tar.bz2 new file mode 100644 index 0000000..46754f1 --- /dev/null +++ b/ImageMagick-7.0.8-44.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3e92c3130a9bad7e6e738407a8e67bb2af1e0030d09cc7974df0b22318d34c8 +size 11485421 diff --git a/ImageMagick-7.0.8-44.tar.bz2.asc b/ImageMagick-7.0.8-44.tar.bz2.asc new file mode 100644 index 0000000..839ada1 --- /dev/null +++ b/ImageMagick-7.0.8-44.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJczYI0AAoJEImrY9SCdzd6KbsQAKLOBz3L8Pw5Hw1JXcO1dFTU +G8atnaI2yE/o+8wH+P7j3+EZXIrtkp+n/ZpRvzf7SFRP34kFrcSA8Vk5h722VdZI +dbM3MRqdMYEmSPVgQab7BqD+Rdc7ibJyMdWOy9M1Ck4CJOWcuYrSL3xtjgxLjF7A +/YQ/7gaQtJWuXk06PhpmbD8i4ASlDWBgtb9KNGzZzpKo+hmTuljX+9R8foLDADPx +bR+K2M5zV3EaRwhqfr0U8wtZfdlzng50au58IJG+BSPg6sHRHs9mpJSnE9jF613d +zLPFve2b9q+mEFk1w33aJlEY79fseGf/w+Nq1/NXOmMn5e3VU56e/Yg33gyhG8gH +9wjXBFMXylwJe27nIQsvPxziNMA7iyinxrrzvKNCtwz4JuTw0vY7+XmXxmRB29H7 +8fZjf8F5lrLtEE0jZSHuQ6lW4AKM6mP+dUsv2R6lAjHr1rbznQ+kUyQF0mdq72rP +vxi39tnvqy1/HHWAL0JSY9tVN0nADrKLfBEO1DBQRXzOgaeTM2WoYJkgGmHeiVH9 +NeeyPXEkFqWd0sjIJB6j/2JEHV7Vm/4z8sqo5UyaplFO9xWaMYOXL6U5fcnM2yRv +oSftqRV/kUYqMSlA6OR/yqFkCT4fxNdA98MHODtyfTCESd94ZsWBbLJDDeXvinF5 +gWt225PCDrzn+kSBomNE +=I6Hc +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 1f0f351..2fb2e78 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon May 13 06:03:02 UTC 2019 - pgajdos@suse.com + +- version update to 7.0.8.44 + * Fixed a number of issues (reference + https://imagemagick.org/discourse-server/viewforum.php?f=3). + * Fixed a number of issues (reference + https://github.com/ImageMagick/ImageMagick/issues). + ------------------------------------------------------------------- Mon Apr 29 13:42:37 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 864df3d..0c83685 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 42 +%define mfr_revision 44 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 From 6acc0bf2fd4da1dc743aef8e524326e9803950a251dffac0d441f7e20720afe7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 27 May 2019 07:46:17 +0000 Subject: [PATCH 2/6] - version update to 7.0.8.46 * Return HEIC images in the sRGB colorspace. * Fix image signatures to ensure they are Q-depth invariant (reference https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=35970). * Fixed a number of issues (reference https://imagemagick.org/discourse-server/viewforum.php?f=3). * Fixed a number of issues (reference https://github.com/ImageMagick/ImageMagick/issues). OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=438 --- ImageMagick-7.0.8-44.tar.bz2 | 3 --- ImageMagick-7.0.8-44.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.8-46.tar.bz2 | 3 +++ ImageMagick-7.0.8-46.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick.changes | 12 ++++++++++++ ImageMagick.spec | 2 +- 6 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.0.8-44.tar.bz2 delete mode 100644 ImageMagick-7.0.8-44.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-46.tar.bz2 create mode 100644 ImageMagick-7.0.8-46.tar.bz2.asc diff --git a/ImageMagick-7.0.8-44.tar.bz2 b/ImageMagick-7.0.8-44.tar.bz2 deleted file mode 100644 index 46754f1..0000000 --- a/ImageMagick-7.0.8-44.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3e92c3130a9bad7e6e738407a8e67bb2af1e0030d09cc7974df0b22318d34c8 -size 11485421 diff --git a/ImageMagick-7.0.8-44.tar.bz2.asc b/ImageMagick-7.0.8-44.tar.bz2.asc deleted file mode 100644 index 839ada1..0000000 --- a/ImageMagick-7.0.8-44.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJczYI0AAoJEImrY9SCdzd6KbsQAKLOBz3L8Pw5Hw1JXcO1dFTU -G8atnaI2yE/o+8wH+P7j3+EZXIrtkp+n/ZpRvzf7SFRP34kFrcSA8Vk5h722VdZI -dbM3MRqdMYEmSPVgQab7BqD+Rdc7ibJyMdWOy9M1Ck4CJOWcuYrSL3xtjgxLjF7A -/YQ/7gaQtJWuXk06PhpmbD8i4ASlDWBgtb9KNGzZzpKo+hmTuljX+9R8foLDADPx -bR+K2M5zV3EaRwhqfr0U8wtZfdlzng50au58IJG+BSPg6sHRHs9mpJSnE9jF613d -zLPFve2b9q+mEFk1w33aJlEY79fseGf/w+Nq1/NXOmMn5e3VU56e/Yg33gyhG8gH -9wjXBFMXylwJe27nIQsvPxziNMA7iyinxrrzvKNCtwz4JuTw0vY7+XmXxmRB29H7 -8fZjf8F5lrLtEE0jZSHuQ6lW4AKM6mP+dUsv2R6lAjHr1rbznQ+kUyQF0mdq72rP -vxi39tnvqy1/HHWAL0JSY9tVN0nADrKLfBEO1DBQRXzOgaeTM2WoYJkgGmHeiVH9 -NeeyPXEkFqWd0sjIJB6j/2JEHV7Vm/4z8sqo5UyaplFO9xWaMYOXL6U5fcnM2yRv -oSftqRV/kUYqMSlA6OR/yqFkCT4fxNdA98MHODtyfTCESd94ZsWBbLJDDeXvinF5 -gWt225PCDrzn+kSBomNE -=I6Hc ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-46.tar.bz2 b/ImageMagick-7.0.8-46.tar.bz2 new file mode 100644 index 0000000..354861f --- /dev/null +++ b/ImageMagick-7.0.8-46.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f74fd9415f56fc7eed6d0c823dc16642b288dea404e7b7447c10dd3ce15673e0 +size 11508053 diff --git a/ImageMagick-7.0.8-46.tar.bz2.asc b/ImageMagick-7.0.8-46.tar.bz2.asc new file mode 100644 index 0000000..940d8fe --- /dev/null +++ b/ImageMagick-7.0.8-46.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJc4V/aAAoJEImrY9SCdzd6bl8QAJQpPHkSQELDGPqOhof/q4qs +lIbl7xWE4Mq0g3HZUMpXCh+oXKFNh9iGs9DqdxddOvZTdE4G+tdzAodELnv29G6s +EZBRpJ2tUH51IOsNFtG3768GYezQaFLEG5/+WUoV0RswSldhtpIaz8Cto1vZoa/6 ++m/4cLCsPluZlFJBfHKVs+xYPudoPlO9/4wrMEt1ZQ6kO5JMo/LWEdlbw+F7kXAB +a4QlQR2c5/Sq4wHp79XbhiL2HyL7haOYdsz/Ir8BtT61jeCqP516ijuSkfv7bZq7 +DD2BBWcr1xVVZWkSXjx6LLzNRmDxx2lkL7FMd8vzYT5er4eBtC87vZvcvgpukSp2 +I3Q45Agz2+YLRThet19PEVBFIsToLvjwLVuMFPNOgau5otlvWDDT6ffADXkp+hn0 +ed6k8tzF0np2cP78hcQZFrKemaYDdEzyt4jyKPJqK2lBK97s4hY9onvgVSdXlEuP ++5niTgpDdT3AhDNNI/1wRRL+HzuNKXPmXdu9cxHQ4hpPKE1Kuy1Kq1zWb5LhTYh2 +LwUtVGUq9lgJl72NC56x65FxqCf43BPH+Nhnpbt+cf69B/A124HceYtIR1C3Nhyw +jSCl1y5zqUnSNvdqYj+aN2PQ90aEKhm2Kdn6xP1djT20BfpTnHyw4x/VB/Xu7avj +Nuid2+8SJqtKdWAnbow4 +=9/Ye +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 2fb2e78..fdce65b 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 27 07:44:53 UTC 2019 - pgajdos@suse.com + +- version update to 7.0.8.46 + * Return HEIC images in the sRGB colorspace. + * Fix image signatures to ensure they are Q-depth invariant (reference + https://imagemagick.org/discourse-server/viewtopic.php?f=1&t=35970). + * Fixed a number of issues (reference + https://imagemagick.org/discourse-server/viewforum.php?f=3). + * Fixed a number of issues (reference + https://github.com/ImageMagick/ImageMagick/issues). + ------------------------------------------------------------------- Mon May 13 06:03:02 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 0c83685..bd2b784 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 44 +%define mfr_revision 46 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 From 795afaeae052d311df89dd4fbe9aef3c2998b2728c53b608cb7bd60fe91e6c89 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 28 May 2019 08:39:03 +0000 Subject: [PATCH 3/6] - version update to 7.0.8.47 - modified patches disable also PCL [bsc#1136183] % ImageMagick-configuration-SUSE.patch - added patches https://github.com/ImageMagick/ImageMagick/issues/1580 + ImageMagick-montage.t-failing.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=439 --- ImageMagick-7.0.8-46.tar.bz2 | 3 --- ImageMagick-7.0.8-46.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.8-47.tar.bz2 | 3 +++ ImageMagick-7.0.8-47.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick-configuration-SUSE.patch | 3 ++- ImageMagick-montage.t-failing.patch | 22 ++++++++++++++++++++++ ImageMagick.changes | 11 +++++++++++ ImageMagick.spec | 5 ++++- 8 files changed, 59 insertions(+), 22 deletions(-) delete mode 100644 ImageMagick-7.0.8-46.tar.bz2 delete mode 100644 ImageMagick-7.0.8-46.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-47.tar.bz2 create mode 100644 ImageMagick-7.0.8-47.tar.bz2.asc create mode 100644 ImageMagick-montage.t-failing.patch diff --git a/ImageMagick-7.0.8-46.tar.bz2 b/ImageMagick-7.0.8-46.tar.bz2 deleted file mode 100644 index 354861f..0000000 --- a/ImageMagick-7.0.8-46.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f74fd9415f56fc7eed6d0c823dc16642b288dea404e7b7447c10dd3ce15673e0 -size 11508053 diff --git a/ImageMagick-7.0.8-46.tar.bz2.asc b/ImageMagick-7.0.8-46.tar.bz2.asc deleted file mode 100644 index 940d8fe..0000000 --- a/ImageMagick-7.0.8-46.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJc4V/aAAoJEImrY9SCdzd6bl8QAJQpPHkSQELDGPqOhof/q4qs -lIbl7xWE4Mq0g3HZUMpXCh+oXKFNh9iGs9DqdxddOvZTdE4G+tdzAodELnv29G6s -EZBRpJ2tUH51IOsNFtG3768GYezQaFLEG5/+WUoV0RswSldhtpIaz8Cto1vZoa/6 -+m/4cLCsPluZlFJBfHKVs+xYPudoPlO9/4wrMEt1ZQ6kO5JMo/LWEdlbw+F7kXAB -a4QlQR2c5/Sq4wHp79XbhiL2HyL7haOYdsz/Ir8BtT61jeCqP516ijuSkfv7bZq7 -DD2BBWcr1xVVZWkSXjx6LLzNRmDxx2lkL7FMd8vzYT5er4eBtC87vZvcvgpukSp2 -I3Q45Agz2+YLRThet19PEVBFIsToLvjwLVuMFPNOgau5otlvWDDT6ffADXkp+hn0 -ed6k8tzF0np2cP78hcQZFrKemaYDdEzyt4jyKPJqK2lBK97s4hY9onvgVSdXlEuP -+5niTgpDdT3AhDNNI/1wRRL+HzuNKXPmXdu9cxHQ4hpPKE1Kuy1Kq1zWb5LhTYh2 -LwUtVGUq9lgJl72NC56x65FxqCf43BPH+Nhnpbt+cf69B/A124HceYtIR1C3Nhyw -jSCl1y5zqUnSNvdqYj+aN2PQ90aEKhm2Kdn6xP1djT20BfpTnHyw4x/VB/Xu7avj -Nuid2+8SJqtKdWAnbow4 -=9/Ye ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-47.tar.bz2 b/ImageMagick-7.0.8-47.tar.bz2 new file mode 100644 index 0000000..dd87433 --- /dev/null +++ b/ImageMagick-7.0.8-47.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c665276e69e2227d257cdb352d69ed0fd160b5592ec854a9c4b335a71de3384 +size 11510841 diff --git a/ImageMagick-7.0.8-47.tar.bz2.asc b/ImageMagick-7.0.8-47.tar.bz2.asc new file mode 100644 index 0000000..57da405 --- /dev/null +++ b/ImageMagick-7.0.8-47.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJc7BFGAAoJEImrY9SCdzd6FvAP/1rP6yqsCNDqjfkOhnQhQZIk +pYxo6NW84X3wKOxZoaQxjGsjvi/7KotCM9B2uopnf7vHCsSNic60r3qTz3MKHd6Q +Qc+nwsc3vlPQJlhykW7rSCq8Jw7ZyCzWtdc2GRumH2DsmpaKCfIDwLPN7+d+4wIM +rDjGY0HZNE5Cnlh4SzzhJA0FhrakW5/ifrLGY/+0chr1pIXv9mEGoQhhba8Qr0Cd +Ay/hnQNLfzI66hpCuPYvY46EnHa3q5SY9qPVaNWthXA0uEGyAErjR62v+fXW1dhr ++EvM4LyzESD4WvyWD25K+yQWKcIfUxfaEgaaSTvOlgBYOfm19z4+0Jh8Az5LzbWs +baV1k7BD5xeP23TanMfsVALV9QSsNLFuGJSxLyLPnY2EFVtD8xN22eS9rcwLPDqC +ivuvlcWTQ1iwp3UX5OPpvEZjAE3RjpP3k3eKsc3CqDQizcEQ2qdvNQOjRE1ZFQrc +87ZreEb5ZodDkM0S6Lp9rM85Ay+Fp9gUqKM7SETnrpNg/OMBSP4xgkuRnmppU3L7 +w4+80ONoTG+imQNtFsTC6GQSNGidJqtmc5QQTyEA8a38kkRj5lHxv6jVN8Ul2q3T +2dJ2HXYsTOXvvabmBI06nTOZObp1tRA1YWNsNP1VWx+jWrE3iYIG5f6XyczQCemM +JkrZxLhRJmv/kDFz9io7 +=vGRE +-----END PGP SIGNATURE----- diff --git a/ImageMagick-configuration-SUSE.patch b/ImageMagick-configuration-SUSE.patch index 6f38e2a..430724f 100644 --- a/ImageMagick-configuration-SUSE.patch +++ b/ImageMagick-configuration-SUSE.patch @@ -2,7 +2,7 @@ Index: policy.xml =================================================================== --- policy.xml 2018-10-01 13:13:51.008702622 +0200 +++ policy.xml 2018-10-01 13:22:06.174722426 +0200 -@@ -75,4 +75,21 @@ +@@ -75,4 +75,22 @@ @@ -23,4 +23,5 @@ Index: policy.xml + + + ++ diff --git a/ImageMagick-montage.t-failing.patch b/ImageMagick-montage.t-failing.patch new file mode 100644 index 0000000..646a4ac --- /dev/null +++ b/ImageMagick-montage.t-failing.patch @@ -0,0 +1,22 @@ +Index: ImageMagick-7.0.8-47/PerlMagick/t/montage.t +=================================================================== +--- ImageMagick-7.0.8-47.orig/PerlMagick/t/montage.t 2019-05-27 01:14:49.000000000 +0200 ++++ ImageMagick-7.0.8-47/PerlMagick/t/montage.t 2019-05-28 10:27:31.193023910 +0200 +@@ -131,7 +131,7 @@ testMontage( q/bordercolor=>'blue', matt + testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', + borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/, +- 'ff43a8c5dd980438c10436a71b47afc538ae3839ba57251768fa07add1229d8a'); ++ 'ac3684de4138476dfb1f218f66f9d55df7bb40da8104a5248f765b7e448bcc51'); + + # + # 13) Test Framed Montage with drop-shadows and background texture +@@ -140,7 +140,7 @@ testMontage( q/bordercolor=>'blue', matt + testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', + borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/, +- '0de019cb1e17fb9d3e60e6ae3931c6d384859613c3fc930cfef46720cae8237'); ++ 'c570ea56a9635799ff29d3410455c7a15a9c3acca23b9d97a79f257eeb0bf92e'); + + # + # 14) Test Un-bordered, Un-framed Montage diff --git a/ImageMagick.changes b/ImageMagick.changes index fdce65b..c22bebd 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 28 08:36:54 UTC 2019 - pgajdos@suse.com + +- version update to 7.0.8.47 +- modified patches + disable also PCL [bsc#1136183] + % ImageMagick-configuration-SUSE.patch +- added patches + https://github.com/ImageMagick/ImageMagick/issues/1580 + + ImageMagick-montage.t-failing.patch + ------------------------------------------------------------------- Mon May 27 07:44:53 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index bd2b784..24d7d21 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 46 +%define mfr_revision 47 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -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/issues/1580 +Patch4: ImageMagick-montage.t-failing.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 540ca51ec19115c7a40ba4d16ca090000f6420bf5d5823796b3e710b2db0a3da Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 28 May 2019 08:39:51 +0000 Subject: [PATCH 4/6] * Support 16 and 32 bit tiled float TIFF images. * Convolve morphology alpha channel fix (reference https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36086). * Text improvements to the internal SVG renderer. OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=440 --- ImageMagick.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index c22bebd..a780d5f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -2,6 +2,10 @@ Tue May 28 08:36:54 UTC 2019 - pgajdos@suse.com - version update to 7.0.8.47 + * Support 16 and 32 bit tiled float TIFF images. + * Convolve morphology alpha channel fix (reference + https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36086). + * Text improvements to the internal SVG renderer. - modified patches disable also PCL [bsc#1136183] % ImageMagick-configuration-SUSE.patch From 39c91ba8f7b50113e007c6cbdb0e3e1c33cdba3419dfedd46f777f010459ea2c Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 29 May 2019 12:12:53 +0000 Subject: [PATCH 5/6] - disable failing averageImages test for i586 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=441 --- ImageMagick.changes | 1 + ImageMagick.spec | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ImageMagick.changes b/ImageMagick.changes index a780d5f..ef3d8fb 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -6,6 +6,7 @@ Tue May 28 08:36:54 UTC 2019 - pgajdos@suse.com * Convolve morphology alpha channel fix (reference https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=36086). * Text improvements to the internal SVG renderer. +- disable failing averageImages test for i586 - modified patches disable also PCL [bsc#1136183] % ImageMagick-configuration-SUSE.patch diff --git a/ImageMagick.spec b/ImageMagick.spec index 24d7d21..f379329 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -409,8 +409,11 @@ chmod -x PerlMagick/demo/*.pl exit 0 %endif %ifarch i586 +# do not report test issues related to 32-bit architectures upstream, +# they do not want to dedicate any time to fix them: # https://github.com/ImageMagick/ImageMagick/issues/1215 rm PerlMagick/t/montage.t +sed -i -e 's:averageImages ::' -e 's:1..13:1..12:' Magick++/tests/tests.tap %endif make %{?_smp_mflags} check export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs From 7d969289d086e2df34c41d6bb80b74d92184f064d0bcc1a0a938e271c3ef5da0 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 3 Jun 2019 09:19:38 +0000 Subject: [PATCH 6/6] - version update to 7.0.8.48 * Fix transient convolution bug. - deleted patches - ImageMagick-montage.t-failing.patch (upstreamed) OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=442 --- ImageMagick-7.0.8-47.tar.bz2 | 3 --- ImageMagick-7.0.8-47.tar.bz2.asc | 17 ----------------- ImageMagick-7.0.8-48.tar.bz2 | 3 +++ ImageMagick-7.0.8-48.tar.bz2.asc | 17 +++++++++++++++++ ImageMagick-montage.t-failing.patch | 22 ---------------------- ImageMagick.changes | 8 ++++++++ ImageMagick.spec | 5 +---- 7 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 ImageMagick-7.0.8-47.tar.bz2 delete mode 100644 ImageMagick-7.0.8-47.tar.bz2.asc create mode 100644 ImageMagick-7.0.8-48.tar.bz2 create mode 100644 ImageMagick-7.0.8-48.tar.bz2.asc delete mode 100644 ImageMagick-montage.t-failing.patch diff --git a/ImageMagick-7.0.8-47.tar.bz2 b/ImageMagick-7.0.8-47.tar.bz2 deleted file mode 100644 index dd87433..0000000 --- a/ImageMagick-7.0.8-47.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c665276e69e2227d257cdb352d69ed0fd160b5592ec854a9c4b335a71de3384 -size 11510841 diff --git a/ImageMagick-7.0.8-47.tar.bz2.asc b/ImageMagick-7.0.8-47.tar.bz2.asc deleted file mode 100644 index 57da405..0000000 --- a/ImageMagick-7.0.8-47.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJc7BFGAAoJEImrY9SCdzd6FvAP/1rP6yqsCNDqjfkOhnQhQZIk -pYxo6NW84X3wKOxZoaQxjGsjvi/7KotCM9B2uopnf7vHCsSNic60r3qTz3MKHd6Q -Qc+nwsc3vlPQJlhykW7rSCq8Jw7ZyCzWtdc2GRumH2DsmpaKCfIDwLPN7+d+4wIM -rDjGY0HZNE5Cnlh4SzzhJA0FhrakW5/ifrLGY/+0chr1pIXv9mEGoQhhba8Qr0Cd -Ay/hnQNLfzI66hpCuPYvY46EnHa3q5SY9qPVaNWthXA0uEGyAErjR62v+fXW1dhr -+EvM4LyzESD4WvyWD25K+yQWKcIfUxfaEgaaSTvOlgBYOfm19z4+0Jh8Az5LzbWs -baV1k7BD5xeP23TanMfsVALV9QSsNLFuGJSxLyLPnY2EFVtD8xN22eS9rcwLPDqC -ivuvlcWTQ1iwp3UX5OPpvEZjAE3RjpP3k3eKsc3CqDQizcEQ2qdvNQOjRE1ZFQrc -87ZreEb5ZodDkM0S6Lp9rM85Ay+Fp9gUqKM7SETnrpNg/OMBSP4xgkuRnmppU3L7 -w4+80ONoTG+imQNtFsTC6GQSNGidJqtmc5QQTyEA8a38kkRj5lHxv6jVN8Ul2q3T -2dJ2HXYsTOXvvabmBI06nTOZObp1tRA1YWNsNP1VWx+jWrE3iYIG5f6XyczQCemM -JkrZxLhRJmv/kDFz9io7 -=vGRE ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-48.tar.bz2 b/ImageMagick-7.0.8-48.tar.bz2 new file mode 100644 index 0000000..5b79e20 --- /dev/null +++ b/ImageMagick-7.0.8-48.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8c470a204778fba56e9c7a95e8f220a1208f0d96535872dc7820a9993989b35 +size 11511175 diff --git a/ImageMagick-7.0.8-48.tar.bz2.asc b/ImageMagick-7.0.8-48.tar.bz2.asc new file mode 100644 index 0000000..00d5e24 --- /dev/null +++ b/ImageMagick-7.0.8-48.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJc8uSHAAoJEImrY9SCdzd6XTUQAI4d0dyB1DiWItffl3RvLa4x +OGnURNKpfJ2gYLE0aQepTq1UhtOj6hdKbBTk6wtDXv+CNmX0MN/xU+EwTp811gcr +bwNWVz8jn50eh/hymLI3HirQbT5Kk4d8AnEoxvbD6eeaDe+T/5sZRc8IcFsLIe9f +kCQitonBd24mjjzalCEL94lKeGYYuhs5jUMkhFMWxwuh5CWSccRsbDcUCvOedW/I +titwTrS1R5zLfwwfXm1N0oX+BU4wN85Kuiaa0Ay2cdiHTlS2Nd9dyjhSIevsdCyg +EEVXjxSk5rUoNsa/LE1bsg8Z1Be1xgf6B82voWn/c5lfkZLvIrzTHzwmp6dyCsq8 +zIh4i8oRUt3ri3u//9QGPqwVPXo0TqUguAcPTcDKks9Jsop9IxN9OMsWQCU4JTM9 +/g7IDDSIux419CvQb6q2Eql7ST18A9cDjhMjyoaAPh8UEPaw0jlUBKzk8vrj4suA +v+CM26NyroUSl+9dHEnWp9JtJcJwnaUvv+gysqkvvsEVFvDNOPMbZc5drkK0jCxR +n+hxvWaM3WZtix838oMdJRdhy7nqOnMXV5vTYE69RLLoIpO+8EA+KBrN8BLSNf9o +79wWUmW4V9st0WZcXioagmdQVXzKRXhcxuAKx3nYxBqQ4Fh/kqSzUQ4gJppeQI9y +KZy5TwYybShzEyLSZ57k +=6BUv +-----END PGP SIGNATURE----- diff --git a/ImageMagick-montage.t-failing.patch b/ImageMagick-montage.t-failing.patch deleted file mode 100644 index 646a4ac..0000000 --- a/ImageMagick-montage.t-failing.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: ImageMagick-7.0.8-47/PerlMagick/t/montage.t -=================================================================== ---- ImageMagick-7.0.8-47.orig/PerlMagick/t/montage.t 2019-05-27 01:14:49.000000000 +0200 -+++ ImageMagick-7.0.8-47/PerlMagick/t/montage.t 2019-05-28 10:27:31.193023910 +0200 -@@ -131,7 +131,7 @@ testMontage( q/bordercolor=>'blue', matt - testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, - q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', - borderwidth=>'0', gravity=>'Center', shadow=>'True',background=>'gray'/, -- 'ff43a8c5dd980438c10436a71b47afc538ae3839ba57251768fa07add1229d8a'); -+ 'ac3684de4138476dfb1f218f66f9d55df7bb40da8104a5248f765b7e448bcc51'); - - # - # 13) Test Framed Montage with drop-shadows and background texture -@@ -140,7 +140,7 @@ testMontage( q/bordercolor=>'blue', matt - testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, - q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+6+6>', frame=>'8x10', - borderwidth=>'0', gravity=>'Center', shadow=>'True', texture=>'granite:'/, -- '0de019cb1e17fb9d3e60e6ae3931c6d384859613c3fc930cfef46720cae8237'); -+ 'c570ea56a9635799ff29d3410455c7a15a9c3acca23b9d97a79f257eeb0bf92e'); - - # - # 14) Test Un-bordered, Un-framed Montage diff --git a/ImageMagick.changes b/ImageMagick.changes index ef3d8fb..df739df 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 3 09:18:42 UTC 2019 - pgajdos@suse.com + +- version update to 7.0.8.48 + * Fix transient convolution bug. +- deleted patches + - ImageMagick-montage.t-failing.patch (upstreamed) + ------------------------------------------------------------------- Tue May 28 08:36:54 UTC 2019 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index f379329..0e92d44 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.0.8 -%define mfr_revision 47 +%define mfr_revision 48 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -48,8 +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/issues/1580 -Patch4: ImageMagick-montage.t-failing.patch #%%endif BuildRequires: chrpath BuildRequires: fdupes @@ -335,7 +333,6 @@ preserved. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif -%patch4 -p1 %build # bsc#1088463