diff options
author | Markus Volk <f_l_k@t-online.de> | 2023-06-06 18:49:07 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-06-06 10:01:15 -0700 |
commit | 8d595d2dadcd43486300b9e99a7d5711b90ba192 (patch) | |
tree | e4abff9321c5ab7fabd8e890815831783cb7668a | |
parent | dd3ce95fb04ef26c54520622933263dfc5f97c0e (diff) | |
download | meta-openembedded-8d595d2dadcd43486300b9e99a7d5711b90ba192.tar.gz |
gnome-control-center: upgrade 44.1 -> 44.2
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch | 17 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb (renamed from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb) | 2 |
2 files changed, 16 insertions, 3 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 11ad30eda..5c0eee576 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 | |||
@@ -28,10 +28,10 @@ index dbca723..af0f871 100644 | |||
28 | option('ibus', type: 'boolean', value: true, description: 'build with IBus support') | 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') | 29 | option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') |
30 | diff --git a/panels/background/meson.build b/panels/background/meson.build | 30 | diff --git a/panels/background/meson.build b/panels/background/meson.build |
31 | index 3634c47..459ccfe 100644 | 31 | index 69af0cfea..6edcaa5ff 100644 |
32 | --- a/panels/background/meson.build | 32 | --- a/panels/background/meson.build |
33 | +++ b/panels/background/meson.build | 33 | +++ b/panels/background/meson.build |
34 | @@ -25,7 +25,7 @@ common_sources = [] | 34 | @@ -19,7 +19,7 @@ common_sources = [] |
35 | 35 | ||
36 | enums = 'gdesktop-enums-types' | 36 | enums = 'gdesktop-enums-types' |
37 | enums_header = files( | 37 | enums_header = files( |
@@ -40,5 +40,18 @@ index 3634c47..459ccfe 100644 | |||
40 | 'cc-background-item.h' | 40 | 'cc-background-item.h' |
41 | ) | 41 | ) |
42 | 42 | ||
43 | diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build | ||
44 | index 3b6f5e197..30b207882 100644 | ||
45 | --- a/panels/datetime/meson.build | ||
46 | +++ b/panels/datetime/meson.build | ||
47 | @@ -45,7 +45,7 @@ sources = files( | ||
48 | |||
49 | enums = 'gdesktop-enums-types' | ||
50 | enums_header = files( | ||
51 | - gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', | ||
52 | + get_option('oe_sysroot') + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h', | ||
53 | 'cc-datetime-panel.h' | ||
54 | ) | ||
55 | |||
43 | -- | 56 | -- |
44 | 2.34.1 | 57 | 2.34.1 |
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb index a64c2410a..b2c04c2f6 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.2.bb | |||
@@ -37,7 +37,7 @@ inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is | |||
37 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" | 37 | REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" |
38 | 38 | ||
39 | SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" | 39 | SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" |
40 | SRC_URI[archive.sha256sum] = "7abd365018e28679def60a5ecd3049db0fb85de6da49a96dadd21fba8db002e7" | 40 | SRC_URI[archive.sha256sum] = "0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c" |
41 | 41 | ||
42 | PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" | 42 | PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" |
43 | PACKAGECONFIG[cups] = ",,cups,cups" | 43 | PACKAGECONFIG[cups] = ",,cups,cups" |