From 81b064252e2a05ae62f2d8d486dd71f0661130b0e7d6ba6bc3a3efa9eeb4e7a6 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 24 Jun 2024 07:35:50 +0000 Subject: [PATCH] Accepting request 1182933 from home:adkorte:branches:graphics - version update to 7.1.1.34 * Bump azure/trusted-signing-action from 0.3.18 to 0.3.19 in #7348 * Fix a typo in convert deprecation warning in #7383 * Bump azure/trusted-signing-action from 0.3.19 to 0.3.20 in #7388 * Updated FontConfig query to include font index, fixing (#7374) in #7409 - removed patch (upstreamed) - ImageMagick-update-image-signature.patch OBS-URL: https://build.opensuse.org/request/show/1182933 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=733 --- ImageMagick-7.1.1-33.tar.xz | 3 --- ImageMagick-7.1.1-33.tar.xz.asc | 16 ------------ ImageMagick-7.1.1-34.tar.xz | 3 +++ ImageMagick-7.1.1-34.tar.xz.asc | 16 ++++++++++++ ImageMagick-update-image-signature.patch | 31 ------------------------ ImageMagick.changes | 11 +++++++++ ImageMagick.spec | 5 +--- 7 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 ImageMagick-7.1.1-33.tar.xz delete mode 100644 ImageMagick-7.1.1-33.tar.xz.asc create mode 100644 ImageMagick-7.1.1-34.tar.xz create mode 100644 ImageMagick-7.1.1-34.tar.xz.asc delete mode 100644 ImageMagick-update-image-signature.patch diff --git a/ImageMagick-7.1.1-33.tar.xz b/ImageMagick-7.1.1-33.tar.xz deleted file mode 100644 index 816905e..0000000 --- a/ImageMagick-7.1.1-33.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c021effec02d18df2e55fbbe68b10b95366c1869143b08d7e8e16f471a0ddea1 -size 10772728 diff --git a/ImageMagick-7.1.1-33.tar.xz.asc b/ImageMagick-7.1.1-33.tar.xz.asc deleted file mode 100644 index 52e79eb..0000000 --- a/ImageMagick-7.1.1-33.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmZR7KwACgkQiatj1IJ3 -N3prPg//e0Tk1DKAoTyuHD8mP5LwFXRN2wT0Id+WdyMQnVjt0OTTydHRrwqoK8iH -8GujqB7XEFw5WtfndPCNbDjzaoYClUj5C8lCZrwjgU0M10eG2x0vxTgJiU9rIS/n -pCcMZ05lSA3meszYYkbBPLl7Nwr7nd2NGw+5MfJMvBUeQleEzixwGAXvVrVOn7Hf -SrrgPjUw8PbMCBBGmmrP5AYIuiX2HWVmB2EYLZcF7CgCsyTEh6hcq0N/azQvK5FP -8iyqKqzbawzbMd653T9tCz2ufKDAs+3X7ezkZIzODEtx87SaAEklkTvYU8owSDDP -M+rgDPIyLxhEIgd+YkBKsOhmF2H4PxjbENSnA5ZlqmW4cbbBS2rRR2QteaMLazPG -eRsEqTV//4X+wSc/AnmXY+frJ17ngkBeWzdpG2oJJk9QRSwd3vNPdJLeLuPKclTq -RLJIvXHrN88DLQrS9Q3gJfMoW1d63/bi37NX+99yoM6EvemwRM3OG/iK0C2Huk4r -XZLb0qF9h82urMlhWOyz0HcxWBFX/3YrWBvpPzXuETw0rNLNBhPTMeYI+ezUEqp/ -O2lbn/0Zq2dywMiWSWSmaRwvrkgrMV1tslUgCH3AeJG073GlNVnskWKBGprTWyuT -pWQSRopSyFqdT02WQ9hgIQqLwNlHuC9rzrZIJOwg1XyfWMEpNMY= -=dcOX ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-34.tar.xz b/ImageMagick-7.1.1-34.tar.xz new file mode 100644 index 0000000..7720565 --- /dev/null +++ b/ImageMagick-7.1.1-34.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abab52de4b8f0356c05ddee3d3398c147fd9f6c099760f2cb15f3b8168a776c7 +size 10777660 diff --git a/ImageMagick-7.1.1-34.tar.xz.asc b/ImageMagick-7.1.1-34.tar.xz.asc new file mode 100644 index 0000000..d308370 --- /dev/null +++ b/ImageMagick-7.1.1-34.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmZ4UQcACgkQiatj1IJ3 +N3pPUw//Ycx/2zrxvBxm5Ydwi6d5wM01U/JH9pKvic9hK1vPsO154IdV2y0k79fx +rmG9Y6mXmTgrXFzhCwpSh1p4wu1A5IEyJBH3gN1waGo9/+Nsi9hwCeI1aAUZLf3N +/+DJ1vvIQRYKBRTuHoJtsWJ176r60seY3+Bee8xA5ISfbjhnhkE+QrNZ8WV/up6T +3UB0kXCra0SdgUGfM1PpPEzftAga3Ew6TFwOfH+oEYcndDlrtasIfdQvtLckyZzQ +qzHhMjqM8NtSva4id2o4mwM021CpxKYa9yxP94a3PDFSWq6hQBkiKvXsp6olrWcQ +Ii9/udefJm+w99EbdREfCbYHaoiPD1f4VCtgr2tiNpYILQfuGOowCjmt+PQGs6hp +yOdI8FNseFc+3UTG5fDd/JTdvYp+zwNrtrZN/EFgS0fZyqgbF5E17bEiWAVsGLyv +zATLkgwnGRrNkfL7jvq28wposYWueZEATENqLEHrawd5WpJOUehgvrHn64wszP2i +AFh/DgK9hQqfRIU7SA8wC+FsaqG82cZuuuNJRFAEf/gJKtaouUh+vUhZeC4J78cz +ABTn/nJi/hVLX89TocGs7WXdWCVwqKZ4HyjZPoP6Ap6HWQoo17FYY3licKYCtWEp +ztPMmaNgnYD0vU+COK3Z8e0xNgXonL1AX+RDltTcOpYEmXyIMcI= +=zcjb +-----END PGP SIGNATURE----- diff --git a/ImageMagick-update-image-signature.patch b/ImageMagick-update-image-signature.patch deleted file mode 100644 index 6d1fb50..0000000 --- a/ImageMagick-update-image-signature.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ea1ecf5d8b9b457164d94c964dbf33e1ac78c00e Mon Sep 17 00:00:00 2001 -From: Cristy -Date: Sun, 26 May 2024 10:28:44 -0400 -Subject: [PATCH] update image signature - (https://github.com/ImageMagick/ImageMagick/issues/7344) - ---- - PerlMagick/t/write.t | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t -index 8a1baf56a7a..dd71f2e3d57 100644 ---- a/PerlMagick/t/write.t -+++ b/PerlMagick/t/write.t -@@ -36,14 +36,14 @@ print("Microsoft Windows bitmap image file ...\n"); - testReadWrite( 'BMP:input.bmp', - 'BMP:output.bmp', - q//, -- 'd7324c919f04f4c118da68061a5dbb3f07ebab76b471ecfb0ac822453f677983'); -+ 'a0c5566d67ad974ba31f6f5d9ef1661b2613b60ac934f2339a2efafed1ecb68b'); - - print("Microsoft Windows 24-bit bitmap image file ...\n"); - ++$test; - testReadWrite( 'BMP:input.bmp24', - 'BMP:output.bmp24', - q//, -- 'fb6fc68beb3b1001c5ebaa671c8ac8fddea06995027127765ff508f77723cc52'); -+ '74136c90d3e699ea5bcbf4aa733aff0dc822b6af72fce00f0c7647bcb0d49f66'); - - print("ZSoft IBM PC multi-page Paintbrush file ...\n"); - ++$test; diff --git a/ImageMagick.changes b/ImageMagick.changes index de51993..236473f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Jun 23 20:52:45 UTC 2024 - Arjen de Korte + +- version update to 7.1.1.34 + * Bump azure/trusted-signing-action from 0.3.18 to 0.3.19 in #7348 + * Fix a typo in convert deprecation warning in #7383 + * Bump azure/trusted-signing-action from 0.3.19 to 0.3.20 in #7388 + * Updated FontConfig query to include font index, fixing (#7374) in #7409 +- removed patch (upstreamed) + - ImageMagick-update-image-signature.patch + ------------------------------------------------------------------- Sat May 25 21:11:21 UTC 2024 - Arjen de Korte diff --git a/ImageMagick.spec b/ImageMagick.spec index b2ec0b3..9393b4e 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 33 +%define mfr_revision 34 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -55,8 +55,6 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch #%%ifarch s390x Patch5: ImageMagick-s390x-disable-tests.patch #%%endif -# PATCH-FIX-UPSTREAM https://github.com/ImageMagick/ImageMagick/issues/7344 -Patch6: ImageMagick-update-image-signature.patch BuildRequires: chrpath BuildRequires: dejavu-fonts BuildRequires: fdupes @@ -358,7 +356,6 @@ policy plus disable few other coders for reading and/or writing. %ifarch s390x %patch -P 5 -p1 %endif -%patch -P 6 -p1 %build # bsc#1088463