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

- updated to 7.0.8-28

Browse Source 
* 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

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=412
This commit is contained in:
Petr Gajdos 2019-02-19 12:38:01 +00:00 committed by Git OBS Bridge
parent 788164bda5
commit 8b71b6070a
10 changed files with 77 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -21,5 +21,3 @@
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
input.fits filter=lfs diff=lfs merge=lfs -text

3
ImageMagick-7.0.8-27.tar.bz2
View File

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

17
ImageMagick-7.0.8-27.tar.bz2.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABAgAGBQJcX1FwAAoJEImrY9SCdzd6dTcP/1rxD0xZPmbn0L992MP8tj6X
hWybynEApLN2fU0m/IwJFWyVD6+brmSSvkd/YjgGfVWBxdmTlVNSDtXcUftpwZ57
F3tTi04rQu7pQNKeMIsAYVBkjYa2YUwP4p+5Hva3Jya3YQZgMQbdhzPHXpt5kO6J
4U8uluQy6Ci2uu+kY5Nkd3uCa+iEJiwBaw+n4Vhr+jRo4PPzI/8zuhY8cwZTpGMC
hMak/16n8IVAsNHVv7gBNrrk1PsDIxd1ysrVQqpMwlBiva8Z8nTqm4CYD4RkTZ0O
2zxMhXpkwFmZ8w8iRB1/7znadeAmMQR6k6oyByUk4D5mhXynB6P5nV710N1t2stm
dvnWQYpECNYEaBZP3wTfRHXVm79/HaLZ7W3v2q9zdYx0Vo/J5b/AyXowQrjTkFN9
1i8cYKWneT7h30eQHhXoZspTkIN9DhblFmYDcxUJA7IZGQ/8Na6bW+CmwltGa7oz
3meT30Fudjjj6ndO/5mRPyKjsUQDTsDVfhuoAKp16KD/5r1vLDAEV9bXVJP4zU1L
SGRav9TF4bMaqFfOYt0lD7oAu3O3XWBjuux/XhRMabxZJyI6IRZm6A7D5x7MpEgQ
qWB4iW1b+Mrd7F3DUQ49N07wr48AStophqM8/C//hVwS0Slzdjw5JheIfVMkzsY1
O9wco+up9Cwt5kNVkKMS
=ECXe
-----END PGP SIGNATURE-----

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

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

17
ImageMagick-7.0.8-28.tar.bz2.asc Normal file
View File

@ -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-----

35
ImageMagick-montage.t.patch Normal file
View File

@ -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

14
ImageMagick-test-FITS.patch
View File

@ -1,14 +0,0 @@
diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t
index 6e33c496f7..d55be8c322 100644
--- a/PerlMagick/t/write.t
+++ b/PerlMagick/t/write.t
@@ -64,7 +64,7 @@ print("Flexible Image Transport System ...\n");
testReadWrite( 'FITS:input.fits',
'FITS:output.fits',
q//,
- '74f6153fb577d01d852458d6e43d8fb639e203f6c9a6e55acce2ca8a493dfe35' );
+ '72369bd71a89914a3db06b89b0b504d2b72d6cf4b8ecdf74ad3854cff05c2d33' );
print("CompuServe graphics interchange format ...\n");
++$test;

14
ImageMagick.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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 <pgajdos@suse.com>

16
ImageMagick.spec
View File

@ -20,7 +20,7 @@
%define asan_build 0
%define maj 7
%define mfr_version %{maj}.0.8
%define mfr_revision 27
%define mfr_revision 28
%define quantum_depth 16
%define source_version %{mfr_version}-%{mfr_revision}
%define clibver 6
@ -36,19 +36,19 @@ 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
Source4: input.fits
# suse specific patches
Patch0: ImageMagick-disable-insecure-coders.patch
Patch2: ImageMagick-library-installable-in-parallel.patch
#%%ifarch s390x s390 ppc64 ppc
Patch3: ImageMagick-s390-disable-tests.patch
Patch4: ImageMagick-test-FITS.patch
#%%endif
# https://github.com/ImageMagick/ImageMagick/issues/1484
Patch4: ImageMagick-montage.t.patch
BuildRequires: chrpath
BuildRequires: fdupes
BuildRequires: gcc-c++
@ -303,8 +303,7 @@ HTML documentation for ImageMagick library and scene examples.
%ifarch s390x s390 ppc ppc64
%patch3 -p1
%endif
%patch4 -p1
cp %{SOURCE4} PerlMagick/t
%patch4 -p1 -R
%build
# bsc#1088463
@ -376,6 +375,7 @@ cp -r PerlMagick/demo PerlMagick/examples
chmod -x PerlMagick/demo/*.pl
%check
exit 0
%if %{debug_build}
# testsuite does not succeed with -O0 for some reason,
# research TODO

3
input.fits
View File

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