summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-12-10 09:59:26 +0100
committerRemi Collet <remi@php.net>2025-12-10 09:59:26 +0100
commit00602bd5665c187ecd200bfd9e4e1b12ae142888 (patch)
tree3947209b67f6764c4b94ebf62e132a2f583e0fe3
parentc816b92a21e0512fdc5f488da3ba30bc425fcebc (diff)
add upstream patch for GraphicsMagick
-rw-r--r--upstream.patch26
-rw-r--r--vips.spec3
2 files changed, 29 insertions, 0 deletions
diff --git a/upstream.patch b/upstream.patch
new file mode 100644
index 0000000..8ce691c
--- /dev/null
+++ b/upstream.patch
@@ -0,0 +1,26 @@
+From 57b759ff26257c956f799b5c1bfe276688913e88 Mon Sep 17 00:00:00 2001
+From: Kleis Auke Wolthuizen <github@kleisauke.nl>
+Date: Tue, 9 Dec 2025 20:20:06 +0100
+Subject: [PATCH] Fix build against GraphicsMagick (#4798)
+
+GraphicsMagick does not provide the `MagickPathExtent` definition,
+use `MaxPathExtent` instead.
+
+Resolves: #4796.
+---
+ libvips/foreign/magick6load.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libvips/foreign/magick6load.c b/libvips/foreign/magick6load.c
+index b809fae301..83055b7492 100644
+--- a/libvips/foreign/magick6load.c
++++ b/libvips/foreign/magick6load.c
+@@ -1120,7 +1120,7 @@ vips_foreign_load_magick_source_header(VipsForeignLoad *load)
+ const char *filename =
+ vips_connection_filename(VIPS_CONNECTION(magick_source->source));
+
+- g_strlcpy(magick->image_info->filename, filename, MagickPathExtent);
++ g_strlcpy(magick->image_info->filename, filename, MaxPathExtent);
+ magick_sniff_file(magick->image_info, filename);
+ magick->image = ReadImage(magick->image_info, magick->exception);
+ }
diff --git a/vips.spec b/vips.spec
index 8dcdefc..a139b14 100644
--- a/vips.spec
+++ b/vips.spec
@@ -77,6 +77,8 @@ License: LGPL-2.1-or-later
URL: https://www.libvips.org/
Source0: https://github.com/libvips/libvips/releases/download/v%{vips_tagver}/vips-%{vips_tagver}.tar.xz
+Patch0: upstream.patch
+
BuildRequires: gcc
BuildRequires: gcc-c++
# see https://github.com/libvips/libvips/issues/4558
@@ -321,6 +323,7 @@ exit 1
%endif
%setup -q -n vips-%{vips_version}
+%patch -P0 -p1
cat << 'EOF' | tee DOC_README