diff options
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.patch | 50 |
1 files changed, 27 insertions, 23 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 768ba54390..c1bd34d14b 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,45 +1,49 @@ -From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Tue, 21 May 2019 16:07:46 +0200 +From 9b88f816ffbe3dd35d0260974e246f6694983500 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Mon, 18 Mar 2024 05:50:21 +0100 Subject: [PATCH] Add meson option to pass sysroot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -We need to pass this to meson to help it finding gdesktop-enums.h: - -| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. +Signed-off-by: Markus Volk <f_l_k@t-online.de> Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- meson_options.txt | 1 + panels/background/meson.build | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + panels/system/meson.build | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt -index dbca723..af0f871 100644 +index b2302bf..5b9baf5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') + option('deprecated-declarations', type: 'feature', value: 'disabled', description: 'build with deprecated declaration warnings') option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('ibus', type: 'boolean', value: true, description: 'build with IBus support') - option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') + option('location-services', type: 'feature', value: 'enabled', description: 'build with location services') diff --git a/panels/background/meson.build b/panels/background/meson.build -index 3634c47..459ccfe 100644 +index 6ced050..df1f808 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -25,7 +25,7 @@ common_sources = [] +@@ -24,7 +24,7 @@ common_sources += gnome.mkenums_simple( enums = 'gdesktop-enums-types' enums_header = files( -- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', -+ get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', - 'cc-background-item.h' +- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h' + ) + + common_sources += gnome.mkenums( +diff --git a/panels/system/meson.build b/panels/system/meson.build +index 4fee822..979332a 100644 +--- a/panels/system/meson.build ++++ b/panels/system/meson.build +@@ -73,7 +73,7 @@ sources += gnome.compile_resources( + ) + + enums_header = files( +- gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', ++ get_option('oe_sysroot') + gsettings_desktop_dep.get_variable(pkgconfig: 'prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', + 'datetime/cc-datetime-page.h' ) --- -2.34.1 - |