diff mbox series

[meta-gnome] gnome-control-center: upgrade 44.1 -> 44.2

Message ID 20230606164907.5043-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome] gnome-control-center: upgrade 44.1 -> 44.2 | expand

Commit Message

Markus Volk June 6, 2023, 4:49 p.m. UTC 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-Add-meson-option-to-pass-sysroot.patch | 17 +++++++++++++++--
 ...ter_44.1.bb => gnome-control-center_44.2.bb} |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_44.1.bb => gnome-control-center_44.2.bb} (94%)
diff mbox series

Patch

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
  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 3634c47..459ccfe 100644
+index 69af0cfea..6edcaa5ff 100644
 --- a/panels/background/meson.build
 +++ b/panels/background/meson.build
-@@ -25,7 +25,7 @@ common_sources = []
+@@ -19,7 +19,7 @@ common_sources = []
  
  enums = 'gdesktop-enums-types'
  enums_header = files(
@@ -40,5 +40,18 @@  index 3634c47..459ccfe 100644
    'cc-background-item.h'
  )
  
+diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
+index 3b6f5e197..30b207882 100644
+--- a/panels/datetime/meson.build
++++ b/panels/datetime/meson.build
+@@ -45,7 +45,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',
+   'cc-datetime-panel.h'
+ )
+ 
 -- 
 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
similarity index 94%
rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_44.1.bb
rename to 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
 REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
 
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
-SRC_URI[archive.sha256sum] = "7abd365018e28679def60a5ecd3049db0fb85de6da49a96dadd21fba8db002e7"
+SRC_URI[archive.sha256sum] = "0623d7d21cfe970d2ef34420623545a5945b9892e641f9a011cecec21afda10c"
 
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[cups] = ",,cups,cups"