1 |
commit: 63b27c3c2bf8a195fe45c1777840de6252ec7c43 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 14 17:11:37 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 14 17:20:47 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b27c3c |
7 |
|
8 |
dev-qt/qtwebengine: Fix build with GCC-10 |
9 |
|
10 |
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
.../files/qtwebengine-5.14.2-gcc-10-1.patch | 64 ++++++++++++++++++++++ |
15 |
.../files/qtwebengine-5.14.2-gcc-10-2.patch | 27 +++++++++ |
16 |
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 3 +- |
17 |
3 files changed, 93 insertions(+), 1 deletion(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..214bf76a652 |
22 |
--- /dev/null |
23 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch |
24 |
@@ -0,0 +1,64 @@ |
25 |
+From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001 |
26 |
+From: Jimi Huotari <chiitoo@g.o> |
27 |
+Date: Tue, 5 May 2020 07:50:18 +0300 |
28 |
+Subject: [PATCH] Fix build with GCC 10 |
29 |
+ |
30 |
+Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca |
31 |
+--- |
32 |
+ chromium/media/cdm/supported_cdm_versions.h | 1 + |
33 |
+ .../third_party/perfetto/include/perfetto/base/task_runner.h | 1 + |
34 |
+ chromium/third_party/webrtc/call/rtx_receive_stream.h | 1 + |
35 |
+ .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h | 1 + |
36 |
+ 4 files changed, 4 insertions(+) |
37 |
+ |
38 |
+diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h |
39 |
+index dbe59ba5ea7..5216cfe3ee9 100644 |
40 |
+--- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h |
41 |
++++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h |
42 |
+@@ -6,6 +6,7 @@ |
43 |
+ #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_ |
44 |
+ |
45 |
+ #include <array> |
46 |
++#include <cstddef> |
47 |
+ |
48 |
+ #include "media/base/media_export.h" |
49 |
+ #include "media/cdm/api/content_decryption_module.h" |
50 |
+diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h |
51 |
+index cf60401238f..ee4ad255dea 100644 |
52 |
+--- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h |
53 |
++++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h |
54 |
+@@ -18,6 +18,7 @@ |
55 |
+ #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_ |
56 |
+ |
57 |
+ #include <functional> |
58 |
++#include <stdint.h> |
59 |
+ |
60 |
+ #include "perfetto/base/export.h" |
61 |
+ |
62 |
+diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h |
63 |
+index 8ffa4400a9c..66cc46dc091 100644 |
64 |
+--- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h |
65 |
++++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h |
66 |
+@@ -12,6 +12,7 @@ |
67 |
+ #define CALL_RTX_RECEIVE_STREAM_H_ |
68 |
+ |
69 |
+ #include <map> |
70 |
++#include <stdint.h> |
71 |
+ |
72 |
+ #include "call/rtp_packet_sink_interface.h" |
73 |
+ |
74 |
+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 |
75 |
+index 22528c94892..69e624e8b19 100644 |
76 |
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h |
77 |
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h |
78 |
+@@ -12,6 +12,7 @@ |
79 |
+ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ |
80 |
+ |
81 |
+ #include <array> |
82 |
++#include <cstddef> |
83 |
+ |
84 |
+ namespace webrtc { |
85 |
+ |
86 |
+-- |
87 |
+2.26.2 |
88 |
+ |
89 |
|
90 |
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 |
91 |
new file mode 100644 |
92 |
index 00000000000..9a467f5d66b |
93 |
--- /dev/null |
94 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch |
95 |
@@ -0,0 +1,27 @@ |
96 |
+From 0dc7c21c33de634bb6bf90c9e2372054436e1606 Mon Sep 17 00:00:00 2001 |
97 |
+From: Kirill Burtsev <kirill.burtsev@××.io> |
98 |
+Date: Thu, 14 May 2020 16:31:09 +0200 |
99 |
+Subject: [PATCH] FIXUP: Fix build with GCC 10 |
100 |
+ |
101 |
+Add one more missing header when build with pch |
102 |
+ |
103 |
+Change-Id: I42cddb26eacbd18cfbdb359ae1a85d0e2e43316f |
104 |
+--- |
105 |
+ chromium/base/trace_event/trace_event_memory_overhead.h | 2 +- |
106 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
107 |
+ |
108 |
+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 |
109 |
+index 69468d46409..916f9c775a3 100644 |
110 |
+--- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h |
111 |
++++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h |
112 |
+@@ -7,7 +7,7 @@ |
113 |
+ |
114 |
+ #include <stddef.h> |
115 |
+ #include <stdint.h> |
116 |
+- |
117 |
++#include <string> |
118 |
+ #include <unordered_map> |
119 |
+ |
120 |
+ #include "base/base_export.h" |
121 |
+-- |
122 |
+2.16.3 |
123 |
|
124 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild |
125 |
index 78e614ce123..3ca9d6f594d 100644 |
126 |
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild |
127 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild |
128 |
@@ -80,7 +80,8 @@ DEPEND="${RDEPEND} |
129 |
|
130 |
PATCHES=( |
131 |
"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446 |
132 |
- "${FILESDIR}/${PN}-5.14.2-icu67.patch" |
133 |
+ "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054 |
134 |
+ "${FILESDIR}"/${P}-gcc-10-{1,2}.patch # bug 721876 |
135 |
) |
136 |
|
137 |
src_prepare() { |