summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gimp
diff options
context:
space:
mode:
authorGyorgy Sarvari <skandigraun@gmail.com>2026-02-03 19:53:24 +0100
committerKhem Raj <raj.khem@gmail.com>2026-02-06 10:06:20 -0800
commitdc3791d2c4fc01833691699e3f612b5d732f5603 (patch)
treedeb0c1a2e4ba4a92c531a66f9aa1577e30f262f6 /meta-gnome/recipes-gimp
parentd3cdd51235558066c685ee66e0b20ac54819bcfb (diff)
downloadmeta-openembedded-dc3791d2c4fc01833691699e3f612b5d732f5603.tar.gz
gimp: patch libunwind detection
Gimp 3.0.8's meson file detects the presence of libunwind incorrectly, making it fail on some platforms (e.g. x86 + musl + clang), even when libunwind is explicitly disabled: | <snip>i686-oe-linux-musl-ld: app/core/libappcore.a.p/gimpbacktrace-linux.c.o: in function `gimp_backtrace_get_address_info': | /usr/src/debug/gimp/3.0.8/../sources/gimp-3.0.8/app/core/gimpbacktrace-linux.c:708:(.text+0xbd7): undefined reference to `_ULx86_init_local' This backported patch fixes this. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gimp')
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch51
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb1
2 files changed, 52 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch
new file mode 100644
index 0000000000..879529b80e
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch
@@ -0,0 +1,51 @@
1From 8862f36fcec74152afeee2a99c0e04b84b6cf5b3 Mon Sep 17 00:00:00 2001
2From: Bruno Lopes <brunvonlope@outlook.com>
3Date: Sun, 25 Jan 2026 11:11:48 -0300
4Subject: [PATCH] meson: Fix libunwind header detection on non-macOS platforms
5
6Closes: #15750
7
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/1aa51ca0637db88a4ea958d03fa6692e6ac0289b]
9Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
10---
11 meson.build | 17 ++++++++++-------
12 1 file changed, 10 insertions(+), 7 deletions(-)
13
14diff --git a/meson.build b/meson.build
15index 2192968..cfa1f71 100644
16--- a/meson.build
17+++ b/meson.build
18@@ -731,11 +731,14 @@ conf.set('HAVE_LIBBACKTRACE', libbacktrace.found())
19 ## Check for libunwind
20 # In most platforms, unw_*() functions are in the libunwind library.
21 # In macOS, it is on libSystem (there we only need the SDK header).
22-libunwind = ( get_option('libunwind')
23- ? dependency('libunwind', version: '>=1.1.0', required: false)
24- : no_dep
25-)
26-have_unwind = libunwind.found() or cc.has_header('libunwind.h', required: false)
27+libunwind = no_dep
28+if get_option('libunwind')
29+ libunwind = dependency('libunwind', version: '>=1.1.0', required: false)
30+ libunwind_h = platform_osx ? cc.has_header('libunwind.h', required: false) : false
31+ have_unwind = libunwind.found() or libunwind_h
32+else
33+ have_unwind = false
34+endif
35 conf.set('HAVE_LIBUNWIND', have_unwind ? 1 : false)
36
37 ## Check for backtrace() API
38@@ -758,11 +761,11 @@ if platform_windows
39 elif platform_linux
40 if not have_execinfo_h
41 dashboard_backtrace='no (missing: execinfo.h)'
42- elif not libbacktrace.found() and not libunwind.found()
43+ elif not libbacktrace.found() and not have_unwind
44 dashboard_backtrace='rough (missing: libbacktrace and libunwind)'
45 elif not libbacktrace.found()
46 dashboard_backtrace='partially detailed (missing: libbacktrace)'
47- elif not libunwind.found()
48+ elif not have_unwind
49 dashboard_backtrace='partially detailed (missing: libunwind)'
50 else
51 dashboard_backtrace='detailed'
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb
index 863d9a1667..860fb5d26b 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb
@@ -60,6 +60,7 @@ SRC_URI = "https://download.gimp.org/gimp/v3.0/${BP}.tar.xz \
60 file://0002-meson.build-reproducibility-fix.patch \ 60 file://0002-meson.build-reproducibility-fix.patch \
61 file://0001-meson.build-dont-check-for-lgi.patch \ 61 file://0001-meson.build-dont-check-for-lgi.patch \
62 file://0001-meson.build-require-iso-codes-native.patch \ 62 file://0001-meson.build-require-iso-codes-native.patch \
63 file://0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch \
63 " 64 "
64SRC_URI[sha256sum] = "feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386" 65SRC_URI[sha256sum] = "feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386"
65 66