diff mbox series

[45/47] vte: upgrade 0.78.0 -> 0.78.1

Message ID 1731403483-21399-45-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [01/47] barebox-tools: upgrade 2024.09.0 -> 2024.10.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Nov. 12, 2024, 9:24 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-tests-Remove-excessive-constrexpr.patch
0003-Add-missing-system-headers.patch
removed since they're included in 0.78.1

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...01-tests-Remove-excessive-constrexpr.patch | 26 ------------
 .../vte/0003-Add-missing-system-headers.patch | 42 -------------------
 .../vte/{vte_0.78.0.bb => vte_0.78.1.bb}      | 12 +++---
 3 files changed, 5 insertions(+), 75 deletions(-)
 delete mode 100644 meta/recipes-support/vte/vte/0001-tests-Remove-excessive-constrexpr.patch
 delete mode 100644 meta/recipes-support/vte/vte/0003-Add-missing-system-headers.patch
 rename meta/recipes-support/vte/{vte_0.78.0.bb => vte_0.78.1.bb} (84%)
diff mbox series

Patch

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 @@ 
-From 01a5c8235f8b3f7c691921169ad125a395186b3f Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@src.gnome.org>
-Date: Tue, 17 Sep 2024 18:21:32 +0200
-Subject: [PATCH 1/3] tests: Remove excessive constrexpr
-
-Fixes: https://gitlab.gnome.org/GNOME/vte/-/issues/2819
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/vte/-/commit/c8838779d5f8c0e03411cef9775cd8f5a10a6204]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/color-test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/color-test.cc b/src/color-test.cc
-index 0ed9089..1bfad31 100644
---- a/src/color-test.cc
-+++ b/src/color-test.cc
-@@ -165,7 +165,7 @@ static void
- test_color_to_string (void)
- {
-         auto test = [](std::string str,
--                       bool alpha = false) constexpr noexcept -> void
-+                       bool alpha = false) noexcept -> void
-         {
-                 auto const value = parse<rgba>(str);
-                 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 @@ 
-From add3dd52d2e2c19dfa9319de8d8335dca802ba5a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 30 Sep 2024 22:36:09 -0700
-Subject: [PATCH 3/3] Add missing system headers
-
-These are found out when using clang libc++
-
-algorithm is needed for std::max and std::min
-string_view for string_view
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vte/-/issues/2824]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/icu-glue.hh | 1 +
- src/minifont.cc | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/icu-glue.hh b/src/icu-glue.hh
-index f2c3331..f72999b 100644
---- a/src/icu-glue.hh
-+++ b/src/icu-glue.hh
-@@ -20,6 +20,7 @@
- #include <glib.h>
- #include <memory>
- #include <optional>
-+#include <string_view>
- 
- namespace vte::base {
- 
-diff --git a/src/minifont.cc b/src/minifont.cc
-index 9be96d6..f4fe0bf 100644
---- a/src/minifont.cc
-+++ b/src/minifont.cc
-@@ -18,6 +18,7 @@
- 
- #include "config.h"
- 
-+#include <algorithm>
- #include <cmath>
- 
- #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
similarity index 84%
rename from meta/recipes-support/vte/vte_0.78.0.bb
rename to 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"
 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://0001-tests-Remove-excessive-constrexpr.patch \
-            file://0002-lib-Typo-fix.patch \
-            file://0003-Add-missing-system-headers.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] = "07f09c6228a8bb3c1599dd0f5a6ec797b30d3010c3ac91cf21b69d9635dfaf7c"
+           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] = "6499d25179315255f9bcfce03c66fb84c03ad325dea23d0e372178521eca42b5"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"