summaryrefslogtreecommitdiffstats
path: root/ImageMagick6.spec
diff options
context:
space:
mode:
Diffstat (limited to 'ImageMagick6.spec')
-rw-r--r--ImageMagick6.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec
index 4aa5309..edf5c35 100644
--- a/ImageMagick6.spec
+++ b/ImageMagick6.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 6.9.10
-%global Patchlevel 53
+%global Patchlevel 54
%global incsuffixe -6
%global libsuffixe -6.Q16
%global with_tests 0%{!?_without_tests:1}
@@ -82,6 +82,8 @@ License: ImageMagick
Url: http://www.imagemagick.org/
Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
+Patch0: https://patch-diff.githubusercontent.com/raw/ImageMagick/ImageMagick6/pull/53.patch
+
BuildRequires: gcc
BuildRequires: gcc-c++
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -381,6 +383,7 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
+%patch0 -p1 -b .pr53
# for %%doc
mkdir Magick++/examples
@@ -388,6 +391,8 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
%build
+export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE"
+
%configure --enable-shared \
--disable-static \
--disable-silent-rules \
@@ -637,6 +642,12 @@ fi
%changelog
+* Wed Jul 17 2019 Remi Collet <remi@remirepo.net> - 6.9.10.54-1
+- update to version 6.9.10 patch level 54
+- build with IMPNG_SETJMP_IS_THREAD_SAFE
+- fix pkgconfig files using patch from
+ https://github.com/ImageMagick/ImageMagick6/pull/53
+
* Mon Jul 8 2019 Remi Collet <remi@remirepo.net> - 6.9.10.53-1
- update to version 6.9.10 patch level 53