MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-07 17:55:45 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gnome-terminal: update 3.50.1 -> 3.54.0

Browse Source 
- drop 0001-meson-add-option-to-set-dbus_interfacedir.patch
  Issue has been fixed by [c1657f9cd6]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Markus Volk 2024-09-21 20:31:25 +02:00 committed by Khem Raj
parent 56601b7061
commit 1d27c33850
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch
View File

@ -1,63 +0,0 @@
From 61668e1eb86a316d4ad9a6b9cacf8c8cc74a0c33 Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
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 <f_l_k@t-online.de>
---
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 <https://www.gnu.org/licenses/>.
+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

5
meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb → meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb
View File

@ -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"