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

Accepting request 970975 from graphics

Browse Source 
- version update to 7.1.0.30:
  * Remove unused EXPLICIT_TEMPLATE_INSTANTIATION
  * Fixes #4985: 4e+26 is outside the range of representable values of type
    'unsigned long' at
- fix typo on update-alternatives call

- drop ImageMagick-s390-disable-tests.patch - the tests no longer fail

OBS-URL: https://build.opensuse.org/request/show/970975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=249
This commit is contained in:
Dominique Leuenberger 2022-04-22 19:53:01 +00:00 committed by Git OBS Bridge
commit 3a0d3457e8
7 changed files with 35 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ImageMagick-7.1.0-29.tar.bz2
View File

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

16
ImageMagick-7.1.0-29.tar.bz2.asc
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmJAcegACgkQiatj1IJ3
N3q4YBAAg+8BWsfJNh1cnf1VGSTh8wVbjpL5zlrkjPx0qa177ouD9Nr+aL+Gj+CE
yRMhhaQR6WX3gPYY5tBottPyzm5eZGmiE3Q6uaBFDdbBxZK05QBXRNAW4XEjn9Gx
8hJ5f/Z4govNk706FaQoSclSuW6xCSEXgKalgDNgSSJ9aq9cObQRUNoY6OyhxW58
Aibf8biZt6cnEObodybsUrJ4VJjd+egX++AhqdacefEuBtTokOeHhPPWWJJhYJ1W
LDoVKr/G2DWz50q3zYUKTU1Z/VlLvdjJWuDcm9Po+CP2mzLvMiYmx0thtVKdtrFS
Nj+lag3s6JYpT7Tu/edRxY0C4+UL/zoLH55oHxaqf4Cpya6z2EM4vxnDoyAUoa8j
B2dLB2v0+SrifrSsi9++nSIhCNw5XZgHTXL/m5THFqjewM1sy7Q5c0lhgETp7F/l
+945IB//Z0ExxQxcboDsTmuFviFhG129+rWFXPcAw54v6hykuKI17pB1AL9DDWDm
dpACd9YK05uFM5WbrmDJMuVFlGUAtzD5gLxzkU674tns6weQkmSJ9pjUB7h+MbtA
5uQFWDUal/mIPzuaDAQXJK4K+MAQoPOAkYsznEIa+4eOiOxLJhJ50k+AzRWLyljJ
BVRNMtQk6MP3vkVaeQEGMqz4rbubWJOEE0/RuetxAM+OdtqVUqE=
=20IY
-----END PGP SIGNATURE-----

3
ImageMagick-7.1.0-30.tar.bz2 Normal file
View File

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

16
ImageMagick-7.1.0-30.tar.bz2.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmJbRoYACgkQiatj1IJ3
N3oF8w//bbFlV4BQP7Ebib37mLLX69DDLotrho02B5uDwifxbbx+MXf6myCbQvNF
Q7Nzz7F3pDQ8fn6CZw5h3RgJExtm8ljsO1NlK0adb3Xo2+NpdhEvkj+5to+XWiJT
k927nZ2JmD9JvsSX/7DUfNY8zX+80YF41EmpaJpKVzItw2B7kQmCD39ILtMWkuYI
nZ13jkXFYOTYZLfI9rrKfg6pSqYF9cd1WSGq8yGv0vBO6fxpqeOEKTvGmbvOBL91
zd75Ew1OsSgJ73T2auwXqMaBgKxEUspWUVlwjrpHhBJg+emsz4hEeSqgoBkxEeR8
1dXWgbWS65/7uV01mg776y50urBAdGu1TVT2vhebX1tFinFNkWbvl7SoVm/aEVRg
fM+KrsaIxIr7/PS2lGvit6A/K3V9aphI9O1ZUZpUu4PqAYUAjWfpNABEaQSDDZlO
k5/aUO/W/1SjMYtjlv9Xw6LDc+qNAnLmfvVeA0DE8852+soJtNo66SoGA2l+INfK
Wp5cYBJxSWYsweqk+u5663oNckiPImtPmnf8y3M2a1jmjpcOlzsH0YdhFeICpeIS
w+V0gGISV28vyjDOdqlT7jZw1r6p0JUwShLJsypCdgtu+1dn8+eWFpDXbyq2LAwQ
TWqtOdyx2SI2GADseuQ54aMXcqJlr4GzCDEPuRnFq4pz/d7V9z0=
=q58M
-----END PGP SIGNATURE-----

79
ImageMagick-s390-disable-tests.patch
View File

@ -1,79 +0,0 @@
Index: ImageMagick-7.0.10-10/PerlMagick/t/montage.t
===================================================================
--- ImageMagick-7.0.10-10.orig/PerlMagick/t/montage.t 2020-04-28 01:39:32.000000000 +0200
+++ ImageMagick-7.0.10-10/PerlMagick/t/montage.t 2020-05-04 12:00:52.544321014 +0200
@@ -15,7 +15,7 @@
#
# Test montage method.
#
-BEGIN { $| = 1; $test=1, print "1..19\n"; }
+BEGIN { $| = 1; $test=1, print "1..16\n"; }
END {print "not ok 1\n" unless $loaded;}
use Image::Magick;
$loaded=1;
@@ -113,41 +113,6 @@ testMontage( q//,
'ae4322daebfbd3fe448afffe33aa599be518eaebb3515793e1efe6dc33939383');
#
-# 11) Test Framed Montage
-#
-# Image border color 'bordercolor' controls frame background color
-# Image matte color 'mattecolor' controls frame color
-# Image pen color 'pen' controls label text foreground color
-++$test;
-testMontage( q/bordercolor=>'blue', mattecolor=>'red'/,
- q/background=>'#696e7e', tile=>'4x4', geometry=>'90x80+3+3>', frame=>'8x10',
- borderwidth=>'0', gravity=>'Center', background=>'gray'/,
- '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322',
- '531d0d485d55a5b585cab3f64b37da81a109fbaa91aa44a038fa916421780f14',
- '40835871b13232243ba4d2bcb244d06958556a24a9624e793f5c4c291d64f322');
-
-#
-# 12) Test Framed Montage with drop-shadows
-#
-++$test;
-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'/,
- 'c11aad0132d57f84ec42aad600f2c9f3fdb9ad5a64235cb08a296c0f1a509f6d',
- '51b8db221299cea2bea84b11247bfa4b41a0cc3a9af27ff4c20f9c23ee7f2117',
- '7b8d2dbf3ee22440fd5df36090922bb599ab6b4df216282cc51bb4328d03a211');
-
-#
-# 13) Test Framed Montage with drop-shadows and background texture
-#
-++$test;
-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:'/,
- '292b115e08fcef4888ee3f386c6c3aff1c0ed008e34697435c1e4116a75149ed',
- 'e2fe0b56decf6fd791813e99d7b0f40646a479589e7519d97e2f92969dd17a1e',
- '2c6bc96010beb38d123cc712ded96ecbbef40265a80e9638e9ea9034d64227f3');
-
#
# 14) Test Un-bordered, Un-framed Montage
#
Index: ImageMagick-7.0.10-10/PerlMagick/t/read.t
===================================================================
--- ImageMagick-7.0.10-10.orig/PerlMagick/t/read.t 2020-04-28 01:39:32.000000000 +0200
+++ ImageMagick-7.0.10-10/PerlMagick/t/read.t 2020-05-04 11:45:34.455692428 +0200
@@ -15,7 +15,7 @@
#
# Test reading formats supported directly by ImageMagick.
#
-BEGIN { $| = 1; $test=1; print "1..47\n"; }
+BEGIN { $| = 1; $test=1; print "1..46\n"; }
END {print "not ok $test\n" unless $loaded;}
use Image::Magick;
$loaded=1;
@@ -72,10 +72,6 @@ print("MAT (MatLab gray 8-bit MSB intege
++$test;
testReadCompare('input_gray_msb_08bit.mat', 'reference/read/input_gray_msb_08bit_mat.miff', q//, 0.22, 1.022);
-print("MAT (MatLab gray 64-bit LSB double) ...\n");
-++$test;
-testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.22, 1.022);
-
print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
++$test;
testReadCompare('input_rgb_lsb_08bit.mat', 'reference/read/input_rgb_lsb_08bit_mat.miff', q//, 0.0, 0.0);

14
ImageMagick.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Tue Apr 19 13:37:18 UTC 2022 - Dirk Müller <dmueller@suse.com>
- version update to 7.1.0.30:
* Remove unused EXPLICIT_TEMPLATE_INSTANTIATION
* Fixes #4985: 4e+26 is outside the range of representable values of type
'unsigned long' at
- fix typo on update-alternatives call
-------------------------------------------------------------------
Sun Apr 17 12:36:12 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>
- drop ImageMagick-s390-disable-tests.patch - the tests no longer fail
-------------------------------------------------------------------
Thu Apr 7 07:29:22 UTC 2022 - pgajdos@suse.com

10
ImageMagick.spec
View File

@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.1.0
%define mfr_revision 29
%define mfr_revision 30
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 10
@ -46,9 +46,6 @@ Source3: ImageMagick.keyring
# suse specific patches
Patch0: ImageMagick-configuration-SUSE.patch
Patch2: ImageMagick-library-installable-in-parallel.patch
#%%ifarch s390x s390 ppc64 ppc
Patch3: ImageMagick-s390-disable-tests.patch
#%%endif
#%%ifarch i586
#%%if %%{?suse_version} < 1550
# do not report test issues related to 32-bit architectures upstream,
@ -340,9 +337,6 @@ preserved.
%prep
%setup -q -n ImageMagick-%{source_version}
%patch2 -p1
%ifarch s390x s390 ppc ppc64
%patch3 -p1
%endif
%ifarch i586
%if %{?suse_version} < 1550
%patch4 -p1
@ -497,7 +491,7 @@ end
%postun %{config_spec}-upstream
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
%{_sbindir}/update-alternatives -quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream
fi
%pretrans %{config_spec}-SUSE -p <lua>