diff options
Diffstat (limited to 'meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch')
-rw-r--r-- | meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch b/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch new file mode 100644 index 0000000000..4573bb635a --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Cord-Landwehr <cordlandwehr@kde.org> | ||
3 | Date: Sun, 6 Feb 2022 17:23:46 +0100 | ||
4 | Subject: [PATCH] Consider pkgconfig sysroot for pkgdatadir | ||
5 | |||
6 | For libs/cflags this is done automatically, but not for manually accessed | ||
7 | variables. This matches what wayland-protocols does. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/272] | ||
10 | --- | ||
11 | src/meson.build | 6 +++--- | ||
12 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/src/meson.build b/src/meson.build | ||
15 | index a8a1d2b..721e151 100644 | ||
16 | --- a/src/meson.build | ||
17 | +++ b/src/meson.build | ||
18 | @@ -65,7 +65,7 @@ if get_option('scanner') | ||
19 | version: meson.project_version(), | ||
20 | variables: [ | ||
21 | 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), | ||
22 | - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), | ||
23 | + 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()), | ||
24 | 'bindir=' + join_paths('${prefix}', get_option('bindir')), | ||
25 | 'wayland_scanner=${bindir}/wayland-scanner' | ||
26 | ], | ||
27 | @@ -211,7 +211,7 @@ if get_option('libraries') | ||
28 | filebase: 'wayland-server', | ||
29 | variables: [ | ||
30 | 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), | ||
31 | - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) | ||
32 | + 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) | ||
33 | ] | ||
34 | ) | ||
35 | |||
36 | @@ -250,7 +250,7 @@ if get_option('libraries') | ||
37 | filebase: 'wayland-client', | ||
38 | variables: [ | ||
39 | 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), | ||
40 | - 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) | ||
41 | + 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) | ||
42 | ] | ||
43 | ) | ||
44 | |||
45 | -- | ||
46 | 2.37.2 | ||