From f72839e76f5df53d67c5f191753198095b6a1c75 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Jul 2026 06:39:50 +0200 Subject: update to version 6.9.13 patch level 51 sources from github open https://github.com/ImageMagick/ImageMagick6/issues/437 soname change --- 0001-Fix-437-revert-soname-change.patch | 65 +++++++++++++++++++++++++++++++++ ImageMagick6.spec | 22 +++++++++-- 2 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 0001-Fix-437-revert-soname-change.patch diff --git a/0001-Fix-437-revert-soname-change.patch b/0001-Fix-437-revert-soname-change.patch new file mode 100644 index 0000000..39a6509 --- /dev/null +++ b/0001-Fix-437-revert-soname-change.patch @@ -0,0 +1,65 @@ +From 9342d1e9687f0430538d93edc949ac638395be74 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 24 Jun 2026 07:45:10 +0200 +Subject: [PATCH] Fix #437 revert soname change + +--- + configure | 4 ++-- + m4/version.m4 | 4 ++-- + magick/libMagickCore.map | 2 +- + wand/libMagickWand.map | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index 5c32fcc57..2b6fd5223 100755 +--- a/configure ++++ b/configure +@@ -5338,8 +5338,8 @@ MAGICK_GIT_REVISION=c1e211d2b:20260621 + + + # Substitute library versioning +-MAGICK_LIBRARY_CURRENT=8 +-MAGICK_LIBRARY_REVISION=0 ++MAGICK_LIBRARY_CURRENT=7 ++MAGICK_LIBRARY_REVISION=1 + MAGICK_LIBRARY_AGE=0 + MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` + +diff --git a/m4/version.m4 b/m4/version.m4 +index d21a5b8d4..e9f11d0e6 100644 +--- a/m4/version.m4 ++++ b/m4/version.m4 +@@ -52,8 +52,8 @@ m4_define([magick_tarname], [ImageMagick]) + # files if you raise these versions. + # + # Bump the minor release # whenever there is an SOVersion bump. +-m4_define([magick_library_current], [8]) +-m4_define([magick_library_revision], [0]) ++m4_define([magick_library_current], [7]) ++m4_define([magick_library_revision], [1]) + m4_define([magick_library_age], [0]) + + m4_define([magickpp_library_current], [9]) +diff --git a/magick/libMagickCore.map b/magick/libMagickCore.map +index 823a45ffa..85297c9a6 100644 +--- a/magick/libMagickCore.map ++++ b/magick/libMagickCore.map +@@ -1,4 +1,4 @@ +- VERS_8.0 { ++ VERS_7.0 { + global: + *; + }; +diff --git a/wand/libMagickWand.map b/wand/libMagickWand.map +index 823a45ffa..85297c9a6 100644 +--- a/wand/libMagickWand.map ++++ b/wand/libMagickWand.map +@@ -1,4 +1,4 @@ +- VERS_8.0 { ++ VERS_7.0 { + global: + *; + }; +-- +2.54.0 + diff --git a/ImageMagick6.spec b/ImageMagick6.spec index 18f95e8..e5f4472 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -9,7 +9,7 @@ # Please preserve changelog entries # %global VER 6.9.13 -%global Patchlevel 50 +%global Patchlevel 51 %global incsuffixe -6 %global libsuffixe -6.Q16 %bcond_without tests @@ -36,6 +36,11 @@ %global libname ImageMagick +%global gh_vend ImageMagick +%global gh_proj ImageMagick6 +%global forgeurl https://github.com/%{gh_vend}/%{gh_proj} +%global tag %{VER}-%{Patchlevel} + %if 0%{?fedora} >= 38 # No need to relocate as ImageMagick is v7 Name: %{libname}6 @@ -53,7 +58,11 @@ License: ImageMagick Url: https://legacy.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz #Source0: https://www.imagemagick.org/download/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz -Source0: https://imagemagick.org/archive/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +#Source0: https://imagemagick.org/archive/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz +%forgemeta +Source0: %{forgesource} + +Patch0: 0001-Fix-437-revert-soname-change.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -329,7 +338,9 @@ however. %prep -%setup -q -n %{libname}-%{VER}-%{Patchlevel} +%forgesetup + +%patch -P0 -p1 -b .soname # for %%doc mkdir Magick++/examples @@ -582,6 +593,11 @@ fi %changelog +* Wed Jun 24 2026 Remi Collet - 6.9.13.51-1 +- update to version 6.9.13 patch level 51 +- sources from github +- open https://github.com/ImageMagick/ImageMagick6/issues/437 soname change + * Fri Jun 5 2026 Remi Collet - 6.9.13.50-1 - update to version 6.9.13 patch level 50 -- cgit