public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ImageMagick] epel9: Fix build
@ 2026-09-18  7:19 Luya Tshimbalanga
  0 siblings, 0 replies; only message in thread
From: Luya Tshimbalanga @ 2026-09-18  7:19 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/ImageMagick
Branch : epel9
Commit : de93250286188c1c2b310f5f9b5dde95e5d16386
Author : Luya Tshimbalanga <luya@fedoraproject.org>
Date   : 2026-09-18T00:19:10-07:00
Stats  : +2/-68 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ImageMagick/c/de93250286188c1c2b310f5f9b5dde95e5d16386?branch=epel9

Log:
Fix build

---
diff --git a/0001-Fix-437-revert-soname-change.patch b/0001-Fix-437-revert-soname-change.patch
deleted file mode 100644
index 39a6509..0000000
--- a/0001-Fix-437-revert-soname-change.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9342d1e9687f0430538d93edc949ac638395be74 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-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/ImageMagick.spec b/ImageMagick.spec
index c38af3a..381b242 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -19,8 +19,6 @@ License:        ImageMagick
 Url:            https://legacy.imagemagick.org/
 Source0:        https://download.imagemagick.org/archive/%{name}-%{VER}-%{Patchlevel}.tar.xz
 
-Patch0:         0001-Fix-437-revert-soname-change.patch
-
 BuildRequires:  pkgconfig(bzip2), pkgconfig(freetype2), pkgconfig(libjpeg), pkgconfig(libpng)
 BuildRequires:  pkgconfig(libtiff-4), giflib-devel, pkgconfig(zlib), perl-devel >= 5.8.1
 BuildRequires:  perl-generators
@@ -320,7 +318,7 @@ rm PerlMagick/demo/Generic.ttf
 
 %files c++
 %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README
-%doc www/Magick++/COPYING
+#%%doc www/Magick++/COPYING
 %{_libdir}/libMagick++-6.Q16.so.9*
 
 %files c++-devel
@@ -342,6 +340,7 @@ rm PerlMagick/demo/Generic.ttf
 %changelog
 * Fri Sep 18 2026 Luya Tshimbalanga <luya@fedoraproject.org> - 1:6.9.13.56-1
 - Update to version 6.9.13.56
+- Drop soname patch file
 
 * Wed Jul 22 2026 Remi Collet <remi@fedoraproject.org>  - 1:6.9.13.52-2
 - add upstream patch to revert soname change

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-18  7:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-18  7:19 [rpms/ImageMagick] epel9: Fix build Luya Tshimbalanga

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox