summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-control-center
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-control-center')
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch6
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb (renamed from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb)2
2 files changed, 4 insertions, 4 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 7d17817bc..c1bd34d14 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 8e542784b8ca49c655df0f251a1a1dec724a522e Mon Sep 17 00:00:00 2001 1From 9b88f816ffbe3dd35d0260974e246f6694983500 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,14 +13,14 @@ 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 f415a7e..8966632 100644 16index b2302bf..5b9baf5 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('location-services', type: 'feature', value: 'disabled', description: 'build with location services') 23 option('location-services', type: 'feature', value: 'enabled', 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 6ced050..df1f808 100644 25index 6ced050..df1f808 100644
26--- a/panels/background/meson.build 26--- a/panels/background/meson.build
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
index d88c42531..152e803b5 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb
@@ -38,7 +38,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is
38REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" 38REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
39 39
40SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" 40SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
41SRC_URI[archive.sha256sum] = "81792423019deda1d2a074c1ecf6a7e6ef3172c09cbe6f4d7995a4b5dea28312" 41SRC_URI[archive.sha256sum] = "6335c6cb8164e574db521fff61cfa3dfaa55f1db66ae3bca02750a193e1c4f3d"
42 42
43PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" 43PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
44PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper" 44PACKAGECONFIG[cups] = ",,cups,cups system-config-printer cups-pk-helper"