diff options
| -rw-r--r-- | ImageMagick6.spec | 13 | ||||
| -rw-r--r-- | gs-check.patch | 36 |
2 files changed, 44 insertions, 5 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 35e8e49..dac873c 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -47,7 +47,7 @@ Name: %{libname} %endif Epoch: 1 Version: %{VER}.%{Patchlevel} -Release: 2%{?dist} +Release: 3%{?dist} Summary: An X application for displaying and manipulating images (legacy) License: ImageMagick Url: https://legacy.imagemagick.org/ @@ -55,6 +55,8 @@ Url: https://legacy.imagemagick.org/ #Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: gs-check.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: pkgconfig(bzip2) @@ -327,14 +329,12 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%patch -P0 -p1 -b .pr8034 + # for %%doc mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples -%if 0%{?rhel} == 8 || 0%{?rhel} == 9 -sed -e '/GSAlphaDevice/s/png16malpha/pngalpha/' -i configure.ac configure -%endif - %build export CFLAGS="%{optflags} -DIMPNG_SETJMP_IS_THREAD_SAFE" @@ -580,6 +580,9 @@ fi %changelog +* Sat Mar 15 2025 Remi Collet <remi@remirepo.net> - 6.9.13.23-3 +- test build for https://github.com/ImageMagick/ImageMagick6/pull/368 + * Fri Mar 14 2025 Remi Collet <remi@remirepo.net> - 6.9.13.23-2 - add workaround for old libgs reported as https://github.com/ImageMagick/ImageMagick/issues/8019 diff --git a/gs-check.patch b/gs-check.patch new file mode 100644 index 0000000..4fb8ae8 --- /dev/null +++ b/gs-check.patch @@ -0,0 +1,36 @@ +From 2b491ae699870d3dcc047a529b1a69ad59792dd5 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Sat, 15 Mar 2025 07:58:43 +0100 +Subject: [PATCH] try pngalpha if png16malpha not available + +--- + configure | 6 ++++-- + configure.ac | 2 ++ + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index e24752caa..ec13f0daf 100755 +--- a/configure ++++ b/configure +@@ -38027,6 +38027,8 @@ printf "%s\n" "$GSColorDevice" >&6; } + printf %s "checking for gs alpha device... " >&6; } + if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then + : ++ elif $PSDelegate -q -dBATCH -sDEVICE=pngalpha -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then ++ GSAlphaDevice=pngalpha + else + GSAlphaDevice=$GSColorDevice + fi +diff --git a/configure.ac b/configure.ac +index 5f990f3f2..c37d12ab9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3644,6 +3644,8 @@ if test $have_gs = 'yes'; then + AC_MSG_CHECKING([for gs alpha device]) + if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then + : ++ elif $PSDelegate -q -dBATCH -sDEVICE=pngalpha -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then ++ GSAlphaDevice=pngalpha + else + GSAlphaDevice=$GSColorDevice + fi |