From 2e170b7343c6ce49b1ef6e2aa6793938c488e2a7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 12 Nov 2024 09:21:15 +0100
Subject: update to version 7.1.1 patch level 40

fix ABI break using patch from
  https://github.com/ImageMagick/ImageMagick/pull/7768
---
 ImageMagick7.spec        | 13 +++++++++++--
 revert-map-changes.patch | 30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 revert-map-changes.patch

diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index fb9eb04..8387d29 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -9,7 +9,7 @@
 # Please preserve changelog entries
 #
 %global VER        7.1.1
-%global Patchlevel 39
+%global Patchlevel 40
 %global incsuffixe -7
 %global libsuffixe -7.Q16HDRI
 %bcond_without tests
@@ -55,7 +55,7 @@ Version:        %{VER}.%{Patchlevel}
 Release:        1%{?dist}
 Summary:        An X application for displaying and manipulating images
 License:        ImageMagick
-Url:            http://www.imagemagick.org/
+Url:            https://imagemagick.org/
 #Source0:        ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
 #Source0:        ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
 #Source0:        https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz
@@ -63,6 +63,8 @@ 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:         revert-map-changes.patch
+
 BuildRequires:  gnupg2
 BuildRequires:  autoconf automake make
 BuildRequires:  gcc
@@ -348,6 +350,8 @@ however.
 %{?gpgverify: %{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0}}
 %setup -q -n %{libname}-%{VER}-%{Patchlevel}
 
+%patch -P0 -p1
+
 # for %%doc
 mkdir Magick++/examples
 cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -597,6 +601,11 @@ fi
 
 
 %changelog
+* Tue Nov 12 2024 Remi Collet <remi@remirepo.net> - 7.1.1.40-1
+- update to version 7.1.1 patch level 40
+- fix ABI break using patch from
+  https://github.com/ImageMagick/ImageMagick/pull/7768
+
 * Mon Oct  7 2024 Remi Collet <remi@remirepo.net> - 7.1.1.39-1
 - update to version 7.1.1 patch level 39
 
diff --git a/revert-map-changes.patch b/revert-map-changes.patch
new file mode 100644
index 0000000..3d79921
--- /dev/null
+++ b/revert-map-changes.patch
@@ -0,0 +1,30 @@
+From 8de691a078d95e1f2b75ac2fe940fd2478d6b99f Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 12 Nov 2024 07:26:09 +0100
+Subject: [PATCH] revert map changes breaking ABI
+
+---
+ MagickCore/libMagickCore.map | 2 +-
+ MagickWand/libMagickWand.map | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/MagickCore/libMagickCore.map b/MagickCore/libMagickCore.map
+index 8da9bba7866..7437b0499a6 100644
+--- a/MagickCore/libMagickCore.map
++++ b/MagickCore/libMagickCore.map
+@@ -1,4 +1,4 @@
+- VERS_10.2 {
++ VERS_10.0 {
+      	 global:
+      		 *;
+      };
+diff --git a/MagickWand/libMagickWand.map b/MagickWand/libMagickWand.map
+index 8da9bba7866..7437b0499a6 100644
+--- a/MagickWand/libMagickWand.map
++++ b/MagickWand/libMagickWand.map
+@@ -1,4 +1,4 @@
+- VERS_10.2 {
++ VERS_10.0 {
+      	 global:
+      		 *;
+      };
-- 
cgit