diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-03-26 21:55:10 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-27 15:24:57 +0100 |
| commit | 917b5da673cfe2271cf8854529b7f1ea7172a737 (patch) | |
| tree | 7d232308890ecac297983a79794c1f96d3e6867b | |
| parent | d06c7c0d288cafa75f14a841f9cb31dcd0714644 (diff) | |
| download | openembedded-core-917b5da673cfe2271cf8854529b7f1ea7172a737.tar.gz | |
vte: Upgrade to 0.72.0
This is needed for many gnome 44 apps.
Drop upstreamed patch in this release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/vte/vte/0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch | 58 | ||||
| -rw-r--r-- | meta/recipes-support/vte/vte_0.72.0.bb (renamed from meta/recipes-support/vte/vte_0.70.3.bb) | 5 |
2 files changed, 2 insertions, 61 deletions
diff --git a/meta/recipes-support/vte/vte/0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch b/meta/recipes-support/vte/vte/0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch deleted file mode 100644 index 16553b506f..0000000000 --- a/meta/recipes-support/vte/vte/0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9c7654e063d65fb2645459a32fd14eebab484857 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 1 Mar 2023 15:50:26 -0800 -Subject: [PATCH] vtepty.cc: Do not typecast to GSpawnFlags - -GSpawnFlags is enum with max value 1 << 15 which means it fits into a -short int, however here we are OR'ing VTE_SPAWN_* as well which have -higher values - -Fixes error like -src/vtepty.cc:577:16: error: integer value 234881535 is outside the valid range of values [0, 4095] for this enumeration type [-Wenum-constexpr-conversion] - -Fixes issue https://gitlab.gnome.org/GNOME/vte/-/issues/2618 - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/vte/-/issues/2618] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/vtepty.cc | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/src/vtepty.cc b/src/vtepty.cc -index 3aaa0d6b..2da2675f 100644 ---- a/src/vtepty.cc -+++ b/src/vtepty.cc -@@ -574,18 +574,18 @@ catch (...) - static constexpr inline auto - all_spawn_flags() noexcept - { -- return GSpawnFlags(G_SPAWN_LEAVE_DESCRIPTORS_OPEN | -- G_SPAWN_DO_NOT_REAP_CHILD | -- G_SPAWN_SEARCH_PATH | -- G_SPAWN_STDOUT_TO_DEV_NULL | -- G_SPAWN_STDERR_TO_DEV_NULL | -- G_SPAWN_CHILD_INHERITS_STDIN | -- G_SPAWN_FILE_AND_ARGV_ZERO | -- G_SPAWN_SEARCH_PATH_FROM_ENVP | -- G_SPAWN_CLOEXEC_PIPES | -- VTE_SPAWN_NO_PARENT_ENVV | -- VTE_SPAWN_NO_SYSTEMD_SCOPE | -- VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); -+ return (G_SPAWN_LEAVE_DESCRIPTORS_OPEN | -+ G_SPAWN_DO_NOT_REAP_CHILD | -+ G_SPAWN_SEARCH_PATH | -+ G_SPAWN_STDOUT_TO_DEV_NULL | -+ G_SPAWN_STDERR_TO_DEV_NULL | -+ G_SPAWN_CHILD_INHERITS_STDIN | -+ G_SPAWN_FILE_AND_ARGV_ZERO | -+ G_SPAWN_SEARCH_PATH_FROM_ENVP | -+ G_SPAWN_CLOEXEC_PIPES | -+ VTE_SPAWN_NO_PARENT_ENVV | -+ VTE_SPAWN_NO_SYSTEMD_SCOPE | -+ VTE_SPAWN_REQUIRE_SYSTEMD_SCOPE); - } - - static constexpr inline auto --- -2.39.2 - diff --git a/meta/recipes-support/vte/vte_0.70.3.bb b/meta/recipes-support/vte/vte_0.72.0.bb index 6da76a3053..c08ac879e1 100644 --- a/meta/recipes-support/vte/vte_0.70.3.bb +++ b/meta/recipes-support/vte/vte_0.72.0.bb @@ -20,9 +20,8 @@ GIDOCGEN_MESON_OPTION = "docs" inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) -SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ - file://0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch" -SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23" +SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" +SRC_URI[archive.sha256sum] = "40fe914d6c70db34176c922725b6c6ea15d5f3cb2a9b44c57e200a5f950a6736" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |