summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gimp
diff options
context:
space:
mode:
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/0001-meson.build-require-iso-codes-native.patch35
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch51
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch (renamed from meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch)0
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb (renamed from meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb)17
-rw-r--r--meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb10
6 files changed, 70 insertions, 94 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
deleted file mode 100644
index 879529b80e..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
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/0001-meson.build-require-iso-codes-native.patch b/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch
deleted file mode 100644
index ffb8ef29df..0000000000
--- a/meta-gnome/recipes-gimp/gimp/gimp/0001-meson.build-require-iso-codes-native.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Fri, 28 Mar 2025 01:33:00 +0100
4Subject: [PATCH] meson.build: require iso-codes-native
5
6This fixes:
7FAILED: app/widgets/gimplanguagestore-data.h
8/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages
9gimp_language_store_parser_init: 0.006277 seconds
10ERROR: parse_iso_codes: error parsing '/usr/share/xml/iso-codes/iso_639_3.xml': No such file or directory
11
12Upstream-Status: Denied [https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2185]
13Upstream argues that iso-codes locale (.mo files) are required on the target
14
15Signed-off-by: Markus Volk <f_l_k@t-online.de>
16---
17 meson.build | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/meson.build b/meson.build
21index efbc2d8175..fd050f4d3c 100644
22--- a/meson.build
23+++ b/meson.build
24@@ -1135,7 +1135,7 @@ endif
25 ################################################################################
26 # ISO codes
27
28-isocodes = dependency('iso-codes', required: false)
29+isocodes = dependency('iso-codes', required: false, native: true)
30 if isocodes.found()
31 isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
32 isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
33--
342.49.0
35
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch
new file mode 100644
index 0000000000..826d3394ad
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch
@@ -0,0 +1,51 @@
1From 8ccd12d6ec3330e9646ae9db6fd491226d516dc3 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Fri, 28 Mar 2025 01:33:00 +0100
4Subject: [PATCH] meson.build: use relative path for ISO_CODES_LOCATION
5
6If the host system does not provide iso-codes, the build fails with the following message:
7FAILED: app/widgets/gimplanguagestore-data.h
8/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/gimp/3.0.2/build/tools/gen-languages
9gimp_language_store_parser_init: 0.006277 seconds
10ERROR: parse_iso_codes: Error parsing ‘/usr/share/xml/iso-codes/iso_639_3.xml’: No such file or directory
11
12So far, we have worked around the problem by using the “iso-codes-native” dependency, but the path
13for 'isocodes_prefix' is then generated from the native pkgconfig entry, resulting in a hard-coded path to
14${STAGING_DATADIR_NATIVE}, which then leaks into the binaries of gimp and gimp-console.
15
16Instead, use iso-codes for the target and adjust the path stored in ISO_CODES_LOCATION
17(which is used in tools/gen-languages.c) to a relative path so that the build system can find it.
18
19This allows us to depend on iso-codes for the target system, while still working on host systems that
20do not provide iso-codes.
21
22It also fixes a reproducibility issue:
23ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-console-3.2 in package gimp contains reference to TMPDIR [buildpaths]
24ERROR: gimp-3.2.0-r0 do_package_qa: QA Issue: File /usr/bin/gimp-3.2 in package gimp contains reference to TMPDIR [buildpaths]
25ERROR: gimp-3.2.0-r0 do_package_qa: Fatal QA errors were found, failing task.
26ERROR: Logfile of failure stored in: /home/flk/bitbake-builds/poky/build/tmp/work/corei7-64-oe-linux/gimp/3.2.0/temp/log.do_package_qa.597065
27ERROR: Task (/home/flk/bitbake-builds/poky/layers/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb:do_package_qa) failed with exit code '1'
28
29Upstream-Status: Inappropriate [oe-specific]
30
31Signed-off-by: Markus Volk <f_l_k@t-online.de>
32---
33 meson.build | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/meson.build b/meson.build
37index efbc2d8175..fd050f4d3c 100644
38--- a/meson.build
39+++ b/meson.build
40@@ -1184,7 +1184,7 @@
41 isocodes_prefix = isocodes.get_variable(pkgconfig: 'prefix')
42 isocodes_location = isocodes_prefix / 'share' / 'xml' / 'iso-codes'
43 isocodes_localedir= isocodes_prefix / 'share' / 'locale'
44- conf.set_quoted('ISO_CODES_LOCATION', isocodes_location)
45+ conf.set_quoted('ISO_CODES_LOCATION', '..' / 'recipe-sysroot' / 'usr' / 'share' / 'xml' / 'iso-codes')
46 conf.set_quoted('ISO_CODES_LOCALEDIR', isocodes_localedir)
47 endif
48 conf.set('HAVE_ISO_CODES', isocodes.found())
49--
502.49.0
51
diff --git a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch
index 532715d588..532715d588 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp/0002-meson.build-reproducibility-fix.patch
+++ b/meta-gnome/recipes-gimp/gimp/gimp/0003-meson.build-reproducibility-fix.patch
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb
index 5cbb94055a..d6928498ac 100644
--- a/meta-gnome/recipes-gimp/gimp/gimp_3.0.8.bb
+++ b/meta-gnome/recipes-gimp/gimp/gimp_3.2.0.bb
@@ -20,7 +20,7 @@ DEPENDS = " \
20 glib-2.0-native \ 20 glib-2.0-native \
21 gtk+3 \ 21 gtk+3 \
22 harfbuzz \ 22 harfbuzz \
23 iso-codes-native \ 23 iso-codes \
24 jpeg \ 24 jpeg \
25 json-glib \ 25 json-glib \
26 lcms \ 26 lcms \
@@ -32,7 +32,7 @@ DEPENDS = " \
32 librsvg-native \ 32 librsvg-native \
33 libxmu \ 33 libxmu \
34 libxslt-native \ 34 libxslt-native \
35 mypaint-brushes-1.0 \ 35 mypaint-brushes \
36 pango \ 36 pango \
37 poppler \ 37 poppler \
38 poppler-data \ 38 poppler-data \
@@ -48,6 +48,8 @@ LDFLAGS:append:libc-musl = " -lexecinfo"
48 48
49inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala bash-completion 49inherit meson gtk-icon-cache mime-xdg pkgconfig gettext gobject-introspection vala bash-completion
50 50
51REQUIRED_DISTRO_FEATURES = "x11"
52
51GIR_MESON_OPTION = 'can-crosscompile-gir' 53GIR_MESON_OPTION = 'can-crosscompile-gir'
52VALA_MESON_OPTION = "vala" 54VALA_MESON_OPTION = "vala"
53VALA_MESON_ENABLE_FLAG = "enabled" 55VALA_MESON_ENABLE_FLAG = "enabled"
@@ -56,13 +58,12 @@ GIDOCGEN_MESON_OPTION = "gi-docgen"
56GIDOCGEN_MESON_ENABLE_FLAG = "enabled" 58GIDOCGEN_MESON_ENABLE_FLAG = "enabled"
57GIDOCGEN_MESON_DISABLE_FLAG = "disabled" 59GIDOCGEN_MESON_DISABLE_FLAG = "disabled"
58 60
59SRC_URI = "https://download.gimp.org/gimp/v3.0/${BP}.tar.xz \ 61SRC_URI = "https://download.gimp.org/gimp/v3.2/${BP}.tar.xz \
60 file://0002-meson.build-reproducibility-fix.patch \
61 file://0001-meson.build-dont-check-for-lgi.patch \ 62 file://0001-meson.build-dont-check-for-lgi.patch \
62 file://0001-meson.build-require-iso-codes-native.patch \ 63 file://0002-meson.build-use-relative-path-for-ISO_CODES_LOCATION.patch \
63 file://0001-meson-Fix-libunwind-header-detection-on-non-macOS-pl.patch \ 64 file://0003-meson.build-reproducibility-fix.patch \
64 " 65"
65SRC_URI[sha256sum] = "feb498acc01b26827cff1ff95aa8fb82cdd6a60d7abf773cfcd19abeafca3386" 66SRC_URI[sha256sum] = "2618391416e51be3c693df9ef90e3860ed72ab3d36363ea1f196e30b75b2e083"
66 67
67PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib" 68PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
68PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" 69PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
diff --git a/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb
new file mode 100644
index 0000000000..4e444938b1
--- /dev/null
+++ b/meta-gnome/recipes-gimp/mypaint/mypaint-brushes_2.0.2.bb
@@ -0,0 +1,10 @@
1SUMMARY = "MyPaint brushes"
2LICENSE = "CC0-1.0"
3LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032"
4
5inherit autotools allarch
6
7SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=master;tag=v${PV}"
8SRCREV = "0df6d130152a94c3bd67709941978074a1303cc5"
9
10FILES:${PN} += "${datadir}/mypaint-data"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-03-20 14:14:53 +0000