From patchwork Sat Sep 21 18:31:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 49414 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 5C647CF9C5B for ; Sat, 21 Sep 2024 18:29:50 +0000 (UTC) Received: from mailout02.t-online.de (mailout02.t-online.de [194.25.134.17]) by mx.groups.io with SMTP id smtpd.web10.1671.1726943383659302152 for ; Sat, 21 Sep 2024 11:29:44 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.17, mailfrom: f_l_k@t-online.de) Received: from fwd86.aul.t-online.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout02.t-online.de (Postfix) with SMTP id 040A625F4 for ; Sat, 21 Sep 2024 20:29:42 +0200 (CEST) Received: from intel-corei7-64.fritz.box ([84.163.36.251]) by fwd86.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1ss4rU-06r7bt0; Sat, 21 Sep 2024 20:29:40 +0200 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCHv3] gnome-terminal: update 3.50.1 -> 3.54.0 Date: Sat, 21 Sep 2024 20:31:25 +0200 Message-ID: <20240921183125.3660211-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1726943380-717F85D9-DB8DF990/0/0 CLEAN NORMAL X-TOI-MSGID: 1f2c4133-2707-4ba2-8901-54f7f4b03849 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 ; Sat, 21 Sep 2024 18:29:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112438 - drop 0001-meson-add-option-to-set-dbus_interfacedir.patch Issue has been fixed by [https://gitlab.gnome.org/GNOME/gnome-terminal/-/commit/c1657f9cd62a982722041e5968136c7ba57e51f7] Signed-off-by: Markus Volk --- ...-add-option-to-set-dbus_interfacedir.patch | 63 ------------------- ...nal_3.50.1.bb => gnome-terminal_3.54.0.bb} | 5 +- 2 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch rename meta-gnome/recipes-gnome/gnome-terminal/{gnome-terminal_3.50.1.bb => gnome-terminal_3.54.0.bb} (79%) diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch deleted file mode 100644 index 9f8475bdd..000000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Sun, 7 Jan 2024 10:40:31 +0100 -Subject: [PATCH] meson: add an option to set dbus_interface_dir - -Add an option that allows to set the dbus_interface_dir path manually. -This will help to cross-compile gnome-terminal on host systems that -don't have gnome-shell installed. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/8046] - -Signed-off-by: Markus Volk ---- - meson_options.txt | 7 +++++++ - src/meson.build | 7 ++++++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index b555ab66..8fece058 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -13,6 +13,13 @@ - # You should have received a copy of the GNU General Public License - # along with this programme. If not, see . - -+option( -+ 'dbus_interface_dir', -+ type: 'string', -+ value: '', -+ description: 'directory for D-Bus session interface files [$datadir/dbus-1/interfaces]', -+) -+ - option( - 'dbg', - type: 'boolean', -diff --git a/src/meson.build b/src/meson.build -index 27ecd893..420ad45c 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -185,6 +185,11 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source - - if get_option('search_provider') - -+ dbus_interface_dir = get_option('dbus_interface_dir') -+ if dbus_interface_dir == '' -+ dbus_interface_dir = gt_prefix / gt_dbusinterfacedir -+ endif -+ - server_sources += files( - 'terminal-search-provider.cc', - 'terminal-search-provider.hh', -@@ -192,7 +197,7 @@ if get_option('search_provider') - - server_sources += gnome.gdbus_codegen( - 'terminal-search-provider-gdbus-generated', -- gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml', -+ dbus_interface_dir / 'org.gnome.ShellSearchProvider2.xml', - autocleanup: 'none', - install_header: false, - interface_prefix: 'org.gnome.Shell', --- -2.43.0 - diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb similarity index 79% rename from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb index 3bbfe9ece..cfbde967f 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb @@ -22,14 +22,13 @@ DEPENDS = " \ SRC_URI = " \ git://gitlab.gnome.org/GNOME/gnome-terminal.git;protocol=https;nobranch=1 \ file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - file://0001-meson-add-option-to-set-dbus_interfacedir.patch \ " -SRCREV = "5ac3b8e4bd6fa02651b3c23cedb0a7e1cd769655" +SRCREV = "965cb9307713c618253918633416fcad86bcc5d2" S = "${WORKDIR}/git" PACKAGECONFIG ?= "" PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus" -PACKAGECONFIG[search_provider] = "-Dsearch_provider=true -Ddbus_interface_dir=${STAGING_DATADIR}/dbus-1/interfaces,-Dsearch_provider=false,gnome-shell" +PACKAGECONFIG[search_provider] = "-Dsearch_provider=true,-Dsearch_provider=false,gnome-shell" PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"