summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-11-12 17:24:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-18 22:09:03 +0000
commitccc12dc381a17c3f4fd61f6428e439720a2de765 (patch)
treebbbadf40eabec3aa24716d605ab8a3b16e66a82f
parente534fc2fb261a7fe54d87088f3d03bc3458a1886 (diff)
downloadpoky-ccc12dc381a17c3f4fd61f6428e439720a2de765.tar.gz
vte: upgrade 0.78.0 -> 0.78.1
0001-tests-Remove-excessive-constrexpr.patch 0003-Add-missing-system-headers.patch removed since they're included in 0.78.1 (From OE-Core rev: fcbe84b713ec9a65820ef1e80ec41c7e7c02635f) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/vte/vte/0001-tests-Remove-excessive-constrexpr.patch26
-rw-r--r--meta/recipes-support/vte/vte/0003-Add-missing-system-headers.patch42
-rw-r--r--meta/recipes-support/vte/vte_0.78.1.bb (renamed from meta/recipes-support/vte/vte_0.78.0.bb)12
3 files changed, 5 insertions, 75 deletions
diff --git a/meta/recipes-support/vte/vte/0001-tests-Remove-excessive-constrexpr.patch b/meta/recipes-support/vte/vte/0001-tests-Remove-excessive-constrexpr.patch
deleted file mode 100644
index 779814f257..0000000000
--- a/meta/recipes-support/vte/vte/0001-tests-Remove-excessive-constrexpr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 01a5c8235f8b3f7c691921169ad125a395186b3f Mon Sep 17 00:00:00 2001
2From: Christian Persch <chpe@src.gnome.org>
3Date: Tue, 17 Sep 2024 18:21:32 +0200
4Subject: [PATCH 1/3] tests: Remove excessive constrexpr
5
6Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2819
7
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/vte/-/commit/c8838779d5f8c0e03411cef9775cd8f5a10a6204]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 src/color-test.cc | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/src/color-test.cc b/src/color-test.cc
15index 0ed9089..1bfad31 100644
16--- a/src/color-test.cc
17+++ b/src/color-test.cc
18@@ -165,7 +165,7 @@ static void
19 test_color_to_string (void)
20 {
21 auto test = [](std::string str,
22- bool alpha = false) constexpr noexcept -> void
23+ bool alpha = false) noexcept -> void
24 {
25 auto const value = parse<rgba>(str);
26 assert(value);
diff --git a/meta/recipes-support/vte/vte/0003-Add-missing-system-headers.patch b/meta/recipes-support/vte/vte/0003-Add-missing-system-headers.patch
deleted file mode 100644
index 66d2beb15a..0000000000
--- a/meta/recipes-support/vte/vte/0003-Add-missing-system-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From add3dd52d2e2c19dfa9319de8d8335dca802ba5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 30 Sep 2024 22:36:09 -0700
4Subject: [PATCH 3/3] Add missing system headers
5
6These are found out when using clang libc++
7
8algorithm is needed for std::max and std::min
9string_view for string_view
10
11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vte/-/issues/2824]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 src/icu-glue.hh | 1 +
16 src/minifont.cc | 1 +
17 2 files changed, 2 insertions(+)
18
19diff --git a/src/icu-glue.hh b/src/icu-glue.hh
20index f2c3331..f72999b 100644
21--- a/src/icu-glue.hh
22+++ b/src/icu-glue.hh
23@@ -20,6 +20,7 @@
24 #include <glib.h>
25 #include <memory>
26 #include <optional>
27+#include <string_view>
28
29 namespace vte::base {
30
31diff --git a/src/minifont.cc b/src/minifont.cc
32index 9be96d6..f4fe0bf 100644
33--- a/src/minifont.cc
34+++ b/src/minifont.cc
35@@ -18,6 +18,7 @@
36
37 #include "config.h"
38
39+#include <algorithm>
40 #include <cmath>
41
42 #include "cairo-glue.hh"
diff --git a/meta/recipes-support/vte/vte_0.78.0.bb b/meta/recipes-support/vte/vte_0.78.1.bb
index 9ada53a634..5723f35b83 100644
--- a/meta/recipes-support/vte/vte_0.78.0.bb
+++ b/meta/recipes-support/vte/vte_0.78.1.bb
@@ -18,13 +18,11 @@ GIDOCGEN_MESON_OPTION = "docs"
18inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala 18inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala
19 19
20SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ 20SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
21 file://0001-tests-Remove-excessive-constrexpr.patch \ 21 file://0002-lib-Typo-fix.patch \
22 file://0002-lib-Typo-fix.patch \ 22 file://0004-fast_float-Add-single-header-library-for-from_char-i.patch \
23 file://0003-Add-missing-system-headers.patch \ 23 file://0005-color-parser-Use-fast_float-implementation-for-from_.patch \
24 file://0004-fast_float-Add-single-header-library-for-from_char-i.patch \ 24 "
25 file://0005-color-parser-Use-fast_float-implementation-for-from_.patch \ 25SRC_URI[archive.sha256sum] = "6499d25179315255f9bcfce03c66fb84c03ad325dea23d0e372178521eca42b5"
26"
27SRC_URI[archive.sha256sum] = "07f09c6228a8bb3c1599dd0f5a6ec797b30d3010c3ac91cf21b69d9635dfaf7c"
28 26
29ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 27ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
30 28