pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 620349 from graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/620349
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=164
This commit is contained in:
Dominique Leuenberger 2018-07-04 21:53:28 +00:00 committed by Git OBS Bridge
commit 4cc6770e00
8 changed files with 59 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ImageMagick-7.0.7-34.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7ba3a66bc9ac495fff11784c068031aa12bc1a095d5f74c5b05e175a70209e6
size 10792320

16
ImageMagick-7.0.7-34.tar.bz2.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbAhleAAoJEImrY9SCdzd6ZJ4P/0HwmOBNQzH87i5LoQd6xjj8
2UiEnRiNenDwV5JBLzVWNAekWgFB5LgvrEeXyXv2J+Xt3ygKZRqBtBzsPxGghC7v
1Z3octPUbqLK8L7PKd8NrtLhED7KC/3wttOb8Wj+DHGMr8ucxU71SS5MEZkqS8TS
REXuwkwwuvjL4JRqNCoDa/GJt+JplOHSMODkL1I7gp+pyE+SbIBlt0nVPAublGAI
NLPvAQnEunT4ZQxjsUjwzB/I/ZRRFSjagmmxHSq9AL306nIu47ibWPBnK1ReSG01
VhzM8gXHcuOXNPAubzDhgvDGfE0wsVS+sd/CVRMuPLzoe4v7uqCjj3BsSYaJpBka
fP/2PhjICtROjyo6aaT+pLKZkGwhu7pbB0qomkN70qKw1+iOqM2qUvKrKFZ3UGJG
aRoxhvykLubxHPhCR8hyTQcsVsH0TzuOGNZmMWqVmP/tWBzUCl6bDrF2EDCiF1s7
dehwc4UFVXt9uQOvnVc55/CLQ/i3M92KEeggvzJhzyPPZqiidIy1slXA5CkSv14R
fpr3BCxpsyuRrp++5jjq3wE+hOLqhQmk43pGikLYaFTQj0rDXcdltSpCVNHTh1L6
SJB6vqlYjb9IbryM05zvpzRbkI+R6pAVGJpOXfMOdhKvteY/IF0QOVy77WUdTrDo
M77AxUCM6q2rE9+2598e
=JG+P
-----END PGP SIGNATURE-----

3
ImageMagick-7.0.8-3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16facacd5eacdea5a020ad6d046e001f7b613418c216f2d2211049b4f022e3bc
size 10777752

16
ImageMagick-7.0.8-3.tar.bz2.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJbML2pAAoJEImrY9SCdzd6ojEP/Atr2o78OIYx9YSBD0lzs8QY
pI2mD4wmzL1Jsy5k5cXGVMaqxQfrx9xmHd2dfhlRwQMVLmNW3JEEp2AR7yrf0GCO
NUYsQcST8SyAs5Pv6PubjJfgMRwTIcCX6E7+eVOKVtCCqSdtB8ckw98h1GcZNswU
Z82uOEF8CUIb+xlMlEO/XHsOrqAESbNpH+96nySDBRCuB0pUNmfU189qIEmvOqeB
SSd6StTlcpsgTGQ/0/raTyrRPBBFbxWJ3lOELmgp31SDp+eZPqAol145NjnN11pu
heM7JaaKjopsFVo+H/g382jRCn3QKyl84oC2MexjtItekj0avCf5bzxUy37m9da/
RKjmWEL4+ZeMGCD6A7KG7F1MGiRqdl5hNDo9aS9btt5QtkxVQFSLeE+sdXwtYLOb
YKkBL7Ls0F7GenTf4gYav7wXHxmWie0K7SpEj4bUfYU0F6TotXiqzjheM29Dmyj6
tsK7/4xykSQbRhmx7UMagEryeWtrrGNSfI2eAsLUf4rZhVcnr/UfNivsrGiueuzJ
TnEil1xleEEFhoe4/94+3sGk14PpWc8B+vZ448MXWeNwa5nRfMYKvbG53xnr5bg6
EOr7dtvpcibUS7GuS3cKsuBPRRX68VA98awbRFULYvnluvcaz3iR5AAOEya5H6RG
trPoxyrjdte51rpAuBNN
=Nxzy
-----END PGP SIGNATURE-----

21
ImageMagick-relax-filter.t.patch
View File

@ -1,21 +0,0 @@
diff -urN ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t ImageMagick-7.0.6-0/PerlMagick/t/filter.t
--- ImageMagick-7.0.6-0.orig/PerlMagick/t/filter.t 2017-06-11 13:39:49.000000000 +0200
+++ ImageMagick-7.0.6-0/PerlMagick/t/filter.t 2017-08-10 02:24:02.823623000 +0200
@@ -57,7 +57,7 @@
testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Colorize.miff', 'Colorize', q/fill=>"red", blend=>"50%"/, 0.0, 0.0 );
++$test;
-testFilterCompare('input.miff', q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.0, 0.0);
+testFilterCompare('input.miff', q//, 'reference/filter/Contrast.miff', 'Contrast', q//, 0.001, 0.4);
++$test;
testFilterCompare('input.miff', q//, 'reference/filter/Convolve.miff', 'Convolve', q/[0.0625, 0.0625, 0.0625, 0.0625, 0.5, 0.0625, 0.0625, 0.0625, 0.0625]/, 0.1, 0.7);
@@ -138,7 +138,7 @@
testFilterCompare('input.miff', q//, 'reference/filter/OilPaint.miff', 'OilPaint', q//, 0.03, 1.0);
++$test;
-testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.0, 0.0);
+testFilterCompare('input.miff', "fuzz=>$fuzz", 'reference/filter/Opaque.miff', 'Opaque', q/color=>"#e23834", fill=>"green"/, 0.05, 0.5);
++$test;
testFilterCompare('input.miff', q//, 'reference/filter/Quantize.miff', 'Quantize', q//, 0.2, 0.7);

21
ImageMagick-tests.tap-attributes.patch
View File

@ -1,21 +0,0 @@
Index: ImageMagick-7.0.7-28/Magick++/tests/tests.tap
===================================================================
--- ImageMagick-7.0.7-28.orig/Magick++/tests/tests.tap 2018-03-25 20:18:56.000000000 +0200
+++ ImageMagick-7.0.7-28/Magick++/tests/tests.tap 2018-04-04 15:07:22.292261487 +0200
@@ -8,14 +8,14 @@
#
subdir=Magick++/tests
. ./common.shi
-echo "1..13"
+echo "1..12"
SRCDIR=${top_srcdir}/${subdir}/
export SRCDIR
cd ${subdir} || exit 1
-for mytest in appendImages attributes averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
+for mytest in appendImages averageImages coalesceImages coderInfo color colorHistogram exceptions geometry montageImages morphImages readWriteBlob readWriteImages
do
./${mytest} && echo "ok" || echo "not ok"
done

34
ImageMagick.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Mon Jul 2 17:39:31 UTC 2018 - kstreitova@suse.com
- use "BuildRequires: p7zip-full" for TW as 7za binary needed by
ImageMagick was moved to this package (see bsc#899627 for more
details about this change)
-------------------------------------------------------------------
Tue Jun 26 09:49:48 UTC 2018 - pgajdos@suse.com
- update to 7.0.8-3:
* Apply translate component of SVG transform rotate.
* More robust SVG text handling.
* Fixed numerous use of uninitialized values, integer overflow, memory
exceeded, and timeouts (credit to OSS Fuzz).
* Fixed an issue with stroke and label
-------------------------------------------------------------------
Wed Jun 13 08:10:50 UTC 2018 - pgajdos@suse.com
- update to 7.0.8-0:
* Fixed numerous use of uninitialized values, integer overflow, memory
exceeded, and timeouts (credit to OSS Fuzz).
* Heap buffer overflow fix (reference
https://github.com/ImageMagick/ImageMagick/issues/1156).
* Boundary issues with -gamma option when HDRI is enabled (reference
https://github.com/ImageMagick/ImageMagick/issues/1151).
* Properly initialize SVG color style.
* A SVG rectangle with a width and height of 1 is a point.
* Fixed memory corruption for MVG paths.
- consider test to be completely broken on i586, removing:
- ImageMagick-relax-filter.t.patch
- ImageMagick-tests.tap-attributes.patch
-------------------------------------------------------------------
Mon May 21 08:08:20 UTC 2018 - pgajdos@suse.com

29
ImageMagick.spec
View File

@ -17,8 +17,8 @@
%define maj 7
%define mfr_version %{maj}.0.7
%define mfr_revision 34
%define mfr_version %{maj}.0.8
%define mfr_revision 3
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 6
@ -41,20 +41,10 @@ Source2: http://www.imagemagick.org/download/ImageMagick-%{mfr_version}-%
Source3: ImageMagick.keyring
# suse specific patches
Patch0: ImageMagick-disable-insecure-coders.patch
# workaround, see https://github.com/ImageMagick/ImageMagick/issues/439
#%%ifarch i586
#%%if %%{?suse_version} == 1500
Patch1: ImageMagick-relax-filter.t.patch
#%%endif
#%%endif
Patch2: ImageMagick-library-installable-in-parallel.patch
#%%ifarch s390x s390 ppc64 ppc
Patch3: ImageMagick-s390-disable-tests.patch
#%%endif
# https://github.com/ImageMagick/ImageMagick/issues/1019
#%%ifarch i586
Patch5: ImageMagick-tests.tap-attributes.patch
#%%endif
BuildRequires: chrpath
BuildRequires: dos2unix
BuildRequires: fdupes
@ -74,7 +64,11 @@ BuildRequires: dejavu-fonts
BuildRequires: libjbig-devel
%endif
%if 0%{?suse_version} >= 1315
%if 0%{?suse_version} > 1500
BuildRequires: p7zip-full
%else
BuildRequires: p7zip
%endif
BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} >= 1315
@ -298,18 +292,10 @@ HTML documentation for ImageMagick library and scene examples.
%prep
%setup -q -n ImageMagick-%{source_version}
%patch0 -p1
%ifarch i586
%if %{?suse_version} == 1500
%patch1 -p1
%endif
%endif
%patch2 -p1
%ifarch s390x s390 ppc ppc64
%patch3 -p1
%endif
%ifarch i586
%patch5 -p1
%endif
%build
# bsc#1088463
@ -374,10 +360,7 @@ chmod -x PerlMagick/demo/*.pl
# https://github.com/ImageMagick/ImageMagick/issues/1019
# https://github.com/ImageMagick/ImageMagick/issues/1058
# https://github.com/ImageMagick/ImageMagick/issues/1059
# (but keep patches for a while before giving up completely)
exit 0
# https://github.com/ImageMagick/ImageMagick/issues/1059
rm PerlMagick/t/montage.t
%endif
make %{?_smp_mflags} check
export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs