Skip to content

Commit

Permalink
gimp: adapt for renamed gdk-pixbuf svg module
Browse files Browse the repository at this point in the history
Cherry-pick change that was proposed to upstream.
  • Loading branch information
mmuetzel committed Nov 17, 2024
1 parent d37ed7d commit 039f4e8
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 2b0b73b0a1f9564874939f335675091f66c43050 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <[email protected]>
Date: Sat, 16 Nov 2024 17:16:01 +0100
Subject: [PATCH] build: fix svg pixbuf loader check with librsvg 2.59+

Since librsvg moved to meson the loader modules are named differently
and building gimp2 on Windows fails to detect them in configure.

Adjust the checks to the new filenames.
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 71b71397ece..6f405ad6766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2504,8 +2504,8 @@ if test "x$enable_vector_icons" != "xno"; then
# error: cannot check for file existence when cross compiling
# So let's test files the shell way.
if (test "x$platform_win32" = "xyes" &&
- test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.dll") ||
- test -f "$gdk_pixbuf_moduledir/libpixbufloader-svg.so"; then
+ test -f "$gdk_pixbuf_moduledir/pixbufloader_svg.dll") ||
+ test -f "$gdk_pixbuf_moduledir/libpixbufloader_svg.so"; then
# We must not use $PKG_CONFIG nor PKG_CHECK_* macros because we need
# to make sure we use the native pkg-config (in case we cross-compile).
if pkg-config --atleast-version=glib_required_version glib-2.0 &&
--
GitLab

3 changes: 3 additions & 0 deletions mingw-w64-gimp/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ source=(https://download.gimp.org/pub/gimp/v${pkgver%.*}/${_realname}-${pkgver}.
0005-fix-link-python-plugins.patch
0007-clang-rc-files-fix.patch
0008-avoid-incompatible-pointer-cast.patch::https://gitlab.gnome.org/GNOME/gimp/-/commit/24df4f1fc800f11e44c44f8036e7d8d7ee90b62a.patch
0009-build-fix-svg-pixbuf-loader-check-with-librsvg-2.59.patch
https://gitlab.gnome.org/GNOME/gimp/-/commit/13284c8953b43e349dc94a6c5bcc9dbf4e98533f.patch)
sha256sums=('50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e'
'f7f9badc547f1a0317b95e012530db8df63b7c7038c9d9ff8d0b510c86f43439'
Expand All @@ -65,6 +66,7 @@ sha256sums=('50a845eec11c8831fe8661707950f5b8446e35f30edfb9acf98f85c1133f856e'
'01651bb582b2120aae67752f6a28c0750ea690d46259d855e28f8b18da567bf5'
'f4f8258b352530b0f9dd1ebd4f4730125caa4d047ca17bf9e5180b52be19c117'
'49f8078b10bcd5fe98236e51a3272651f80be630ae97ab2ec9aa00bd9c7ef503'
'1a733dec028116e2d891a830e7935a84bde22a31fa58759bf43bdf751c77e3b8'
'3d346b0d7cb9ab534501f5e1a5d543a54dc16bb16b884a2fc42382c6a5b82cbf')

apply_patch_with_msg() {
Expand All @@ -85,6 +87,7 @@ prepare() {
0005-fix-link-python-plugins.patch \
0007-clang-rc-files-fix.patch \
0008-avoid-incompatible-pointer-cast.patch \
0009-build-fix-svg-pixbuf-loader-check-with-librsvg-2.59.patch \
13284c8953b43e349dc94a6c5bcc9dbf4e98533f.patch

sed -e "s|-Wl,-rpath '-Wl,\$\$ORIGIN/../lib'||g" -i app/Makefile.am
Expand Down

0 comments on commit 039f4e8

Please sign in to comment.