dev-qt/qtwebengine: Fix build with GCC-10

Thanks-to: Jimi Huotari <chiitoo@gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
new file mode 100644 (file)
index 0000000..214bf76
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
@@ -0,0 +1,64 @@
+From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Tue, 5 May 2020 07:50:18 +0300
+Subject: [PATCH] Fix build with GCC 10
+
+Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca
+---
+ chromium/media/cdm/supported_cdm_versions.h                      | 1 +
+ .../third_party/perfetto/include/perfetto/base/task_runner.h     | 1 +
+ chromium/third_party/webrtc/call/rtx_receive_stream.h            | 1 +
+ .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h   | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
+index dbe59ba5ea7..5216cfe3ee9 100644
+--- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
++++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
+@@ -6,6 +6,7 @@
+ #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ #include "media/base/media_export.h"
+ #include "media/cdm/api/content_decryption_module.h"
+diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+index cf60401238f..ee4ad255dea 100644
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
+ 
+ #include <functional>
++#include <stdint.h>
+ 
+ #include "perfetto/base/export.h"
+ 
+diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
+index 8ffa4400a9c..66cc46dc091 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
+@@ -12,6 +12,7 @@
+ #define CALL_RTX_RECEIVE_STREAM_H_
+ 
+ #include <map>
++#include <stdint.h>
+ 
+ #include "call/rtp_packet_sink_interface.h"
+ 
+diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+index 22528c94892..69e624e8b19 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
+@@ -12,6 +12,7 @@
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
+ 
+ #include <array>
++#include <cstddef>
+ 
+ namespace webrtc {
+ 
+-- 
+2.26.2
+

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
new file mode 100644 (file)
index 0000000..9a467f5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
@@ -0,0 +1,27 @@
+From 0dc7c21c33de634bb6bf90c9e2372054436e1606 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Thu, 14 May 2020 16:31:09 +0200
+Subject: [PATCH] FIXUP: Fix build with GCC 10
+
+Add one more missing header when build with pch
+
+Change-Id: I42cddb26eacbd18cfbdb359ae1a85d0e2e43316f
+---
+ chromium/base/trace_event/trace_event_memory_overhead.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
+index 69468d46409..916f9c775a3 100644
+--- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
++++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
+@@ -7,7 +7,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
+-
++#include <string>
+ #include <unordered_map>
+ 
+ #include "base/base_export.h"
+-- 
+2.16.3

diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 78e614ce1235ce146c52fca4cd1ce0c0ce2b3b2f..3ca9d6f594d260830eb03e8d4f77ae8b0a91d27c 100644 (file)
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -80,7 +80,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
        "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
-       "${FILESDIR}/${PN}-5.14.2-icu67.patch"
+       "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054
+       "${FILESDIR}"/${P}-gcc-10-{1,2}.patch # bug 721876
 )
 
 src_prepare() {