[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     4d6d86125f464a5834917f3e932ba71cfa4b41ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 18:38:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 18:40:10 2019 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d6d8612

dev-qt/qtwebengine: Sync with ${PN}-5.12.5-icu-65.patch from Gentoo repo

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ine-5.13.1-icu-65.patch => qtwebengine-5.12.5-icu-65.patch} | 10 +---------
 dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild                   |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
similarity index 76%
rename from dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
index b5df6c8f..d7fdaebd 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
@@ -3,15 +3,7 @@ From: Kirill Burtsev <kirill.burtsev@qt.io>
 Date: Fri, 23 Aug 2019 15:09:25 +0200
 Subject: Fix compilation with system ICU
 
-1. system_icu_config is missing default type for UCHAR_TYPE, that causes
-a mismatch of types all over Chromium. uint16_t is defined as a base type
-under linux in chromium/build/linux/unbundle/icu.gn.
-Necessary constructions were lost during recent refactorings,
-and seems to be restored in later chromium > 77.
-
-2. Update shim headers
-
-3. ICU upstream now requires that ICU4C API macros are used with a
+ICU upstream now requires that ICU4C API macros are used with a
 trailing semicolon.
 
 - https://unicode-org.atlassian.net/browse/ICU-20601

diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
index c6a04c51..39f64d63 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild
@@ -79,10 +79,10 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES+=(
+	"${FILESDIR}/${PN}-5.12.5-icu-65.patch"
 	"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
-	"${FILESDIR}/${P}-icu-65.patch"
 	# QTBUG-76963, 5.13 branch:
-	"${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch"
+	"${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
 	# bug 693668, upstream(?) TODO:
 	"${FILESDIR}/${P}-no-kcrash-reporting.patch"
 )