Skip to contentSkip to conversation

valgrind: Include missing <cstdint>

PATCH New Khem Raj 1 participant 2 messages Jan 26, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 valgrind: Include missing <cstdint>

---
 ...01-drd-tests-Include-missing-cstdint.patch | 34 +++++++++++++++++++
 .../valgrind/valgrind_3.20.0.bb               |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch
meta/recipes-devtools/valgrind/valgrind/0001-drd-tests-Include-missing-cstdint.patch new file +34 -0
new file mode 100644
index 0000000000..fbee24a538
@@ -0,0 +1,34 @@
+From 687d9fb9e3de832379680e9d5268331011c92afa Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 26 Jan 2023 08:53:26 -0800
+Subject: [PATCH] drd/tests: Include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer
+transitively included [1]. Explicitly include it for uint{32,64}_t.
+
+Fixes
+tsan_thread_wrappers_pthread.h:91:9: error: 'int64_t' does not name a type
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://bugs.kde.org/show_bug.cgi?id=464859]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ drd/tests/tsan_thread_wrappers_pthread.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drd/tests/tsan_thread_wrappers_pthread.h b/drd/tests/tsan_thread_wrappers_pthread.h
+index f15e6ad..4cc8062 100644
+--- a/drd/tests/tsan_thread_wrappers_pthread.h
++++ b/drd/tests/tsan_thread_wrappers_pthread.h
+@@ -55,6 +55,7 @@
+ #define NO_TLS
+ #endif
+ 
++#include <cstdint>
+ #include <string>
+ using namespace std;
+ 
+-- 
+2.39.1
+
meta/recipes-devtools/valgrind/valgrind_3.20.0.bb +1 -0
index 1e1f0ccdd3..701dbf3833 100644
@@ -39,6 +39,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
            file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
            file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
            file://0001-docs-Disable-manual-validation.patch \
+           file://0001-drd-tests-Include-missing-cstdint.patch \
            "
 SRC_URI[sha256sum] = "8536c031dbe078d342f121fa881a9ecd205cb5a78e639005ad570011bdb9f3c6"
 UPSTREAM_CHECK_REGEX = "valgrind-(?P<pver>\d+(\.\d+)+)\.tar"
Signature · 1 line
2.39.1
author
#1 lore raw

PATCH 2/2 webkitgtk: Fix build with gcc 13

---
 ...bb461f040b90453bc4e100dcf967243ecd98.patch | 30 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.38.3.bb  |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch
meta/recipes-sato/webkit/webkitgtk/d318bb461f040b90453bc4e100dcf967243ecd98.patch new file +30 -0
new file mode 100644
index 0000000000..1ff9dcea7e
@@ -0,0 +1,30 @@
+From d318bb461f040b90453bc4e100dcf967243ecd98 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <[email protected]>
+Date: Mon, 16 Jan 2023 16:55:26 -0800
+Subject: [PATCH] WebKitGTK 2.39.4 does not build due to missing #include in
+ ANGLE https://bugs.webkit.org/show_bug.cgi?id=250689
+
+Unreviewed build fix.
+
+* Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h:
+
+Canonical link: https://commits.webkit.org/258968@main
+
+Upstream-Status: Backport [https://bugs.webkit.org/show_bug.cgi?id=250689]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+index 94cb93e01fc0..ec7bda372f30 100644
+--- a/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
++++ b/Source/ThirdParty/ANGLE/include/GLSLANG/ShaderVars.h
+@@ -12,6 +12,7 @@
+ 
+ #include <algorithm>
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
meta/recipes-sato/webkit/webkitgtk_2.38.3.bb +1 -0
index f076fb0498..5d8d212871 100644
@@ -14,6 +14,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://reproducibility.patch \
            file://0001-When-building-introspection-files-do-not-quote-CFLAG.patch \
            file://0d3344e17d258106617b0e6d783d073b188a2548.patch \
+           file://d318bb461f040b90453bc4e100dcf967243ecd98.patch \
            "
 SRC_URI[sha256sum] = "41f001d1ed448c6936b394a9f20e4640eebf83a7f08262df28504f7410604a5a"
 
Signature · 1 line
2.39.1