From patchwork Mon Sep 18 21:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 30660 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 02E7DCD3425 for ; Mon, 18 Sep 2023 21:52:18 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.web11.4199.1695073932082803612 for ; Mon, 18 Sep 2023 14:52:12 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd76.aul.t-online.de (fwd76.aul.t-online.de [10.223.144.102]) by mailout06.t-online.de (Postfix) with SMTP id 949E454F2 for ; Mon, 18 Sep 2023 23:52:09 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.154.161.214]) by fwd76.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1qiMA1-3qxV2C0; Mon, 18 Sep 2023 23:52:05 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCH 12/18] gnome-control-center: upgrade 44.3 -> 45.0 Date: Mon, 18 Sep 2023 23:51:47 +0200 Message-ID: <20230918215156.1920452-12-f_l_k@t-online.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230918215156.1920452-1-f_l_k@t-online.de> References: <20230918215156.1920452-1-f_l_k@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1695073925-46FF85E3-EA761E86/0/0 CLEAN NORMAL X-TOI-MSGID: 305e4051-5145-4eb5-a43f-7630ca85fdf8 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 ; Mon, 18 Sep 2023 21:52:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/104939 Signed-off-by: Markus Volk --- .../0001-Add-meson-option-to-pass-sysroot.patch | 16 ++++++++-------- ...nter_44.3.bb => gnome-control-center_45.0.bb} | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) rename meta-gnome/recipes-gnome/gnome-control-center/{gnome-control-center_44.3.bb => gnome-control-center_45.0.bb} (90%) 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 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 90% 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..41777d9f6 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" -SRC_URI[archive.sha256sum] = "066a65052fc3ecfae860025e85f797e6ab2b87a58c4f8ab9c66ec20718a80c7a" +SRC_URI[archive.sha256sum] = "83df6a90f98914f2c19a872ce06562acef40927637f679c383099265ccfa42cf" PACKAGECONFIG ??= "ibus ${@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"