diff --git a/ImageMagick-7.0.8-26.tar.bz2 b/ImageMagick-7.0.8-26.tar.bz2 deleted file mode 100644 index ecf5005..0000000 --- a/ImageMagick-7.0.8-26.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb6468de02c3c4162b4061ce922507ab61fa90632cf8ff050d27abb24f05645e -size 11426789 diff --git a/ImageMagick-7.0.8-26.tar.bz2.asc b/ImageMagick-7.0.8-26.tar.bz2.asc deleted file mode 100644 index b0569c6..0000000 --- a/ImageMagick-7.0.8-26.tar.bz2.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJcWaIBAAoJEImrY9SCdzd6CoAP/04N9vQFFAPZaJuXSiifVQi5 -C7KITWFkRMZbdz1GpTCiDZ8opSGnJe/XIYHutdzV0MvIQ1/f/VmdbUbiPWFSNMGw -1Hu97T0A9vaCkBSySH7XlECoVLGsNnS1rXzImyaYuOC6UFJKsYH5ekMdxx38tL07 -KfyDbSKu0Y4Wq2MUsQ/xaD+YdpSANxR73ek9VY2q+wGgr6XWh9+kVm8D7lYioDnn -z7qLTZj9EC3Hp4I/vvPOEQVBRJ0H7krWfp48lgNwFA+eBf46XNySL2v4b2EbLfJ3 -JttjATS2NZKZVDA7+55z7uMfOwG5OU71gDQ9y16A7cfJIbjJEM9UQaYSGGejR8F2 -RFhHBb+EE3CIRB4RU041EIt9AO4IM6I8bbE3XJpi+t0gWXfe0al7eyAv690itIbt -smO2Nw+naPM7cLU7giicrZfQyn2V39qFwoq0HuQ0IUBtynZy93sl1h/ns8L9u1VZ -LS0pzTqksF6KmlVnpLxVTshUAsGJlQCm1/7FRmHEHhi6LAQ8oKuv8QPBsL3o4Kok -XXY7CED2l/mk9n/Liwh5nH3M0QDv2GuasiEX9p9sZ/I48ahkrw/Oj9vWi1uS0Kod -oVXTvt1QwMGTZZbSsl+TUHp3c17G6xrefYhZToyt+b6m3OCDPhWghoWvS7c1I3M1 -ZLFeCZ3URP0QtS7hLhSg -=IU6Q ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.0.8-28.tar.bz2 b/ImageMagick-7.0.8-28.tar.bz2 new file mode 100644 index 0000000..2e8e772 --- /dev/null +++ b/ImageMagick-7.0.8-28.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe9b6eb51a66029a0b15c8dfbbaee6298f5e978c2d1acaf17e3062144050be1d +size 11431659 diff --git a/ImageMagick-7.0.8-28.tar.bz2.asc b/ImageMagick-7.0.8-28.tar.bz2.asc new file mode 100644 index 0000000..328d2a7 --- /dev/null +++ b/ImageMagick-7.0.8-28.tar.bz2.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJcarHRAAoJEImrY9SCdzd6CScP/1ovLeZch6o2PYDR+sy/i5k5 +RqRExhCoIJpIKTXr2XGYvOP4waOmmkz43JZV1lRuV3LrRdRLnEdlg6zpp9XEdLy8 +oSyAYUjGpoD/klrIgi7myxc2+ugX3a0fD0pvDaXxUTDxAbZaoW5qsbe68TSLLx46 +qafJ+IupGUVIZDIDhZ3DSXNEE8kE92EXQjwep4Z7M9VSqNlI3TnwXjxeQBPhps20 +pOBW9ZPa4ypdEERDcSZ4ZbSLp7FZZkb9UcrJeYyx2cc52rOm5r6/cW/KywXQT/fZ +b1aC8Gdl8i7uJY/TCtj94HbRfHYmuSrhsg0pn9CFrgrTH1VWc/1yZcW00/gu/TbK +edtl33ICa0to7Pxc3hUwt2TVIxCDfDrxZ1Tb/DgWEFJfFmpoFzezksSipYMANc2b +8auMmHYZWtnUZLaKhCfQ/yzJYy6EyrjFdZPU4F4Xx21nmCd9IDAK9eW/ZL6VYQ+U +TzyB6FRUYhZ13fiLT3c1apEeAR6ZkApa3fENzyDNkUpx8+1t+Z7dPIT9XB6+QWb7 +uMrB2TDP6CKYYY6xW4e6u+JHdUFdLOtBHG2Pi1awBzx23wQ7xYGI/cwewhC8ZF1n ++CQDJzin+zOClU+caiZTAXAqmAiKvXtlKc2tXtQNRQblpJD+I0qL4UicmgsYPK56 +vKXQkUo2jYvfOGGsSiXR +=vczZ +-----END PGP SIGNATURE----- diff --git a/ImageMagick-clamp-after-edge.patch b/ImageMagick-clamp-after-edge.patch deleted file mode 100644 index 8169989..0000000 --- a/ImageMagick-clamp-after-edge.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/MagickCore/effect.c b/MagickCore/effect.c -index 66f61e0e8d..14e17040ba 100644 ---- a/MagickCore/effect.c -+++ b/MagickCore/effect.c -@@ -1225,6 +1225,8 @@ MagickExport Image *EdgeImage(const Image *image,const double radius, - kernel_info->values[i]=(-1.0); - kernel_info->values[i/2]=(double) kernel_info->width*kernel_info->height-1.0; - edge_image=ConvolveImage(image,kernel_info,exception); -+ if (edge_image != (Image *) NULL) -+ (void) ClampImage(edge_image,exception); - kernel_info=DestroyKernelInfo(kernel_info); - return(edge_image); - } diff --git a/ImageMagick-montage.t.patch b/ImageMagick-montage.t.patch new file mode 100644 index 0000000..0181de5 --- /dev/null +++ b/ImageMagick-montage.t.patch @@ -0,0 +1,35 @@ +diff --git a/PerlMagick/t/montage.t b/PerlMagick/t/montage.t +index 5dd1e16f80..749242d09b 100644 +--- a/PerlMagick/t/montage.t ++++ b/PerlMagick/t/montage.t +@@ -122,8 +122,8 @@ testMontage( q//, + testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10', + borderwidth=>'0', gravity=>'Center', background=>'gray'/, +- 'dcfa6c2bc0e20ff0b5dba464559a1e106e605ec456c21c1205a53e478e4f3e02', +- 'dcfa6c2bc0e20ff0b5dba464559a1e106e605ec456c21c1205a53e478e4f3e02', ++ '0bb09155fd14aaaeab01d8ff9e78ec940168be15c8f7353bb69889347cc02457', ++ '0bb09155fd14aaaeab01d8ff9e78ec940168be15c8f7353bb69889347cc02457', + '72a7587a058c71cd62226e59b64c335190a37d7dd990d68534cf05df61084783'); + + # +@@ -133,8 +133,8 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + 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'/, +- 'b3b7a530270164b4c5e391ac8080736a901428e5f650694170969fd292559317', +- 'b3b7a530270164b4c5e391ac8080736a901428e5f650694170969fd292559317', ++ 'd654efe38f3cf4f837fde12753bd6f7d4c3eb5153fa3f0ed0799ed41f5dcdc91', ++ 'd654efe38f3cf4f837fde12753bd6f7d4c3eb5153fa3f0ed0799ed41f5dcdc91', + '9fe18e11ac759d3a86362f16d0bdee4b6952d617daa3ad2c3511e19050dda71d'); + + # +@@ -144,7 +144,7 @@ testMontage( q/bordercolor=>'blue', mattecolor=>'red'/, + 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:'/, +- '08d4dfa09995e13a518002565d862f6e89d65de37d59c1d1ab45d7c6cde6bd47'); ++ '56ad577ef744d6f612258d3e15eb70b9700b7876ba0cb7fb9a665c622c1962fe'); + + # + # 14) Test Un-bordered, Un-framed Montage diff --git a/ImageMagick.changes b/ImageMagick.changes index 42e79ec..ab7163b 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Feb 19 12:36:50 UTC 2019 - pgajdos@suse.com + +- updated to 7.0.8-28 + * Fixed a number of issues (reference + https://github.com/ImageMagick/ImageMagick/issues). +- deleted patches + - ImageMagick-test-FITS.patch (upstreamed) +- deleted sources + - input.fits (not needed) +- added patches + https://github.com/ImageMagick/ImageMagick/issues/1484 + + ImageMagick-montage.t.patch + +------------------------------------------------------------------- +Mon Feb 11 10:27:59 UTC 2019 - Petr Gajdos + +- update to 7.0.8-27: + * Mod patch to properly handle subimage ranges (e.g. image.gif[2-3]). +- added ImageMagick-test-FITS.patch and input.fits temporarily + https://github.com/ImageMagick/ImageMagick/issues/1478 +- remove ImageMagick-clamp-after-edge.patch, it is solved another + way (see [bsc#1106415c#10]) + ------------------------------------------------------------------- Thu Feb 7 09:51:36 UTC 2019 - Petr Gajdos diff --git a/ImageMagick.spec b/ImageMagick.spec index a006804..aa96408 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 26 +%define mfr_revision 28 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 6 @@ -36,10 +36,10 @@ Release: 0 Summary: Viewer and Converter for Images License: ImageMagick Group: Productivity/Graphics/Other -URL: http://www.imagemagick.org -Source0: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 +URL: https://www.imagemagick.org +Source0: https://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2 Source1: baselibs.conf -Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc +Source2: https://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%{mfr_revision}.tar.bz2.asc Source3: ImageMagick.keyring # suse specific patches Patch0: ImageMagick-disable-insecure-coders.patch @@ -47,7 +47,8 @@ Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch #%%endif -Patch4: ImageMagick-clamp-after-edge.patch +# https://github.com/ImageMagick/ImageMagick/issues/1484 +Patch4: ImageMagick-montage.t.patch BuildRequires: chrpath BuildRequires: fdupes BuildRequires: gcc-c++ @@ -302,7 +303,7 @@ HTML documentation for ImageMagick library and scene examples. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif -%patch4 -p1 +%patch4 -p1 -R %build # bsc#1088463