gentoo resync : 03.11.2019

2 files changed, 33 insertions, 26 deletions

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
deleted file mode 100644
index 8acd0b0d06c4..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Thu, 11 Jul 2019 09:35:13 +0200
-Subject: fix build after y2038 changes in glibc
-Patch-mainline: submitted on 2019/07/11
-References: QTBUG-76963
-
-SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
-file wherever needed.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-@@ -67,6 +67,7 @@ typedef void* SockOptArg;
- #endif  // WEBRTC_POSIX
- 
- #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
-+#include <linux/sockios.h>
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
--- 
-2.21.0
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
new file mode 100644
index 000000000000..d7fdaebdb664
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
@@ -0,0 +1,33 @@
+From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: Fix compilation with system ICU
+
+ICU upstream now requires that ICU4C API macros are used with a
+trailing semicolon.
+
+- https://unicode-org.atlassian.net/browse/ICU-20601
+- https://github.com/unicode-org/icu/pull/759
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+Fixes: QTBUG-78911
+Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ .../blink/renderer/core/dom/document.cc            |  2 +-
+ chromium/third_party/icu/BUILD.gn                  | 28 +++++++++++++++-------
+ 2 files changed, 21 insertions(+), 9 deletions(-)
+
+diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
+index 920dab7c48d..43fd422393c 100644
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
+ 
+   for (unsigned i = 0; i < length;) {
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (c == ':') {
+       if (saw_colon)
+         return ParseQualifiedNameResult(kQNMultipleColons);