diff options
| author | Remi Collet <remi@remirepo.net> | 2025-03-19 10:24:03 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-03-19 10:24:03 +0100 |
| commit | a34216b8cd8e79c800d53e778eabb352a11b2d4d (patch) | |
| tree | 6b3add07393aae59649ab6445e8dc47f2c943d7e | |
| parent | 0b1ac95fd3becb48993b19024cb5bb74a1658557 (diff) | |
update to version 6.9.13 patch level 24
drop patch merged upstream
| -rw-r--r-- | ImageMagick6.spec | 12 | ||||
| -rw-r--r-- | gs-check.patch | 36 |
2 files changed, 6 insertions, 42 deletions
diff --git a/ImageMagick6.spec b/ImageMagick6.spec index dac873c..5f7bd9e 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.13 -%global Patchlevel 23 +%global Patchlevel 24 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -47,7 +47,7 @@ Name: %{libname} %endif Epoch: 1 Version: %{VER}.%{Patchlevel} -Release: 3%{?dist} +Release: 1%{?dist} Summary: An X application for displaying and manipulating images (legacy) License: ImageMagick Url: https://legacy.imagemagick.org/ @@ -55,8 +55,6 @@ 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) @@ -329,8 +327,6 @@ 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 @@ -580,6 +576,10 @@ fi %changelog +* Wed Mar 19 2025 Remi Collet <remi@remirepo.net> - 6.9.13.24-1 +- update to version 6.9.13 patch level 24 +- drop patch merged upstream + * Sat Mar 15 2025 Remi Collet <remi@remirepo.net> - 6.9.13.23-3 - test build for https://github.com/ImageMagick/ImageMagick6/pull/368 diff --git a/gs-check.patch b/gs-check.patch deleted file mode 100644 index 4fb8ae8..0000000 --- a/gs-check.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 |