summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch')
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch13
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
index 4ae923f87..7d17817bc 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch
@@ -1,4 +1,4 @@
1From 1a48df2a8da44410bbd767c2420d363f6180c79a Mon Sep 17 00:00:00 2001 1From 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de> 2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 18 Mar 2024 05:50:21 +0100 3Date: Mon, 18 Mar 2024 05:50:21 +0100
4Subject: [PATCH] Add meson option to pass sysroot 4Subject: [PATCH] Add meson option to pass sysroot
@@ -13,16 +13,16 @@ Upstream-Status: Inappropriate [OE specific]
13 3 files changed, 3 insertions(+), 2 deletions(-) 13 3 files changed, 3 insertions(+), 2 deletions(-)
14 14
15diff --git a/meson_options.txt b/meson_options.txt 15diff --git a/meson_options.txt b/meson_options.txt
16index e53d6e3f3..8fae4c824 100644 16index f415a7e..8966632 100644
17--- a/meson_options.txt 17--- a/meson_options.txt
18+++ b/meson_options.txt 18+++ b/meson_options.txt
19@@ -1,3 +1,4 @@ 19@@ -1,3 +1,4 @@
20+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') 20+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot')
21 option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') 21 option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings')
22 option('documentation', type: 'boolean', value: false, description: 'build documentation') 22 option('documentation', type: 'boolean', value: false, description: 'build documentation')
23 option('ibus', type: 'boolean', value: true, description: 'build with IBus support') 23 option('location-services', type: 'feature', value: 'disabled', description: 'build with location services')
24diff --git a/panels/background/meson.build b/panels/background/meson.build 24diff --git a/panels/background/meson.build b/panels/background/meson.build
25index 6ced050f9..df1f80896 100644 25index 6ced050..df1f808 100644
26--- a/panels/background/meson.build 26--- a/panels/background/meson.build
27+++ b/panels/background/meson.build 27+++ b/panels/background/meson.build
28@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( 28@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple(
@@ -35,7 +35,7 @@ index 6ced050f9..df1f80896 100644
35 35
36 common_sources += gnome.mkenums( 36 common_sources += gnome.mkenums(
37diff --git a/panels/system/meson.build b/panels/system/meson.build 37diff --git a/panels/system/meson.build b/panels/system/meson.build
38index 4fee82210..979332a0e 100644 38index 4fee822..979332a 100644
39--- a/panels/system/meson.build 39--- a/panels/system/meson.build
40+++ b/panels/system/meson.build 40+++ b/panels/system/meson.build
41@@ -73,7 +73,7 @@ sources += gnome.compile_resources( 41@@ -73,7 +73,7 @@ sources += gnome.compile_resources(
@@ -47,6 +47,3 @@ index 4fee82210..979332a0e 100644
47 'datetime/cc-datetime-page.h' 47 'datetime/cc-datetime-page.h'
48 ) 48 )
49 49
50--
512.44.0
52