Signed-off-by: Markus Volk <[email protected]
<mailto:[email protected]>>
---
.../0001-Add-meson-option-to-pass-sysroot.patch | 16
++++++++--------
...nter_44.3.bb => gnome-control-center_45.0.bb} | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
rename
meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_44.3.bb
=> gnome-control-center_45.0.bb} (87%)
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 5c0eee576..7cd7c0469 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
@@ -19,7 +19,7 @@ Signed-off-by: Andreas Müller
<[email protected]>
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/meson_options.txt b/meson_options.txt
-index dbca723..af0f871 100644
+index 8ee7b6e0e..7e6adc668 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,4 @@
@@ -28,28 +28,28 @@ index dbca723..af0f871 100644
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')
diff --git a/panels/background/meson.build
b/panels/background/meson.build
-index 69af0cfea..6edcaa5ff 100644
+index 9bf543538..97f1e0117 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -19,7 +19,7 @@ common_sources = []
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',
+- 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',
'cc-background-item.h'
)
diff --git a/panels/datetime/meson.build
b/panels/datetime/meson.build
-index 3b6f5e197..30b207882 100644
+index 8cb3b63f0..8c5a45e7c 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
-@@ -45,7 +45,7 @@ sources = files(
+@@ -37,7 +37,7 @@ sources = files(
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',
+- 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',
'cc-datetime-panel.h'
)
diff --git
a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.3.bb
b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb
similarity index 87%
rename from
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.3.bb
rename to
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb
index 0066f5885..1122ee5ea 100644
---
a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.3.bb
+++
b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_45.0.bb
@@ -28,6 +28,8 @@ DEPENDS = " \
polkit \
pulseaudio \
samba \
+ setxkbmap-native \
+ tecla \
udisks2 \
upower \
"
@@ -37,16 +39,14 @@ inherit gtk-icon-cache pkgconfig gnomebase
gsettings gettext upstream-version-is
REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
<file://0001-add-meson-option-to-pass-sysroot.patch/>
-SRC_URI[archive.sha256sum] =
"066a65052fc3ecfae860025e85f797e6ab2b87a58c4f8ab9c66ec20718a80c7a"
+SRC_URI[archive.sha256sum] =
"83df6a90f98914f2c19a872ce06562acef40927637f679c383099265ccfa42cf"
PACKAGECONFIG ??= "ibus ${@bb.utils.filter
<mailto:${@bb.utils.filter>('DISTRO_FEATURES', 'wayland', d)}"
PACKAGECONFIG[cups] = ",,cups,cups"
PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus"
PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland"
-EXTRA_OEMESON = " \
- -Doe_sysroot=${STAGING_DIR_HOST} \
-"
+EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM:${PN} = "--system --no-create-home --user-group
--home-dir ${sysconfdir}/polkit-1 polkitd"
@@ -66,4 +66,4 @@ FILES:${PN} += " \
FILES:${PN}-dev += "${datadir}/gettext"
-RDEPENDS:${PN} += "gsettings-desktop-schemas"
+RDEPENDS:${PN} += "gsettings-desktop-schemas tecla"
--
2.42.0
