diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-11-01 12:49:30 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-11-02 08:07:17 -0700 |
commit | 602ca9391290826ea544806dd18ebb7c45a8d7c7 (patch) | |
tree | bc5750fa91d765eaebc76cd5cd24aae13f5cd5d5 | |
parent | 32af15c371a423be9884d52326e372104304661c (diff) | |
download | meta-openembedded-contrib-602ca9391290826ea544806dd18ebb7c45a8d7c7.tar.gz |
gnome-terminal: upgrade 3.40.2 -> 3.42.0 / meson build
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 19 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb (renamed from meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb) | 10 |
2 files changed, 15 insertions, 14 deletions
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?= <schnitzeltony@gmail.com> -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 <schnitzeltony@gmail.com> --- - 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))) @@ -26,10 +26,9 @@ index d06ce35..6284e4c 100644 +#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.42.0.bb index 88fb5d7435..905887187d 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.40.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.0.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ " +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even DEPENDS = " \ @@ -20,12 +22,12 @@ DEPENDS = " \ libpcre2 \ " -SRC_URI[archive.sha256sum] = "4c79af8ffe8bd3a5daca1911ea2c0acd6872860a1dd5d7eea219f4ab4ae556ac" +SRC_URI[archive.sha256sum] = "b50e9e5664230e6ca290bcf38812a5b65e0baac66a486ee210894cf675f72e0b" SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -EXTRA_OECONF += " \ - --disable-search-provider \ - --without-nautilus-extension \ +EXTRA_OEMESON += " \ + -Dsearch_provider=false \ + -Dnautilus_extension=false \ " FILES:${PN} += " \ |