mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

vte: Fix -Wenum-constexpr-conversion warning

Browse Source 
(From OE-Core rev: 5b6f31f41a3c8c6f2f63e219f59f0800b84b1a20)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2023-03-01 16:10:15 -08:00
committed by Richard Purdie
parent c062f9a336
commit fb1853c66c
2 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
meta/recipes-support/vte/vte/0001-vtepty.cc-Do-not-typecast-to-GSpawnFlags.patch Normal file
View File

@@ -0,0 +1,58 @@
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

3
meta/recipes-support/vte/vte_0.70.2.bb
View File

@@ -20,7 +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"
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] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"