diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 12:37:54 +0000 |
commit | 9559873a8d9530d866c9a1f4d785b50d684d46e3 (patch) | |
tree | a12095996fb2965b3a84b9d83a7ea5da4c32a14a | |
parent | bae7cbaa7509fa2f05b8e3ef66e9b181589db032 (diff) | |
download | openembedded-core-9559873a8d9530d866c9a1f4d785b50d684d46e3.tar.gz |
vte: update 0.60.3 -> 0.62.1
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 46 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.62.1.bb (renamed from meta/recipes-support/vte/vte_0.60.3.bb) | 3 |
2 files changed, 16 insertions, 33 deletions
diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch index 0ffd92b4ba..a1d2e7ff27 100644 --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch @@ -1,7 +1,10 @@ -From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001 +From de9639baac792327c701e509258b8a13f6959e82 Mon Sep 17 00:00:00 2001 From: Danilo Spinella <danyspin97@protonmail.com> Date: Thu, 21 Mar 2019 14:19:26 +0100 Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Upstream-Status: Submitted [1] @@ -10,40 +13,24 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> [1] https://gitlab.gnome.org/GNOME/vte/issues/72 --- - src/missing.hh | 21 +++++++++++++++++++++ - src/widget.cc | 1 + - 2 files changed, 22 insertions(+) - create mode 100644 src/missing.hh + src/missing.hh | 4 ++++ + src/widget.cc | 1 + + 2 files changed, 5 insertions(+) diff --git a/src/missing.hh b/src/missing.hh -new file mode 100644 -index 00000000..1baa993d ---- /dev/null +index 0742270..30ede62 100644 +--- a/src/missing.hh +++ b/src/missing.hh -@@ -0,0 +1,21 @@ -+/* Copyright 2019 Danilo Spinella -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 3 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ +@@ -33,3 +33,7 @@ int fdwalk(int (*cb)(void* data, int fd), + char* strchrnul(char const* s, + int c); + #endif + +#ifndef W_EXITCODE +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#endif -+ diff --git a/src/widget.cc b/src/widget.cc -index 331ddba9..555a4adf 100644 +index 44a2271..0668735 100644 --- a/src/widget.cc +++ b/src/widget.cc @@ -21,6 +21,7 @@ @@ -52,8 +39,5 @@ index 331ddba9..555a4adf 100644 #include <sys/wait.h> // for W_EXITCODE +#include "missing.hh" // for W_EXITCODE on non-glibc systems + #include <exception> #include <new> - #include <string> --- -2.21.0 - diff --git a/meta/recipes-support/vte/vte_0.60.3.bb b/meta/recipes-support/vte/vte_0.62.1.bb index 02a886bce0..1a8e21dec4 100644 --- a/meta/recipes-support/vte/vte_0.60.3.bb +++ b/meta/recipes-support/vte/vte_0.62.1.bb @@ -18,8 +18,7 @@ inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-intros # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" -SRC_URI[archive.md5sum] = "4214712ecab2d50e2a3a07897c3ada49" -SRC_URI[archive.sha256sum] = "feb76e1181a357d86112d447a08d127e2081438df76ece83243b18609dd9822a" +SRC_URI[archive.sha256sum] = "c369e87c0c8284e09109d0a9aac821f543558f51c0cb9c7acfff3df64153308d" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |