diff mbox series

[meta-gnome,PATCHv3] gnome-control-center: update 42.0 -> 43.2

Message ID 20221231182212.58025-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome,PATCHv3] gnome-control-center: update 42.0 -> 43.2 | expand

Commit Message

Markus Volk Dec. 31, 2022, 6:22 p.m. UTC 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...001-Add-meson-option-to-pass-sysroot.patch |  1 -
 ...r_42.0.bb => gnome-control-center_43.2.bb} | 45 +++++++++++--------
 2 files changed, 26 insertions(+), 20 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_42.0.bb => gnome-control-center_43.2.bb} (70%)
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 768ba5439..11ad30eda 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
@@ -42,4 +42,3 @@  index 3634c47..459ccfe 100644
  
 -- 
 2.34.1
-
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb
similarity index 70%
rename from meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb
rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb
index 6fe999a19..830f3ec68 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_43.2.bb
@@ -4,35 +4,40 @@  LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 
 GNOMEBASEBUILDCLASS = "meson"
-
-inherit gnomebase gsettings gettext vala upstream-version-is-even bash-completion features_check
+GTKIC_VERSION = "4"
 
 DEPENDS = " \
-    gdk-pixbuf-native \
-    colord-gtk \
-    udisks2 \
-    upower \
-    polkit \
-    pulseaudio \
     accountsservice \
-    samba \
-    gsettings-desktop-schemas \
-    gnome-settings-daemon \
+    colord-gtk \
+    gcr3 \
+    gdk-pixbuf \
+    glib-2.0 \
+    gnome-bluetooth \
     gnome-desktop \
     gnome-online-accounts \
-    libnma \
-    gnome-bluetooth \
-    grilo \
+    gnome-settings-daemon \
+    gsettings-desktop-schemas \
+    gtk4 \
+    libadwaita \
+    libepoxy \
     libgtop \
-    gsound \
+    libgudev \
+    libnma \
     libpwquality \
-    libadwaita \
+    libxml2 \
+    polkit \
+    pulseaudio \
+    samba \
+    udisks2 \
+    upower \
 "
 
-REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11"
+inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd
+
+REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11"
 
-SRC_URI[archive.sha256sum] = "0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda"
 SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch"
+SRC_URI[archive.sha256sum] = "d7f256aba80a92c727b329fd01c8602da4b78f0fddaec93fcd91096964700563"
 
 PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}"
 PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus"
@@ -42,8 +47,10 @@  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"
+
 do_install:append() {
-	# If polkit is setup fixup permissions and ownership
     if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
         chmod 700 ${D}${datadir}/polkit-1/rules.d
         chown polkitd:root ${D}${datadir}/polkit-1/rules.d