Bastien Roucariès wrote:
> Le lundi 10 février 2025, 19:45:18 UTC Yavor Doganov a écrit :
> > gnustep-gui cannot be built on alpha, hppa, m68k and sh4 because
> > libmagickcore-7.q16-dev is not installable:
>
> Patch welcome will be applied
>
> Agreed with you
Thank you. I tested the attached patch with sbuild on amd64 by
replacing alpha with amd64 in the RSVG_ARCH definition. Then switched
it back to alpha. Please let me know if you see problems of any kind.
diff -Nru imagemagick-7.1.1.43+dfsg1/debian/changelog
imagemagick-7.1.1.43+dfsg1/debian/changelog
--- imagemagick-7.1.1.43+dfsg1/debian/changelog 2024-12-29 13:21:15.000000000
+0200
+++ imagemagick-7.1.1.43+dfsg1/debian/changelog 2025-02-11 19:31:06.000000000
+0200
@@ -1,3 +1,16 @@
+imagemagick (8:7.1.1.43+dfsg1-2) UNRELEASED; urgency=medium
+
+ * debian/rules (RSVG_ARCH): New variable; list of architectures where
+ librsvg is available.
+ * debian/control.d/noquantum.in (Build-Depends): Add ${RSVG_ARCH} to
+ librsvg2-bin and librsvg2-dev (Closes: #1095690).
+ * debian/control.d/quantum.in
+ (libmagickcore-${IMVERSION}.${QUANTUMDEPTH}-dev): Remove librsvg2-dev
+ from Depends; unnecessary.
+ * debian/control: Regenerate.
+
+ -- Yavor Doganov <ya...@gnu.org> Tue, 11 Feb 2025 19:31:06 +0200
+
imagemagick (8:7.1.1.43+dfsg1-1) unstable; urgency=medium
* New upstream version
diff -Nru imagemagick-7.1.1.43+dfsg1/debian/control
imagemagick-7.1.1.43+dfsg1/debian/control
--- imagemagick-7.1.1.43+dfsg1/debian/control 2024-12-29 13:21:15.000000000
+0200
+++ imagemagick-7.1.1.43+dfsg1/debian/control 2025-02-11 19:30:59.000000000
+0200
@@ -1,4 +1,4 @@
-# Autogenerated Sun Dec 29 13:54:19 UTC 2024 from make -f debian/rules
update_pkg
+# Autogenerated Tue Feb 11 19:30:59 EET 2025 from make -f debian/rules
update_pkg
Source: imagemagick
Section: graphics
Priority: optional
@@ -30,7 +30,7 @@
libwmf-dev, libheif-dev, libwebp-dev,
# libgraphviz-dev, incompatible license against fftw
# for converting svg
- libpango1.0-dev, librsvg2-bin, librsvg2-dev, libxml2-dev,
+ libpango1.0-dev, librsvg2-bin [!alpha !hppa !m68k !sh4], librsvg2-dev [!alpha
!hppa !m68k !sh4], libxml2-dev,
# for libraw
libraw-dev,
# for easy symbols of c++ lib
@@ -274,7 +274,7 @@
libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
liblcms2-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
- librsvg2-dev, libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
+ libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
libxt-dev, zlib1g-dev,
libfftw3-dev,
pkgconf,
@@ -483,7 +483,7 @@
libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
liblcms2-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
- librsvg2-dev, libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
+ libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
libxt-dev, zlib1g-dev,
libfftw3-dev,
pkgconf,
diff -Nru imagemagick-7.1.1.43+dfsg1/debian/control.d/noquantum.in
imagemagick-7.1.1.43+dfsg1/debian/control.d/noquantum.in
--- imagemagick-7.1.1.43+dfsg1/debian/control.d/noquantum.in 2024-12-29
13:21:15.000000000 +0200
+++ imagemagick-7.1.1.43+dfsg1/debian/control.d/noquantum.in 2025-02-11
10:33:56.000000000 +0200
@@ -29,7 +29,7 @@
libwmf-dev, libheif-dev, libwebp-dev,
# libgraphviz-dev, incompatible license against fftw
# for converting svg
- libpango1.0-dev, librsvg2-bin, librsvg2-dev, libxml2-dev,
+ libpango1.0-dev, librsvg2-bin ${RSVG_ARCH}, librsvg2-dev ${RSVG_ARCH},
libxml2-dev,
# for libraw
libraw-dev,
# for easy symbols of c++ lib
diff -Nru imagemagick-7.1.1.43+dfsg1/debian/control.d/quantum.in
imagemagick-7.1.1.43+dfsg1/debian/control.d/quantum.in
--- imagemagick-7.1.1.43+dfsg1/debian/control.d/quantum.in 2024-12-29
13:19:45.000000000 +0200
+++ imagemagick-7.1.1.43+dfsg1/debian/control.d/quantum.in 2025-02-11
10:34:29.000000000 +0200
@@ -83,7 +83,7 @@
libbz2-dev, libdjvulibre-dev,
libexif-dev, libfreetype-dev, libjpeg-dev, libopenjp2-7-dev,
liblcms2-dev, liblqr-1-0-dev, libltdl-dev, libopenexr-dev, libpng-dev,
- librsvg2-dev, libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
+ libtiff-dev, libwmf-dev, libx11-dev, libxext-dev, libxml2-dev,
libxt-dev, zlib1g-dev,
libfftw3-dev,
pkgconf,
diff -Nru imagemagick-7.1.1.43+dfsg1/debian/rules
imagemagick-7.1.1.43+dfsg1/debian/rules
--- imagemagick-7.1.1.43+dfsg1/debian/rules 2024-12-29 13:19:45.000000000
+0200
+++ imagemagick-7.1.1.43+dfsg1/debian/rules 2025-02-11 19:30:32.000000000
+0200
@@ -39,6 +39,9 @@
export DEFAULTQUANTUMDEPTH := $(shell echo $(QUANTUMDEPTH) | cut -f 1 -d ' ')
export NOQUANTUMDEPTH := $(shell echo $(QUANTUMDEPTH) | cut -f 1 -d ' ')
+# list of architectures where librsvg is available
+export RSVG_ARCH := [!alpha !hppa !m68k !sh4]
+
# convert used for icons
export MAGICK ?= ./magick.sh magick
export CONVERT ?= $(MAGICK) convert
