From b3ec1cc7466551475b7bd8bf92ef27861963d283 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Mar 2025 10:24:21 +0100
Subject: update to version 7.1.1 patch level 46
drop patch merged upstream
---
ImageMagick7.spec | 12 ++++++------
gs-check.patch | 36 ------------------------------------
2 files changed, 6 insertions(+), 42 deletions(-)
delete mode 100644 gs-check.patch
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 113d8ff..0066c34 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
# Please preserve changelog entries
#
%global VER 7.1.1
-%global Patchlevel 45
+%global Patchlevel 46
%global incsuffixe -7
%global libsuffixe -7.Q16HDRI
%bcond_without tests
@@ -52,7 +52,7 @@ Name: %{libname}7
%endif
Epoch: 1
Version: %{VER}.%{Patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: An X application for displaying and manipulating images
License: ImageMagick
Url: https://imagemagick.org/
@@ -63,8 +63,6 @@ Source0: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Pat
Source1: https://imagemagick.org/archive/releases/%{libname}-%{VER}-%{Patchlevel}.tar.xz.asc
Source2: ImageMagick.keyring
-Patch0: gs-check.patch
-
BuildRequires: gnupg2
BuildRequires: autoconf automake make
BuildRequires: gcc
@@ -352,8 +350,6 @@ however.
%{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
%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
@@ -603,6 +599,10 @@ fi
%changelog
+* Wed Mar 19 2025 Remi Collet <remi@remirepo.net> - 7.1.1.46-1
+- update to version 7.1.1 patch level 46
+- drop patch merged upstream
+
* Sat Mar 15 2025 Remi Collet <remi@remirepo.net> - 7.1.1.45-2
- test build for https://github.com/ImageMagick/ImageMagick/pull/8034
diff --git a/gs-check.patch b/gs-check.patch
deleted file mode 100644
index 8c3c952..0000000
--- a/gs-check.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b98315e78285d04c7e6332319782042a9d3f1c53 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Sat, 15 Mar 2025 07:32:11 +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 226fac1eca4..5ade160a93a 100755
---- a/configure
-+++ b/configure
-@@ -38796,6 +38796,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 a748b11d150..d672943e1eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3864,6 +3864,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>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
-+ GSAlphaDevice=pngalpha
- else
- GSAlphaDevice=$GSColorDevice
- fi
--
cgit