diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-04-05 13:38:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-18 11:37:25 +0100 |
commit | 57652533447bb458d51e54f1f2bbee7e9522067a (patch) | |
tree | 2e893852e91f4e79dd4caf1d32255c9095cc3c29 /meta | |
parent | 54dff050027d5b9d20ff034b12bcacdfc010fa25 (diff) | |
download | poky-57652533447bb458d51e54f1f2bbee7e9522067a.tar.gz |
vte: Upgrade to 0.64.0 release
Use git for SRC_URI as thi release has not appeared on gnome downloads yet
Drop LGPL-2.0 as it has fully moved to LGPL-3.1+ see [1] that also
covers for change in License checksums for GPL-3
Add license information to cover for Xterm files in libvte
Add new glade files into -dev package
[1] https://github.com/GNOME/vte/commit/5e14529d4219f3792690566ef7ec70febd87e070
(From OE-Core rev: 4a1a20325e2d40256e03ab1a5be348a4c213d181)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.64.0.bb (renamed from meta/recipes-support/vte/vte_0.62.3.bb) | 13 |
2 files changed, 16 insertions, 12 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 a1d2e7ff27..b4100fc381 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 | |||
@@ -17,20 +17,19 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | |||
17 | src/widget.cc | 1 + | 17 | src/widget.cc | 1 + |
18 | 2 files changed, 5 insertions(+) | 18 | 2 files changed, 5 insertions(+) |
19 | 19 | ||
20 | diff --git a/src/missing.hh b/src/missing.hh | ||
21 | index 0742270..30ede62 100644 | ||
22 | --- a/src/missing.hh | 20 | --- a/src/missing.hh |
23 | +++ b/src/missing.hh | 21 | +++ b/src/missing.hh |
24 | @@ -33,3 +33,7 @@ int fdwalk(int (*cb)(void* data, int fd), | 22 | @@ -24,6 +24,10 @@ |
25 | char* strchrnul(char const* s, | 23 | #define NSIG (8 * sizeof(sigset_t)) |
26 | int c); | ||
27 | #endif | 24 | #endif |
28 | + | 25 | |
29 | +#ifndef W_EXITCODE | 26 | +#ifndef W_EXITCODE |
30 | +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) | 27 | +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) |
31 | +#endif | 28 | +#endif |
32 | diff --git a/src/widget.cc b/src/widget.cc | 29 | + |
33 | index 44a2271..0668735 100644 | 30 | #ifndef HAVE_FDWALK |
31 | int fdwalk(int (*cb)(void* data, int fd), | ||
32 | void* data); | ||
34 | --- a/src/widget.cc | 33 | --- a/src/widget.cc |
35 | +++ b/src/widget.cc | 34 | +++ b/src/widget.cc |
36 | @@ -21,6 +21,7 @@ | 35 | @@ -21,6 +21,7 @@ |
diff --git a/meta/recipes-support/vte/vte_0.62.3.bb b/meta/recipes-support/vte/vte_0.64.0.bb index 8d2470cad8..a16dac7e67 100644 --- a/meta/recipes-support/vte/vte_0.62.3.bb +++ b/meta/recipes-support/vte/vte_0.64.0.bb | |||
@@ -2,13 +2,13 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" | |||
2 | DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." | 2 | DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." |
3 | HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" | 3 | HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" |
4 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" | 4 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" |
5 | LICENSE = "GPLv3 & LGPLv3+ & LGPLv2.1+" | 5 | LICENSE = "GPLv3 & LGPLv3+ & MIT-X" |
6 | LICENSE_libvte = "LGPLv3+" | 6 | LICENSE_libvte = "LGPLv3+" |
7 | 7 | ||
8 | LIC_FILES_CHKSUM = " \ | 8 | LIC_FILES_CHKSUM = " \ |
9 | file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ | 9 | file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ |
10 | file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \ | ||
11 | file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ | 10 | file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ |
11 | file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ | ||
12 | " | 12 | " |
13 | 13 | ||
14 | DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" | 14 | DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" |
@@ -18,9 +18,12 @@ GIR_MESON_OPTION = 'gir' | |||
18 | 18 | ||
19 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection | 19 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection |
20 | 20 | ||
21 | SRCREV = "2520d6b6785646ceb5f501f9c37a1a0307fa4486" | ||
22 | SRC_URI = "git://gitlab.gnome.org/GNOME/vte.git;protocol=https;branch=vte-0-64" | ||
21 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) | 23 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) |
22 | SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" | 24 | SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" |
23 | SRC_URI[archive.sha256sum] = "f5770285a52cc23a3c0428a43d492b7c0ba458ce7b8a73768a7d4f1e8a7db3b4" | 25 | |
26 | S = "${WORKDIR}/git" | ||
24 | 27 | ||
25 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 28 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
26 | 29 | ||
@@ -56,4 +59,6 @@ FILES_${PN}-prompt = " \ | |||
56 | ${libexecdir}/vte-urlencode-cwd \ | 59 | ${libexecdir}/vte-urlencode-cwd \ |
57 | " | 60 | " |
58 | 61 | ||
62 | FILES_${PN}-dev += "${datadir}/glade/" | ||
63 | |||
59 | BBCLASSEXTEND = "native nativesdk" | 64 | BBCLASSEXTEND = "native nativesdk" |