diff --git a/ImageMagick-7.1.0-37.tar.bz2 b/ImageMagick-7.1.0-37.tar.bz2 deleted file mode 100644 index d6bf967..0000000 --- a/ImageMagick-7.1.0-37.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de60727f1e5ace93ad5b25b77ad96ae357f3257f0961b7d54bd1ee8ce754b45f -size 12578789 diff --git a/ImageMagick-7.1.0-37.tar.bz2.asc b/ImageMagick-7.1.0-37.tar.bz2.asc deleted file mode 100644 index c5166dd..0000000 --- a/ImageMagick-7.1.0-37.tar.bz2.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmKcousACgkQiatj1IJ3 -N3oN4A//ZRLiCk6y/G0KIkaEh55CxC781lWR2qN6v79iQqKyZ3W5e8lYs+Y+2KmA -ndmjsg22ECYkmTX/kN7iMUm3FXInUDX1AjAZ/6LkYHUwFFbK/xx1xGiLT5v4mr71 -FfqK6qY8V6zGtNbL97TDsE8L9akE4Y2iUifQZUBzolReS6cbASuqrFx6Y8qD1FIH -jAWFeFkoOuhpN3r/FNjVKmGxo5tS1NPnI8PXrn4JpYqYCkrDsvUubY4OOGjAzwYB -AMxmSiOhgKSuzQsnZHnl1I3QlgrjPr+SJEOcZM/V6X1Hmt3vIGZDM2vJKwCS7qHj -Yd+Tpdo9Z5hhVMJ/H5fmI/V2VEmbPcaBnhXlEwf9ROMjl16qBJv5XDLMSAPQIDEb -ly3JMdC5azNf3hMzu2i26Z6B4dAwKyb+vz4CATKWZXbDTs+URoD+0nBmjlxVRd5y -Is+FXYYJVI/HrmEBd+udM2OsDzQOvcWROrqQFZShxGq0P3ljCV4ni2Nfgmd2AtLe -uIltIPdaUFd6eKgG3n1BUFy3gq+vzAjrrKe3j/TYVHAylhKbMPOOzla4tP5eG2Dh -RZl/l7OH38yd6yvCqLGpK4XpRqaJ3MIqJzve7DqKspgKPzLGJv2rGepLVay7U7Kq -4X4ERiv4c8XpAIq49X6k8PuH124mShwS3F2YKjKjgC7JpspJAPk= -=2lNl ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.0-43.tar.xz b/ImageMagick-7.1.0-43.tar.xz new file mode 100644 index 0000000..10a62cc --- /dev/null +++ b/ImageMagick-7.1.0-43.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d52aaed5496a193176c443052bac32536230b9a73a9b7bd5f0f794ddddafadd +size 10355700 diff --git a/ImageMagick-7.1.0-43.tar.xz.asc b/ImageMagick-7.1.0-43.tar.xz.asc new file mode 100644 index 0000000..132e6f3 --- /dev/null +++ b/ImageMagick-7.1.0-43.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmLJ7DkACgkQiatj1IJ3 +N3pEKBAAqhPHpv5rWYPnHMqlJYeJQhEoXsRahlQy5B/KEpp3aB6N4ZueJ/7GS/X+ ++WoN+dlcvAS8nFzxT1RHKqO9/YpnRcnjqRlAZkAq5WtoGZn+OcRG1cUrCsSpVsXE +aoodMabDTzSNDjTq7a2w/MfJAujWkoy6/6KD8L8mJVsI/UEbdhVw9a/PptMQMgRS +6z6evOdSyI5G11OsKN3HIHBiWOwk8OyP6Y1N4wn+fwvGSBc0Jt/LieZhIi0z6+FY +uuMvqRXh1NmatvSFhOpRk/Ro57dHanV9Y5Bqc4JcMZAdJZB7xxsn4Wj9EPCJEylA +nYzOqTbeoIxplnWpG0V0L/T1jA56vwyspsMourGmi8q5Za3Z3S5wl/9lPz02gafH +j8RGb2sHVQiL0sq8JfIldne7ysHiMXZXJCywlZUS7enSULLmI1y09u6EpSJOKb7R +31lWtkF2xmwPjd9hxBFAbbe0xe3taiBHEZKsckyqiewA+0m9jpA5eK/9uwdVyGpA +gGx/kbC1Yon3/P1vSU5Eak6+lSrQkZi3rrb5HpM6pvjXy2IC2BYU8m7Bdtyi+va+ +SmibTiC1l5jEqLqFN8qdwBT++3XsSnmnlWTBKUdC1OXR5PEJc6Af6sgU9+ie8eA9 +IxpMVSuTVhAabq7VDSdyDcoIt5SECGn0Hocx3ZFD/vQpxpEI7vg= +=c5Qs +-----END PGP SIGNATURE----- diff --git a/ImageMagick-configuration-SUSE.patch b/ImageMagick-configuration-SUSE.patch index 4ee8e78..0c6d61c 100644 --- a/ImageMagick-configuration-SUSE.patch +++ b/ImageMagick-configuration-SUSE.patch @@ -1,9 +1,10 @@ ---- policy.xml.orig 2022-05-10 16:11:56.932732627 +0200 -+++ policy.xml 2022-05-10 16:13:26.797307512 +0200 -@@ -78,5 +78,26 @@ - - +--- ImageMagick-7.1.0-43/config/policy.xml ++++ ImageMagick-7.1.0-43/config/policy.xml +@@ -79,5 +79,26 @@ + + ++ + + + @@ -24,6 +25,5 @@ + + + -+ - + diff --git a/ImageMagick-library-installable-in-parallel.patch b/ImageMagick-library-installable-in-parallel.patch index 608d087..b200d04 100644 --- a/ImageMagick-library-installable-in-parallel.patch +++ b/ImageMagick-library-installable-in-parallel.patch @@ -1,8 +1,8 @@ -Index: ImageMagick-7.1.0-33/configure +Index: ImageMagick-7.1.0-43/configure =================================================================== ---- ImageMagick-7.1.0-33.orig/configure -+++ ImageMagick-7.1.0-33/configure -@@ -33042,7 +33042,9 @@ fi +--- ImageMagick-7.1.0-43.orig/configure ++++ ImageMagick-7.1.0-43/configure +@@ -35257,7 +35257,9 @@ fi # Subdirectory to place architecture-dependent configuration files @@ -11,5 +11,5 @@ Index: ImageMagick-7.1.0-33/configure + CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" +fi - cat >>confdefs.h <<_ACEOF - #define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH" + printf "%s\n" "#define CONFIGURE_RELATIVE_PATH \"$CONFIGURE_RELATIVE_PATH\"" >>confdefs.h + diff --git a/ImageMagick.changes b/ImageMagick.changes index 9729f10..722bf13 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,124 @@ +------------------------------------------------------------------- +Mon Jul 11 11:36:34 UTC 2022 - Dirk Müller + +- update to 7.1.0.42: + * incorrect pointer update when computing median @ ImageMagick/ImageMagick#5298 + * Added extra check because the flag was removed in 0.21-Beta1. + * the -transparent-color option accepts colornames @ ImageMagick/ImageMagick#5297 + * fix MVG stroke-opacity issues + * map channel parameter to pixel channel offset @ ImageMagick/ImageMagick#5308 + * beta release + * preserve input depth @ ImageMagick/ImageMagick6#188 + * update to latest automake/autoconf release + * recognize SVG file if it starts with whitespace @ ImageMagick/ImageMagick#5294 + * Removed unused stealth flag. + * Removed used path field. + * Removed unused target field. + * Removed unused exempt field. + * Added extra option to the skip spaces to the MagicInfo. + * Always start at the start of the string when comparing the magic value. + * cosmetic + * avoid OMP deadlock @ ImageMagick/ImageMagick#5301 + * prevent undefined shift + * prevent possible buffer overflow + * correct copy/paste error + * We need to free the stream ourselves when the call to FT_Open_Face fails. + * Added missing call to DestroyString. + * MVG requires seekable stream + * Added extra malloc method to avoid early calls to the policy checks on Windows. + * Removed defines. + * Only check for dll's in non static build. + * Set the client name and path earlier. + * fix background opacity rounding @ ImageMagick/ImageMagick#5264 + * empty result on conversion from tiff to pdf @ ImageMagick/ImageMagick#5256 + * Corrected patch that was made for #5256. + * Pass negative interline_spacing to pango + * Also check extension to fix possible stack overflow. + * eliminate possible buffer overflow + * set group 4 photometric to min-is-white + * dasharray requires non-zero values + * eliminate compiler warning + * only permit one rows/columns keyword + * Moved allocation back to the correct spot to avoid bypassing SetImageExtent. + * Also restore setting quantum_info to null. + * eliminate uninitialized value warning + * Make sure all text strings are freed when realloc fails. + * Reset primitive_info inside RenderMVGContent because this address could point to another address. + * Always check if .text is set instead. + * eliminate uninitialized alpha pixel + * recognize read-mask & write-mask for -channel option + * eliminate compiler warning + * fix scrambled image @ ImageMagick/ImageMagick#5291 + * yikes, misspelled 'level' + * Fixed possible memory leak. + * support floating point formats + * initialize date:precision in private TimerComponentGenesis() method + * check for -1 is not required + * refactor date:precision flow + * eliminate compiler warning + * correct formulation of the phash normalization + * phash normalization is conventional RMS calculation + * only check shread count once + * add private ShredMagickMemory() method to hide contents of memory buffers + before they are relinquished + * system:shred value has precedence over MAGICK_SHRED_PASSES + * support shredding memory pools + * update memory pointer + * Silenced warning. + * Corrected documentation. + * first pass is fast for performance, second is crytographically strong + * recommend shred value of 1 for performance reasons + * only set the # of shred passes one time + * if enabled, shred streams + * unmap mapped pixels + * default mapped member to false + * don't shred streaming pixels + * rework shred passes + * optimize performance + * change per lint advisement + * typecast per lint advisement + * eliminate compiler warning + * eliminate lint warnings + * eliminate lint warnings + * support date:timestamp property + * eliminate lint warnings + * set timestamp from image->timestamp member + * eliminate lint warnings + * support MAGICK_DATE_PRECISION and registrydateprecision defines + * support registry:precision define + * need at least one policy defined + * eliminate lint warnings + * note, system:precision is deprecated + * eliminate icc compiler warnings + * eliminate icc compiler warnings + * eliminate compiler warning + * Reverted incorrect patch when doing auto-orient of an image that is + right-top or left-bottom.# + * Corrected conversion from flip to Orientation. + * Only close the file blob when gzopen is successful (#5233). + * Added method to add utf8 support for gzopen on Windows. + * Only parse SOURCE_DATE_EPOCH once. + * Restored check that did not seem to be necessary. + * Whitespace + * Limit the value of min_channels in the PSDInfo inside the tiff coder to + make it possible to read images with a lot of meta channels + * Make sure that the creation and modification date have the same value in + both places and added option to override this (pdf:create-epoch and + pdf:modify-epoch) + * Added option to specify the creator (pdf:creator) and use that as + xap:CreatorTool instead. + * Added WritePDFValue method that can be reused to write other values. + * Use the new method to write the other values. + * Added option to specify the keywords (pdf:keywords) and use that as + pdf:Keywords in the xmp profile. + * Only check if magick is PDFA once. + * Added option to specify the subject (pdf:subject). + * Also fix incorrect fclose for bzlib. + * collect VICAR properties + * fix improper close when opening zipped file + * Restored setting the file to NULL + * Also remove date:timestamp when stripping the image. + ------------------------------------------------------------------- Tue Jun 7 20:51:19 UTC 2022 - Dirk Müller diff --git a/ImageMagick.spec b/ImageMagick.spec index ff2035e..9f79355 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.0 -%define mfr_revision 37 +%define mfr_revision 43 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -39,9 +39,9 @@ Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other URL: https://imagemagick.org/ -Source0: https://imagemagick.org/download/releases/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 +Source0: https://imagemagick.org/archive/releases/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz Source1: baselibs.conf -Source2: https://imagemagick.org/download/releases/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc +Source2: https://imagemagick.org/archive/releases/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.xz.asc Source3: ImageMagick.keyring # suse specific patches Patch0: ImageMagick-configuration-SUSE.patch @@ -63,7 +63,6 @@ BuildRequires: libwmf-devel BuildRequires: xdg-utils BuildRequires: xz-devel BuildRequires: zip -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1315 BuildRequires: dejavu-fonts %endif