dev-qt/qtwebengine: Update gcc-10.patch

Additionally includes patch to decoding_state.h.

Thanks-to: Jimi Huotari <chiitoo@gentoo.org>
Bug: https://bugs.gentoo.org/721876
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-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
deleted file mode 100644 (file)
index 9a467f5..0000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/files/qtwebengine-5.14.2-gcc-10-1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
similarity index 64%
rename from dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
index 214bf76a65245742d70e1018c9c2fbab5413ebd7..5df71a6025274e7d050f6419cc5aacca021fc465 100644 (file)
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10-1.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
@@ -1,18 +1,32 @@
-From f6e84fa97536812867be6f4c2162f5b86547477f Mon Sep 17 00:00:00 2001
+From cf83347e6fa9c086b5df022d23ca666245bf1989 Mon Sep 17 00:00:00 2001
 From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Tue, 5 May 2020 07:50:18 +0300
+Date: Sun, 10 May 2020 06:02:59 +0300
 Subject: [PATCH] Fix build with GCC 10
 
-Change-Id: I4101211163f3bb3f9a5fa673169aa41fa000ccca
+Change-Id: I733b8e8a00c49766effbee08c8b1f6f5d31a2dbf
 ---
+ chromium/base/trace_event/trace_event_memory_overhead.h          | 1 +
  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(+)
+ .../third_party/webrtc/modules/video_coding/decoding_state.h     | 1 +
+ 6 files changed, 6 insertions(+)
 
+diff --git a/chromium/base/trace_event/trace_event_memory_overhead.h b/chromium/base/trace_event/trace_event_memory_overhead.h
+index 69468d46409..e10a3eca667 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
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
++#include <string>
+ #include <unordered_map>
+ 
+ #include "base/base_export.h"
 diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
-index dbe59ba5ea7..5216cfe3ee9 100644
+index 3f220da8c71..c54e3bb7d30 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 @@
@@ -59,6 +73,17 @@ index 22528c94892..69e624e8b19 100644
  
  namespace webrtc {
  
+diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
+index b87fb2d0345..e6c5e2855de 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
+@@ -13,6 +13,7 @@
+ 
+ #include <map>
+ #include <set>
++#include <stdint.h>
+ #include <vector>
+ 
+ namespace webrtc {
 -- 
 2.26.2
-

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