From patchwork Thu Dec 29 15:29:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 17337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1D76C4332F for ; Thu, 29 Dec 2022 15:30:02 +0000 (UTC) Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by mx.groups.io with SMTP id smtpd.web10.206167.1672327797322989436 for ; Thu, 29 Dec 2022 07:29:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.85, mailfrom: f_l_k@t-online.de) Received: from fwd85.dcpf.telekom.de (fwd85.aul.t-online.de [10.223.144.111]) by mailout11.t-online.de (Postfix) with SMTP id 583F98213 for ; Thu, 29 Dec 2022 16:29:55 +0100 (CET) Received: from flk-MS-7C91.fritz.box ([79.219.226.205]) by fwd85.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pAuqu-1MF0wj0; Thu, 29 Dec 2022 16:29:52 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Cc: Markus Volk Subject: [meta-gnome][PATCHv2] gnome-control-center: update 42.0 -> 43.2 Date: Thu, 29 Dec 2022 16:29:46 +0100 Message-Id: <20221229152946.236288-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1672327792-2C8B9EA1-E876EB21/0/0 CLEAN NORMAL X-TOI-MSGID: 1a96f952-51cb-4f02-b23f-27066346d2ed List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 29 Dec 2022 15:30:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/100302 Signed-off-by: Markus Volk --- ...001-Add-meson-option-to-pass-sysroot.patch | 45 ----------------- ...r_42.0.bb => gnome-control-center_43.2.bb} | 48 ++++++++++--------- 2 files changed, 25 insertions(+), 68 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_42.0.bb => gnome-control-center_43.2.bb} (68%) 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 deleted file mode 100644 index 768ba5439..000000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba8aebe1259ae3f7f5a4827e5a47bb95c568b218 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 21 May 2019 16:07:46 +0200 -Subject: [PATCH] Add meson option to pass sysroot -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need to pass this to meson to help it finding gdesktop-enums.h: - -| panels/background/meson.build:38:0: ERROR: File /usr/include/gsettings-desktop-schemas/gdesktop-enums.h does not exist. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller ---- - meson_options.txt | 1 + - panels/background/meson.build | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index dbca723..af0f871 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,3 +1,4 @@ -+option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') - option('documentation', type: 'boolean', value: false, description: 'build documentation') - 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 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -25,7 +25,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', - 'cc-background-item.h' - ) - --- -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 68% 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..70c58118a 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,46 +4,48 @@ 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" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" -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