mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 21:32:13 +02:00
vte: upgrade 0.78.2 -> 0.80.3
0004-fast_float-Add-single-header-library-for-from_char-i.patch and 0005-color-parser-Use-fast_float-implementation-for-from_.patch patches dropped: upstream has adopted the changes, and oe-core also provides now fastfloat, no need to vendor it with a patch. 0002-lib-Typo-fix.patch is dropped, because it was a backport, and it is included in this release. Shortlog: https://gitlab.gnome.org/GNOME/vte/-/compare/0.80.3...0.78.2 (From OE-Core rev: 0a849dc7edeecb6c16a8a0fe347015d6d85e9dfd) Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8ebdd79442
commit
4ad510a63f
@@ -1,25 +0,0 @@
|
||||
From 6b7440996819c12ec32bfaf4e73b27baeb273207 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Persch <chpe@src.gnome.org>
|
||||
Date: Thu, 5 Sep 2024 23:59:05 +0200
|
||||
Subject: [PATCH 2/3] lib: Typo fix
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2816
|
||||
Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/vte/-/commit/e24087d953d9352c8bc46074e2662c80f9bfbc2d]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/vteinternal.hh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
|
||||
index 051e78c..b1adc19 100644
|
||||
--- a/src/vteinternal.hh
|
||||
+++ b/src/vteinternal.hh
|
||||
@@ -1233,7 +1233,7 @@ public:
|
||||
void reset_decoder();
|
||||
|
||||
void feed(std::string_view const& data,
|
||||
- bool start_processsing_ = true);
|
||||
+ bool start_processing_ = true);
|
||||
void feed_child(char const* data,
|
||||
size_t length) { assert(data); feed_child({data, length}); }
|
||||
void feed_child(std::string_view const& str);
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,102 +0,0 @@
|
||||
From 08b90d0a5bf8ceb68dd1b4e9ded0f8a2b5287a6e Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 4 Oct 2024 21:22:52 -0700
|
||||
Subject: [PATCH 5/5] color-parser: Use fast_float implementation for
|
||||
from_chars
|
||||
|
||||
Removed dependency on c++ runtime to provide it.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2823
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vte/-/issues/2823#note_2239888]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/color-parser.cc | 12 ++++++------
|
||||
src/termprops.hh | 12 ++++++------
|
||||
2 files changed, 12 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/color-parser.cc b/src/color-parser.cc
|
||||
index 02ec5d3a..42c51966 100644
|
||||
--- a/src/color-parser.cc
|
||||
+++ b/src/color-parser.cc
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
#include "color-parser.hh"
|
||||
#include "color.hh"
|
||||
-
|
||||
+#include "fast_float.hh"
|
||||
#include <algorithm>
|
||||
#include <cctype>
|
||||
#include <charconv>
|
||||
@@ -298,7 +298,7 @@ parse_csslike(std::string const& spec) noexcept
|
||||
auto value = uint64_t{};
|
||||
auto const start = spec.c_str() + 1;
|
||||
auto const end = spec.c_str() + spec.size();
|
||||
- auto const rv = std::from_chars(start, end, value, 16);
|
||||
+ auto const rv = fast_float::from_chars(start, end, value, 16);
|
||||
if (rv.ec != std::errc{} || rv.ptr != end)
|
||||
return std::nullopt;
|
||||
|
||||
@@ -424,7 +424,7 @@ parse_x11like(std::string const& spec) noexcept
|
||||
auto value = uint64_t{};
|
||||
auto const start = spec.c_str() + 1;
|
||||
auto const end = spec.c_str() + spec.size();
|
||||
- auto const rv = std::from_chars(start, end, value, 16);
|
||||
+ auto const rv = fast_float::from_chars(start, end, value, 16);
|
||||
if (rv.ec != std::errc{} || rv.ptr != end)
|
||||
return std::nullopt;
|
||||
|
||||
@@ -447,13 +447,13 @@ parse_x11like(std::string const& spec) noexcept
|
||||
// Note that the length check above makes sure that @r, @g, @b,
|
||||
// don't exceed @bits.
|
||||
auto r = UINT64_C(0), b = UINT64_C(0), g = UINT64_C(0);
|
||||
- auto rv = std::from_chars(start, end, r, 16);
|
||||
+ auto rv = fast_float::from_chars(start, end, r, 16);
|
||||
if (rv.ec != std::errc{} || rv.ptr == end || *rv.ptr != '/')
|
||||
return std::nullopt;
|
||||
- rv = std::from_chars(rv.ptr + 1, end, g, 16);
|
||||
+ rv = fast_float::from_chars(rv.ptr + 1, end, g, 16);
|
||||
if (rv.ec != std::errc{} || rv.ptr == end || *rv.ptr != '/')
|
||||
return std::nullopt;
|
||||
- rv = std::from_chars(rv.ptr + 1, end, b, 16);
|
||||
+ rv = fast_float::from_chars(rv.ptr + 1, end, b, 16);
|
||||
if (rv.ec != std::errc{} || rv.ptr != end)
|
||||
return std::nullopt;
|
||||
|
||||
diff --git a/src/termprops.hh b/src/termprops.hh
|
||||
index 0d3f0f4c..a10fc7d1 100644
|
||||
--- a/src/termprops.hh
|
||||
+++ b/src/termprops.hh
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
+#include "fast_float.hh"
|
||||
#include "fwd.hh"
|
||||
#include "uuid.hh"
|
||||
#include "color.hh"
|
||||
@@ -355,8 +356,8 @@ inline std::optional<TermpropValue>
|
||||
parse_termprop_integral(std::string_view const& str) noexcept
|
||||
{
|
||||
auto v = T{};
|
||||
- if (auto [ptr, err] = std::from_chars(std::begin(str),
|
||||
- std::end(str),
|
||||
+ if (auto [ptr, err] = fast_float::from_chars(str.data(),
|
||||
+ str.data()+str.size(),
|
||||
v);
|
||||
err == std::errc() && ptr == std::end(str)) {
|
||||
if constexpr (std::is_unsigned_v<T>) {
|
||||
@@ -389,10 +390,9 @@ inline std::optional<TermpropValue>
|
||||
parse_termprop_floating(std::string_view const& str) noexcept
|
||||
{
|
||||
auto v = T{};
|
||||
- if (auto [ptr, err] = std::from_chars(std::begin(str),
|
||||
- std::end(str),
|
||||
- v,
|
||||
- std::chars_format::general);
|
||||
+ if (auto [ptr, err] = fast_float::from_chars(str.data(),
|
||||
+ str.data() + str.size(),
|
||||
+ v);
|
||||
err == std::errc() &&
|
||||
ptr == std::end(str) &&
|
||||
std::isfinite(v)) {
|
||||
@@ -11,18 +11,15 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \
|
||||
"
|
||||
|
||||
DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu lz4"
|
||||
DEPENDS = "fastfloat glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu lz4"
|
||||
|
||||
GIR_MESON_OPTION = 'gir'
|
||||
GIDOCGEN_MESON_OPTION = "docs"
|
||||
inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala
|
||||
|
||||
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
|
||||
file://0002-lib-Typo-fix.patch \
|
||||
file://0004-fast_float-Add-single-header-library-for-from_char-i.patch \
|
||||
file://0005-color-parser-Use-fast_float-implementation-for-from_.patch \
|
||||
"
|
||||
SRC_URI[archive.sha256sum] = "35d7bcde07356846b4a12881c8e016705b70a9004a9082285eee5834ccc49890"
|
||||
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
|
||||
|
||||
SRC_URI[archive.sha256sum] = "2e596fd3fbeabb71531662224e71f6a2c37f684426136d62854627276ef4f699"
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
@@ -49,7 +46,8 @@ FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \
|
||||
${datadir}/vala/vapi/vte-2.91-gtk4.vapi \
|
||||
${includedir}/vte-2.91-gtk4 \
|
||||
"
|
||||
FILES:${PN} += "${systemd_user_unitdir}"
|
||||
FILES:${PN} += "${systemd_user_unitdir} \
|
||||
${datadir}/xdg-terminals"
|
||||
FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
|
||||
FILES:${PN}-prompt = " \
|
||||
${sysconfdir}/profile.d \
|
||||
Reference in New Issue
Block a user