diff options
| author | Remi Collet <remi@remirepo.net> | 2019-07-17 16:10:39 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-07-17 16:10:39 +0200 |
| commit | 29a6f7ddaf07a1862ba6776bd846b4731bb224c5 (patch) | |
| tree | f503f6b3fa2666ac774417934c58a301af547957 | |
| parent | 28f8b5dae4d373ca8c0de9570dc60c073ae3a15d (diff) | |
- 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
| -rw-r--r-- | 53.patch | 22 | ||||
| -rw-r--r-- | ImageMagick6.spec | 13 |
2 files changed, 34 insertions, 1 deletions
diff --git a/53.patch b/53.patch new file mode 100644 index 0000000..cbe3542 --- /dev/null +++ b/53.patch @@ -0,0 +1,22 @@ +From fadb736e4409c0f962ff144a922ef974983e34ec Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 17 Jul 2019 15:47:29 +0200 +Subject: [PATCH] fix pkgconfig dependency + +--- + wand/MagickWand.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wand/MagickWand.pc.in b/wand/MagickWand.pc.in +index f1cf3cf33..53c5bae78 100644 +--- a/wand/MagickWand.pc.in ++++ b/wand/MagickWand.pc.in +@@ -9,7 +9,7 @@ Name: MagickWand + Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) + URL: https://github.com/ImageMagick/ImageMagick6 + Version: @PACKAGE_VERSION@ +-Requires: MagickCore.@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ ++Requires: MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ + Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ + Libs: -L${libdir} -l${libname} + Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 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 |