From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 28 Nov 2023 09:39:18 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1r7tcj-00Bvzr-39 for lore@lore.pengutronix.de; Tue, 28 Nov 2023 09:39:18 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r7tck-0005eo-3T; Tue, 28 Nov 2023 09:39:18 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r7tab-0003Fn-6L; Tue, 28 Nov 2023 09:37:05 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1r7taa-00C8AZ-PI; Tue, 28 Nov 2023 09:37:04 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1r7taa-004RUP-2I; Tue, 28 Nov 2023 09:37:04 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 28 Nov 2023 09:37:04 +0100 Message-Id: <20231128083704.1058837-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231123084643.1323494-1-f.pfitzner@pengutronix.de> References: <20231123084643.1323494-1-f.pfitzner@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] qt5: add patch to fix gcc13 errors X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Fabian Pfitzner Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 5b3fd71d5f5e0a36b3338108e9c2f0ab2ef21270. Michael [sent from post-receive hook] On Tue, 28 Nov 2023 09:37:04 +0100, Fabian Pfitzner wrote: > with gcc13 some include files where moved or consolidated which results > in compilation errors because those includes are not found anymore. > > this patch adds missing includes to avoid compilation errors with > the gcc13 toolchain. > > Signed-off-by: Fabian Pfitzner > Message-Id: <20231123084643.1323494-1-f.pfitzner@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/patches/qt-everywhere-opensource-src-5.15.11/0403-qtwebengine-fix-gcc13-error.patch b/patches/qt-everywhere-opensource-src-5.15.11/0403-qtwebengine-fix-gcc13-error.patch > new file mode 100644 > index 000000000000..bfc579badcf9 > --- /dev/null > +++ b/patches/qt-everywhere-opensource-src-5.15.11/0403-qtwebengine-fix-gcc13-error.patch > @@ -0,0 +1,272 @@ > +From a27662110afa1c227fc3e31cccd47d62cdd1d897 Mon Sep 17 00:00:00 2001 > +From: Fabian Pfitzner > +Date: Tue, 7 Nov 2023 15:22:29 +0100 > +Subject: [PATCH] qt5 qtwebengine: fix gcc13 errors > + > +newer toolchains based on gcc13 will throw errors like > + > +../../../../../qt-everywhere-opensource-src-5.15.11/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::' > + 34 | enum class FormatConversionChar : uint8_t; > + | ^ > + | :: > + > +which is due to a missing include. the file cstdint.h defines the types > +necessary by qtwebengine and therefore this patch includes the file > +where needed. > + > +Signed-off-by: Fabian Pfitzner > +--- > + qtwebengine/src/3rdparty/chromium/base/debug/profiler.h | 1 + > + .../content/public/browser/browsing_data_remover_delegate.h | 1 + > + .../chromium/device/base/synchronization/one_writer_seqlock.cc | 2 ++ > + .../chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 + > + .../chromium/gpu/command_buffer/common/webgpu_cmd_enums.h | 2 ++ > + qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h | 1 + > + qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h | 1 + > + qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h | 1 + > + .../src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h | 1 + > + .../abseil-cpp/absl/strings/internal/str_format/extension.h | 1 + > + .../chromium/third_party/angle/include/GLSLANG/ShaderVars.h | 1 + > + .../3rdparty/chromium/third_party/angle/src/common/angleutils.h | 1 + > + .../breakpad/src/client/linux/handler/minidump_descriptor.h | 1 + > + .../third_party/perfetto/include/perfetto/ext/base/uuid.h | 1 + > + .../src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h | 1 + > + .../third_party/webrtc/rtc_base/third_party/base64/base64.h | 1 + > + qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h | 1 + > + qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h | 1 + > + .../3rdparty/chromium/v8/src/inspector/v8-string-conversions.h | 1 + > + 19 files changed, 21 insertions(+) > + > +diff --git a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h > +index 1229e06234c5..c7ed55e70f7a 100644 > +--- a/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h > ++++ b/qtwebengine/src/3rdparty/chromium/base/debug/profiler.h > +@@ -5,6 +5,7 @@ > + #ifndef BASE_DEBUG_PROFILER_H_ > + #define BASE_DEBUG_PROFILER_H_ > + > ++#include > + #include > + > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h > +index 3896bc6e786e..b93843dc16bf 100644 > +--- a/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h > ++++ b/qtwebengine/src/3rdparty/chromium/content/public/browser/browsing_data_remover_delegate.h > +@@ -5,6 +5,7 @@ > + #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ > + #define CONTENT_PUBLIC_BROWSER_BROWSING_DATA_REMOVER_DELEGATE_H_ > + > ++#include > + #include > + #include > + #include "base/callback_forward.h" > +diff --git a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc > +index 213b6301c052..98266a16c613 100644 > +--- a/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc > ++++ b/qtwebengine/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc > +@@ -2,6 +2,8 @@ > + // Use of this source code is governed by a BSD-style license that can be > + // found in the LICENSE file. > + > ++#include > ++ > + #include "device/base/synchronization/one_writer_seqlock.h" > + > + namespace device { > +diff --git a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h > +index 0c27ae710596..b64f82f75484 100644 > +--- a/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h > ++++ b/qtwebengine/src/3rdparty/chromium/device/bluetooth/public/cpp/bluetooth_uuid.h > +@@ -5,6 +5,7 @@ > + #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ > + #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h > +index 83615b30c8ab..8fa9fb1f6d57 100644 > +--- a/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h > ++++ b/qtwebengine/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_enums.h > +@@ -5,6 +5,8 @@ > + #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ > + #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_ENUMS_H_ > + > ++#include > ++ > + namespace gpu { > + namespace webgpu { > + > +diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h > +index e33874ba3bd0..824a207a2243 100644 > +--- a/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h > ++++ b/qtwebengine/src/3rdparty/chromium/gpu/config/device_perf_info.h > +@@ -5,6 +5,7 @@ > + #ifndef GPU_CONFIG_DEVICE_PERF_INFO_H_ > + #define GPU_CONFIG_DEVICE_PERF_INFO_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h > +index 027f1a5af3e0..70759b2ae47c 100644 > +--- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h > ++++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_feature_info.h > +@@ -5,6 +5,7 @@ > + #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_ > + #define GPU_CONFIG_GPU_FEATURE_INFO_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h > +index 6b8587151d61..e2bc6b90f2fd 100644 > +--- a/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h > ++++ b/qtwebengine/src/3rdparty/chromium/gpu/config/gpu_preferences.h > +@@ -5,6 +5,7 @@ > + #ifndef GPU_CONFIG_GPU_PREFERENCES_H_ > + #define GPU_CONFIG_GPU_PREFERENCES_H_ > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h > +index 9e506b555012..cfb03bfe2b30 100644 > +--- a/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h > ++++ b/qtwebengine/src/3rdparty/chromium/net/cookies/cookie_inclusion_status.h > +@@ -5,6 +5,7 @@ > + #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ > + #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h > +index a9b9e137deb2..562327f1c401 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/abseil-cpp/absl/strings/internal/str_format/extension.h > +@@ -18,6 +18,7 @@ > + > + #include > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h > +index 9911546b90d0..0178796c46d8 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/include/GLSLANG/ShaderVars.h > +@@ -10,6 +10,7 @@ > + #ifndef GLSLANG_SHADERVARS_H_ > + #define GLSLANG_SHADERVARS_H_ > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h > +index f669d7df3082..8f391fdd72cb 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/angleutils.h > +@@ -15,6 +15,7 @@ > + # include "absl/container/flat_hash_map.h" > + #endif // defined(ANGLE_USE_ABSEIL) > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h > +index c7e4f2b3787f..85e8c4b04b95 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/minidump_descriptor.h > +@@ -30,6 +30,7 @@ > + #ifndef CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ > + #define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h > +index 1b4c53815bc4..359d5ebdd24d 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h > +@@ -17,6 +17,7 @@ > + #ifndef INCLUDE_PERFETTO_EXT_BASE_UUID_H_ > + #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h > +index 3aa7e9df2681..3cfc8d6a3e9d 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/call/rtp_demuxer.h > +@@ -11,6 +11,7 @@ > + #ifndef CALL_RTP_DEMUXER_H_ > + #define CALL_RTP_DEMUXER_H_ > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h > +index 7a936f23e782..21951a1d2401 100644 > +--- a/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h > ++++ b/qtwebengine/src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h > +@@ -12,6 +12,7 @@ > + #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ > + #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h > +index fe39f988225e..dbe130581cb1 100644 > +--- a/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h > ++++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/logging.h > +@@ -5,6 +5,7 @@ > + #ifndef V8_BASE_LOGGING_H_ > + #define V8_BASE_LOGGING_H_ > + > ++#include > + #include > + #include > + #include > +diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h > +index 37cab78f08fc..4220eacbbbfc 100644 > +--- a/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h > ++++ b/qtwebengine/src/3rdparty/chromium/v8/src/base/macros.h > +@@ -5,6 +5,7 @@ > + #ifndef V8_BASE_MACROS_H_ > + #define V8_BASE_MACROS_H_ > + > ++#include > + #include > + #include > + > +diff --git a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h > +index c1d69c18f0a8..eb33c6816a58 100644 > +--- a/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h > ++++ b/qtwebengine/src/3rdparty/chromium/v8/src/inspector/v8-string-conversions.h > +@@ -5,6 +5,7 @@ > + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ > + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ > + > ++#include > + #include > + > + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may > +-- > +2.39.2 > + > diff --git a/patches/qt-everywhere-opensource-src-5.15.11/series b/patches/qt-everywhere-opensource-src-5.15.11/series > index d7218170e001..9394bd5220da 100644 > --- a/patches/qt-everywhere-opensource-src-5.15.11/series > +++ b/patches/qt-everywhere-opensource-src-5.15.11/series > @@ -28,6 +28,7 @@ > 0400-ptxdist-qtwebengine-allow-building-with-ptxdist.patch > 0401-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch > 0402-HACK-qtwebengine-workaround-for-too-long-file-names.patch > +0403-qtwebengine-fix-gcc13-error.patch > #tag:kms --start-number 500 > 0500-eglfs_kms-device-ordering-robustness.patch > # c9ac4e4caaee7f59e4a9de293fbd89af - git-ptx-patches magic