diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch new file mode 100644 index 0000000000..2f09c32997 --- /dev/null +++ b/meta-gnome/recipes-gnome/mutter/files/0001-Dont-use-system-sysprof-dbus-folder.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 790177e2a89aa0710b570d595223bdb511241c56 Mon Sep 17 00:00:00 2001 | ||
2 | From: Gyorgy Sarvari <skandigraun@gmail.com> | ||
3 | Date: Tue, 11 Feb 2025 13:39:54 +0100 | ||
4 | Subject: [PATCH] Don't use system sysprof dbus folder | ||
5 | |||
6 | In case Mutter is built with profiler support, it requires | ||
7 | org.gnome.Sysprof3.Profiler.xml file to be available - however | ||
8 | the meson build file is trying to access it on the build machine's | ||
9 | system ($datadir/dbus-1/interfaces) instead of searching for it | ||
10 | in the $RECIPE_SYSROOT. | ||
11 | |||
12 | To ensure that it looks for this file in the correct folder, prefix | ||
13 | the search path with the value of the sys_root property, which is set | ||
14 | in the meson.cross file (by meson.bbclass). | ||
15 | |||
16 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
17 | |||
18 | Upstream-Status: Inappropriate [oe-specific: only related to cross-compiling] | ||
19 | --- | ||
20 | meson.build | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/meson.build b/meson.build | ||
24 | index 551cb23..5199be6 100644 | ||
25 | --- a/meson.build | ||
26 | +++ b/meson.build | ||
27 | @@ -446,7 +446,7 @@ if have_profiler | ||
28 | |||
29 | if libsysprof_capture_dep.type_name() == 'pkgconfig' | ||
30 | sysprof_dep = dependency('sysprof-6', 'sysprof-4') | ||
31 | - sysprof_dbus_interfaces_dir = sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces' | ||
32 | + sysprof_dbus_interfaces_dir = meson.get_external_property('sys_root') + sysprof_dep.get_variable('datadir') / 'dbus-1' / 'interfaces' | ||
33 | else | ||
34 | sysprof_dbus_interfaces_dir = mutter_srcdir / 'subprojects' / 'sysprof' / 'src' | ||
35 | endif | ||