From a5c0df860873fcfbe5d3638b9fe30a4d3135944103863001a39abfae6cc1d170 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 22 Apr 2024 08:33:26 +0000 Subject: [PATCH] checkin OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=725 --- ImageMagick-7.1.1-30.tar.xz | 3 --- ImageMagick-7.1.1-30.tar.xz.asc | 16 ---------------- ImageMagick-7.1.1-31.tar.xz | 3 +++ ImageMagick-7.1.1-31.tar.xz.asc | 16 ++++++++++++++++ ...eMagick-library-installable-in-parallel.patch | 8 ++++---- ImageMagick-wmflite-detection.patch | 10 ---------- ImageMagick.changes | 9 +++++++++ ImageMagick.spec | 9 +++------ 8 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 ImageMagick-7.1.1-30.tar.xz delete mode 100644 ImageMagick-7.1.1-30.tar.xz.asc create mode 100644 ImageMagick-7.1.1-31.tar.xz create mode 100644 ImageMagick-7.1.1-31.tar.xz.asc delete mode 100644 ImageMagick-wmflite-detection.patch diff --git a/ImageMagick-7.1.1-30.tar.xz b/ImageMagick-7.1.1-30.tar.xz deleted file mode 100644 index 54201f0..0000000 --- a/ImageMagick-7.1.1-30.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec192780d09da7d7b1e7a374a19f97d69cceb4e5e83057515cd595eda233a891 -size 10791844 diff --git a/ImageMagick-7.1.1-30.tar.xz.asc b/ImageMagick-7.1.1-30.tar.xz.asc deleted file mode 100644 index 290af93..0000000 --- a/ImageMagick-7.1.1-30.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmYTOF8ACgkQiatj1IJ3 -N3re6Q//dUxUzhp6TAwaKtE+hIdDNJ/a/8X5te45hxEPa4h/SzRu9VVpahLytE6n -cHje+HH7fCQjP8P0eFRQTmHNDZNLHJFHi61JaAlJjIsu/VdQWTG7Yeqh6EnRLQnj -13OKIhDD+dY+WmQTzhOn4+YrOsbsfUrg5HL4mAWGPVuTa5zol2sNY5WesRUTHKB1 -F9QtRQsON6Q3nBvMAF9zF4M4nCzxTVCPQbohj91II9vK7ciqVdFdsK/9/eXGx978 -GVlsivyjU56wITp8jfK24WlnZVh7yDHNBExeSA9sGoLddWKtXqFIGwxKF7YxmsPn -e6Y7uJZQcjuD2d703luAeGPCS+4bQrCUBY/HkB7sIkAbMdU33ijwVVPXSTP77jot -bvuuxz6G8o0+JkSUWOOl+9MIrfq2uJf8V4t6GDMa0rhs1dA+aVrbAB0HO6CXJFD1 -uXixX0byy68lKgqgDO7b22N5vYzY+uCDX0lsvfk4A9ucfodVWlEmNQJ/xedCgty1 -CycgrlmNfiZy0V6IjzYkyc3ZFPV1qEYLIDxbIC2qq9eTMHsrcofLy695/8SzEjcj -bPy0MV0zZg/1QVFQiw9HtgzuFjCfOt+3bzZaEamnW2P9RCaKF9cFByG7+Fl5JrSt -uTDItkRLHXjB1c8HVrkOSJzStOCpPeZOgeFkMbCOBHYj2B+QGrs= -=bfPU ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-31.tar.xz b/ImageMagick-7.1.1-31.tar.xz new file mode 100644 index 0000000..082f2cc --- /dev/null +++ b/ImageMagick-7.1.1-31.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e5c8db53dd90a0cfc5cc7ca6d34728ed86054b4bc86e9787902285fec1107a8 +size 10774256 diff --git a/ImageMagick-7.1.1-31.tar.xz.asc b/ImageMagick-7.1.1-31.tar.xz.asc new file mode 100644 index 0000000..efe9bda --- /dev/null +++ b/ImageMagick-7.1.1-31.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmYlLW4ACgkQiatj1IJ3 +N3quzhAAqUn/TDmMuqRKZfbh1ecTm/KJTUhlE7h85D9aoNrEiDP2688o/oiRTEKf ++NS7O4efJedHk4TaRwPAdDGA+KzLpy7mh0GmMnPtqhiKA8FcnH6603sUQfQAdF7B +9hEv3r4jAWFvY69XoLwg43371WqXEQ/U78N85zQXSDgeBd3RN+/ODhyb7fVglZSp +gz+CcGqeoyEVdPG1BxGK573G+p2C/9rLKqOFFgPTGrfDhjP+v2QBj7kpEXnJvftU +fHbGusy+KVZ8VDhb/HiGQKHyxutUmTJOWfCSOHNPVKUfMoytFv/a9QWJ3MSNwy9k +UIdo6ICVrLv1J0ZYKN282fwfn43H0Yg5ZbQFTn9ukYoZRXA5ve48oEQTlcGTUbm+ +7JTxbBIWgvdk3dcPlGmC7+15JLJug0ni1bMr/PTv/J7F09NnpljLoqUBNrRcANhP +MfQTMMPZDdFXGJOd297ChAaMGdaQqA6bjdVDLJV0H9hCdNUYj8sKxALmHU7jddU3 +2QA/HEhz/xxFc94BzPyWg4VZRsF4q6BEjgnk3AdkdEIzGDPCBZr4YVuhhBVdjl9G +Sdn5+PuFgaJ+goTjuNblTnvKbKb9fAtbGanafzZH/rKbgwf4F5qX1iNBPTDEf+N3 +CPxwBkNTLPPU8Zkke/LZPCz/20tOqdZ95dt7YFJOo8PTmzLo1Do= +=2/ZL +-----END PGP SIGNATURE----- diff --git a/ImageMagick-library-installable-in-parallel.patch b/ImageMagick-library-installable-in-parallel.patch index 0eb826b..9f0f9aa 100644 --- a/ImageMagick-library-installable-in-parallel.patch +++ b/ImageMagick-library-installable-in-parallel.patch @@ -1,8 +1,8 @@ -Index: ImageMagick-7.1.1-29/configure +Index: ImageMagick-7.1.1-31/configure =================================================================== ---- ImageMagick-7.1.1-29.orig/configure -+++ ImageMagick-7.1.1-29/configure -@@ -34803,7 +34803,9 @@ fi +--- ImageMagick-7.1.1-31.orig/configure ++++ ImageMagick-7.1.1-31/configure +@@ -35015,7 +35015,9 @@ fi # Subdirectory to place architecture-dependent configuration files diff --git a/ImageMagick-wmflite-detection.patch b/ImageMagick-wmflite-detection.patch deleted file mode 100644 index 07a6733..0000000 --- a/ImageMagick-wmflite-detection.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2915,6 +2915,7 @@ - else - AC_MSG_RESULT([no]) - fi -+ AC_LANG_POP([C++]) - fi - - AM_CONDITIONAL([UHDR_DELEGATE],[test "$have_uhdr" = 'yes']) diff --git a/ImageMagick.changes b/ImageMagick.changes index 07ec0f1..a65d87f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Mon Apr 22 08:01:53 UTC 2024 - pgajdos@suse.com + +- version update to 7.1.1.31 + * Convert big PDF documents is slow #7263 + * Update release.yml #7258 + * Update README.md #7245 + * uhdr.c: verify the availability of error message before accessing it #7229 +` +------------------------------------------------------------------- Mon Apr 15 10:19:07 UTC 2024 - pgajdos@suse.com - relax list-length resource limit, fixes build of python-Wand diff --git a/ImageMagick.spec b/ImageMagick.spec index 569aa3a..c3c576b 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 30 +%define mfr_revision 31 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -54,8 +54,6 @@ Patch4: ImageMagick-filter.t-disable-Contrast.patch #%%ifarch s390x Patch5: ImageMagick-s390x-disable-tests.patch #%%endif -# https://github.com/ImageMagick/ImageMagick/issues/7230 -Patch6: ImageMagick-wmflite-detection.patch BuildRequires: chrpath BuildRequires: dejavu-fonts BuildRequires: fdupes @@ -276,7 +274,6 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x %patch -P 5 -p1 %endif -%patch -P 6 -p1 %build # PATCH 6 @@ -409,7 +406,7 @@ fi %files %license LICENSE -%doc NEWS.txt +%doc README.md %doc config/policy-{open,limited,secure,websafe}.xml %{_bindir}/[^MW]* %{_mandir}/man1/* @@ -479,7 +476,7 @@ fi %files -n libMagick++-devel %doc Magick++/examples -%doc Magick++/NEWS Magick++/README Magick++/AUTHORS +%doc Magick++/AUTHORS %{_libdir}/libMagick++*.so %{_includedir}/ImageMagick*/Magick++.h %{_includedir}/ImageMagick*/Magick++