From 1d27c33850b0b3996b3eedb86bf012153e2cfb56 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 21 Sep 2024 20:31:25 +0200 Subject: gnome-terminal: update 3.50.1 -> 3.54.0 - 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 Signed-off-by: Khem Raj --- ...meson-add-option-to-set-dbus_interfacedir.patch | 63 ---------------------- .../gnome-terminal/gnome-terminal_3.50.1.bb | 42 --------------- .../gnome-terminal/gnome-terminal_3.54.0.bb | 41 ++++++++++++++ 3 files changed, 41 insertions(+), 105 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-meson-add-option-to-set-dbus_interfacedir.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb 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 9f8475bdd2..0000000000 --- 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.50.1.bb deleted file mode 100644 index 3bbfe9ece0..0000000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.50.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY = "GNOME terminal" -LICENSE = "GPL-3.0-only & GFDL-1.3" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ -" - -inherit gnomebase pkgconfig gsettings gnome-help gettext itstool upstream-version-is-even - -DEPENDS = " \ - glib-2.0 \ - docbook-xsl-stylesheets-native libxslt-native \ - desktop-file-utils-native \ - gtk+3 \ - gsettings-desktop-schemas \ - vte \ - dconf \ - libhandy \ - libpcre2 \ -" - -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" -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" - -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - -FILES:${PN} += " \ - ${datadir} \ - ${libdir}/nautilus/extensions-4 \ - ${systemd_user_unitdir} \ -" - -RRECOMMENDS:${PN} += "vte-prompt gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb new file mode 100644 index 0000000000..cfbde967fd --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.54.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "GNOME terminal" +LICENSE = "GPL-3.0-only & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ +" + +inherit gnomebase pkgconfig gsettings gnome-help gettext itstool upstream-version-is-even + +DEPENDS = " \ + glib-2.0 \ + docbook-xsl-stylesheets-native libxslt-native \ + desktop-file-utils-native \ + gtk+3 \ + gsettings-desktop-schemas \ + vte \ + dconf \ + libhandy \ + libpcre2 \ +" + +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 \ +" +SRCREV = "965cb9307713c618253918633416fcad86bcc5d2" +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus" +PACKAGECONFIG[search_provider] = "-Dsearch_provider=true,-Dsearch_provider=false,gnome-shell" + +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +FILES:${PN} += " \ + ${datadir} \ + ${libdir}/nautilus/extensions-4 \ + ${systemd_user_unitdir} \ +" + +RRECOMMENDS:${PN} += "vte-prompt gsettings-desktop-schemas" -- cgit v1.2.3-54-g00ecf