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