From 602ca9391290826ea544806dd18ebb7c45a8d7c7 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Mon, 1 Nov 2021 12:49:30 +0100 Subject: gnome-terminal: upgrade 3.40.2 -> 3.42.0 / meson build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...dd-W_EXITCODE-macro-for-non-glibc-systems.patch | 19 +++++------ .../gnome-terminal/gnome-terminal_3.40.2.bb | 37 -------------------- .../gnome-terminal/gnome-terminal_3.42.0.bb | 39 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 47 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb create mode 100644 meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index a69390eb2b..ef722a0e7d 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -1,6 +1,6 @@ From f231cecc151930fd5b6309da317a8c5bc6001f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 17 Nov 2019 15:55:54 +0100 +Date: Sat, 30 Oct 2021 15:10:28 +0200 Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -10,14 +10,14 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - src/terminal.c | 6 ++++++ - 1 file changed, 6 insertions(+) + src/terminal.cc | 5 +++++ + 1 file changed, 5 insertions(+) -diff --git a/src/terminal.c b/src/terminal.c -index d06ce35..6284e4c 100644 ---- a/src/terminal.c -+++ b/src/terminal.c -@@ -47,6 +47,12 @@ +diff --git a/src/terminal.cc b/src/terminal.cc +index 27ee91e..5f4d880 100644 +--- a/src/terminal.cc ++++ b/src/terminal.cc +@@ -47,6 +47,11 @@ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) @@ -25,11 +25,10 @@ index d06ce35..6284e4c 100644 +#ifndef W_EXITCODE +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif -+ + /* Wait-for-exit helper */ typedef struct { -- -2.21.0 +2.31.1 diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb deleted file mode 100644 index 88fb5d7435..0000000000 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "GNOME terminal" -LICENSE = "GPLv3 & GFDL-1.3" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ - file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ -" - -inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even - -DEPENDS = " \ - glib-2.0-native \ - intltool-native \ - yelp-tools-native \ - docbook-xsl-stylesheets-native libxslt-native \ - desktop-file-utils-native \ - gtk+3 \ - gsettings-desktop-schemas \ - vte \ - dconf \ - libpcre2 \ -" - -SRC_URI[archive.sha256sum] = "4c79af8ffe8bd3a5daca1911ea2c0acd6872860a1dd5d7eea219f4ab4ae556ac" -SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" - -EXTRA_OECONF += " \ - --disable-search-provider \ - --without-nautilus-extension \ -" - -FILES:${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/dbus-1 \ - ${systemd_user_unitdir} \ -" - -RRECOMMENDS:${PN} += "vte-prompt gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb new file mode 100644 index 0000000000..905887187d --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "GNOME terminal" +LICENSE = "GPLv3 & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ + file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even + +DEPENDS = " \ + glib-2.0-native \ + intltool-native \ + yelp-tools-native \ + docbook-xsl-stylesheets-native libxslt-native \ + desktop-file-utils-native \ + gtk+3 \ + gsettings-desktop-schemas \ + vte \ + dconf \ + libpcre2 \ +" + +SRC_URI[archive.sha256sum] = "b50e9e5664230e6ca290bcf38812a5b65e0baac66a486ee210894cf675f72e0b" +SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" + +EXTRA_OEMESON += " \ + -Dsearch_provider=false \ + -Dnautilus_extension=false \ +" + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ + ${systemd_user_unitdir} \ +" + +RRECOMMENDS:${PN} += "vte-prompt gsettings-desktop-schemas" -- cgit 1.2.3-korg