Skip to contentSkip to conversation

waylandpp: Fix build with gcc-13

PATCH New Khem Raj 1 participant 4 messages Jan 27, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/4 waylandpp: Fix build with gcc-13

---
 .../0001-include-missing-cstdint.patch        | 59 +++++++++++++++++++
 .../wayland/waylandpp_1.0.0.bb                |  3 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch
meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch new file +59 -0
new file mode 100644
index 0000000000..f2169c43c9
@@ -0,0 +1,59 @@
+From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 26 Jan 2023 23:25:05 -0800
+Subject: [PATCH] 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.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ include/wayland-client.hpp | 1 +
+ scanner/scanner.cpp        | 3 +++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp
+index a3f782b..4598a0e 100644
+--- a/include/wayland-client.hpp
++++ b/include/wayland-client.hpp
+@@ -29,6 +29,7 @@
+ /** \file */
+ 
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index bebd71e..c25746a 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -15,6 +15,7 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <cstdint>
+ #include <fstream>
+ #include <iostream>
+ #include <list>
+@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[])
+   wayland_hpp << "#pragma once" << std::endl
+               << std::endl
+               << "#include <array>" << std::endl
++              << "#include <cstdint>" << std::endl
+               << "#include <functional>" << std::endl
+               << "#include <memory>" << std::endl
+               << "#include <string>" << std::endl
+@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[])
+     wayland_server_hpp << "#pragma once" << std::endl
+                        << std::endl
+                        << "#include <array>" << std::endl
++                       << "#include <cstdint>" << std::endl
+                        << "#include <functional>" << std::endl
+                        << "#include <memory>" << std::endl
+                        << "#include <string>" << std::endl
+-- 
+2.39.1
+
meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +2 -1
index 0deed332c6..5ba5aa7940 100644
@@ -2,7 +2,8 @@ SUMMARY = " C++ binding for Wayland using the most modern C++ technology"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407"
 
-SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \
+           file://0001-include-missing-cstdint.patch"
 
 DEPENDS = "pugixml"
 DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2"
Signature · 1 line
2.39.1
author
#1 lore raw

PATCH 2/4 sedutil: Fix build with gcc13

---
 .../files/0001-include-missing-cstdint.patch  | 32 +++++++++++++++++++
 .../recipes-extended/sedutil/sedutil_git.bb   |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch
meta-oe/recipes-extended/sedutil/files/0001-include-missing-cstdint.patch new file +32 -0
new file mode 100644
index 0000000000..8afcb1fa48
@@ -0,0 +1,32 @@
+From 927cd88cad7bea94c2eebecc18f7881f0defaccb Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 26 Jan 2023 23:36:29 -0800
+Subject: [PATCH] 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.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/Drive-Trust-Alliance/sedutil/pull/425]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ Common/DtaOptions.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Common/DtaOptions.h b/Common/DtaOptions.h
+index c012af1..7530a0b 100644
+--- a/Common/DtaOptions.h
++++ b/Common/DtaOptions.h
+@@ -21,6 +21,7 @@ along with sedutil.  If not, see <http://www.gnu.org/licenses/>.
+ #ifndef _DTAOPTIONS_H
+ #define	_DTAOPTIONS_H
+ 
++#include <cstdint>
+ /** Output modes */
+ typedef enum _sedutiloutput {
+ 	sedutilNormal,
+-- 
+2.39.1
+
meta-oe/recipes-extended/sedutil/sedutil_git.bb +1 -1
index a377d4ec5a..972a33c742 100644
@@ -7,11 +7,11 @@ LICENSE = "GPL-3.0-only"
 
 LIC_FILES_CHKSUM = "file://Common/LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504"
 
-BASEPV = "1.15.1"
 PV = "1.20.0"
 SRCREV = "d3de8e45e06a21d31cca0046ceb16ced1ef3563a"
 SRC_URI = "git://github.com/Drive-Trust-Alliance/sedutil.git;branch=master;protocol=https \
            file://0001-Fix-build-on-big-endian-architectures.patch \
+           file://0001-include-missing-cstdint.patch \
            "
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
author
#2 lore raw

PATCH 3/4 usbguard: Fix build with gcc13

In reply to Khem Raj
---
 .../0001-include-missing-cstdint.patch        | 45 +++++++++++++++++++
 .../usbguard/usbguard_1.1.2.bb                |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch
meta-oe/recipes-security/usbguard/usbguard/0001-include-missing-cstdint.patch new file +45 -0
new file mode 100644
index 0000000000..5cbe64091c
@@ -0,0 +1,45 @@
+From 1da0cfbb9ae978822d961d8b22d8d5125c11247a Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Thu, 26 Jan 2023 23:46:56 -0800
+Subject: [PATCH] include missing <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is no
+longer transitively included [1]. Explicitly include it for
+uint8_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/USBGuard/usbguard/pull/583]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/Library/Base64.cpp | 1 -
+ src/Library/Base64.hpp | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Library/Base64.cpp b/src/Library/Base64.cpp
+index ddb28dc..0246a13 100644
+--- a/src/Library/Base64.cpp
++++ b/src/Library/Base64.cpp
+@@ -22,7 +22,6 @@
+ 
+ #include "Base64.hpp"
+ #include <stdexcept>
+-#include <cstdint>
+ 
+ namespace usbguard
+ {
+diff --git a/src/Library/Base64.hpp b/src/Library/Base64.hpp
+index 0947f21..e0c745c 100644
+--- a/src/Library/Base64.hpp
++++ b/src/Library/Base64.hpp
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <string>
++#include <cstdint>
+ #include <cstddef>
+ 
+ namespace usbguard
+-- 
+2.39.1
+
meta-oe/recipes-security/usbguard/usbguard_1.1.2.bb +1 -0
index e1e087a6d0..4e96b4f41e 100644
@@ -12,6 +12,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "https://github.com/USBGuard/usbguard/releases/download/${BPN}-${PV}/${BPN}-${PV}.tar.gz \
+    file://0001-include-missing-cstdint.patch \
     file://0001-Add-and-use-pkgconfig-instead-of-libgcrypt-config.patch"
 
 SRC_URI[sha256sum] = "dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934"
Signature · 1 line
2.39.1
author
#3 lore raw

PATCH 4/4 minifi-cpp: Fix build with gcc13

In reply to Khem Raj
---
 ...-missing-includes-cstdint-and-cstdio.patch | 70 +++++++++++++++++++
 .../minifi-cpp/minifi-cpp_0.7.0.bb            |  1 +
 2 files changed, 71 insertions(+)
 create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
meta-oe/recipes-extended/minifi-cpp/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file +70 -0
new file mode 100644
index 0000000000..0fce8dc64f
@@ -0,0 +1,70 @@
+From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Tue, 24 Jan 2023 21:40:43 -0800
+Subject: [PATCH] Add missing includes <cstdint> and <cstdio>
+
+This is needed with GCC 13 and newer [1]
+
+[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
+
+Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
+ storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
+ .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h    | 1 +
+ storage/rocksdb/rocksdb/util/slice.cc                            | 1 +
+ storage/rocksdb/rocksdb/util/string_util.h                       | 1 +
+ tpool/aio_linux.cc                                               | 1 +
+ 6 files changed, 6 insertions(+)
+
+--- a/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/thirdparty/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+ 
++#include <cstdint>
+ #include <string>
+ #include "rocksdb/status.h"
+ 
+--- a/thirdparty/rocksdb/util/string_util.h
++++ b/thirdparty/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
+--- a/extensions/expression-language/common/Value.h
++++ b/extensions/expression-language/common/Value.h
+@@ -15,6 +15,7 @@
+  * limitations under the License.
+  */
+ 
++#include <cstdint>
+ #include <string>
+ #include <sstream>
+ #include <iomanip>
+--- a/libminifi/include/utils/StringUtils.h
++++ b/libminifi/include/utils/StringUtils.h
+@@ -18,6 +18,7 @@
+ #define LIBMINIFI_INCLUDE_IO_STRINGUTILS_H_
+ #include <iostream>
+ #include <cstring>
++#include <cstdint>
+ #include <functional>
+ #ifdef WIN32
+ 	#include <cwctype>
+--- a/thirdparty/rocksdb/db/compaction_iteration_stats.h
++++ b/thirdparty/rocksdb/db/compaction_iteration_stats.h
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ struct CompactionIterationStats {
+   // Compaction statistics
+ 
meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb +1 -0
index b843f72a52..1bf99d4907 100644
@@ -31,6 +31,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git;branch=master;protocol=ht
             file://0001-cxxopts-Add-limits-header.patch \
             file://0001-Fix-build-with-libc.patch \
             file://0001-civetweb-Disable-lto.patch \
+            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
             file://minifi.service \
             file://systemd-volatile.conf \
             file://sysvinit-volatile.conf \
Signature · 1 line
2.39.1