1From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
3Date: Tue, 21 May 2019 16:07:46 +0200
4Subject: [PATCH] Add meson option to pass sysroot
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9We need to pass this to meson to help it finding gdesktop-enums.h:
10
11| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist.
12
13Upstream-Status: Inappropriate [OE specific]
14
15Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
16---
17 meson_options.txt             | 1 +
18 panels/background/meson.build | 2 +-
19 2 files changed, 2 insertions(+), 1 deletion(-)
20
21diff --git a/meson_options.txt b/meson_options.txt
22index dbca723..af0f871 100644
23--- a/meson_options.txt
24+++ b/meson_options.txt
25@@ -1,3 +1,4 @@
26+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot')
27 option('documentation', type: 'boolean', value: false, description: 'build documentation')
28 option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
29 option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
30diff --git a/panels/background/meson.build b/panels/background/meson.build
31index 3634c47..459ccfe 100644
32--- a/panels/background/meson.build
33+++ b/panels/background/meson.build
34@@ -25,7 +25,7 @@ common_sources = []
35
36 enums = 'gdesktop-enums-types'
37 enums_header = files(
38-  gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
39+  get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
40   'cc-background-item.h'
41 )
42
43--
442.34.1
45
46