| 1 |
commit: 4d6d86125f464a5834917f3e932ba71cfa4b41ea |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 28 18:38:32 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 28 18:40:10 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d6d8612 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: Sync with ${PN}-5.12.5-icu-65.patch from Gentoo repo |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
...ine-5.13.1-icu-65.patch => qtwebengine-5.12.5-icu-65.patch} | 10 +--------- |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild | 4 ++-- |
| 15 |
2 files changed, 3 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
similarity index 76% |
| 19 |
rename from dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch |
| 20 |
rename to dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch |
| 21 |
index b5df6c8f..d7fdaebd 100644 |
| 22 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.1-icu-65.patch |
| 23 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch |
| 24 |
@@ -3,15 +3,7 @@ From: Kirill Burtsev <kirill.burtsev@××.io> |
| 25 |
Date: Fri, 23 Aug 2019 15:09:25 +0200 |
| 26 |
Subject: Fix compilation with system ICU |
| 27 |
|
| 28 |
-1. system_icu_config is missing default type for UCHAR_TYPE, that causes |
| 29 |
-a mismatch of types all over Chromium. uint16_t is defined as a base type |
| 30 |
-under linux in chromium/build/linux/unbundle/icu.gn. |
| 31 |
-Necessary constructions were lost during recent refactorings, |
| 32 |
-and seems to be restored in later chromium > 77. |
| 33 |
- |
| 34 |
-2. Update shim headers |
| 35 |
- |
| 36 |
-3. ICU upstream now requires that ICU4C API macros are used with a |
| 37 |
+ICU upstream now requires that ICU4C API macros are used with a |
| 38 |
trailing semicolon. |
| 39 |
|
| 40 |
- https://unicode-org.atlassian.net/browse/ICU-20601 |
| 41 |
|
| 42 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild |
| 43 |
index c6a04c51..39f64d63 100644 |
| 44 |
--- a/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild |
| 45 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.1.ebuild |
| 46 |
@@ -79,10 +79,10 @@ DEPEND="${RDEPEND} |
| 47 |
" |
| 48 |
|
| 49 |
PATCHES+=( |
| 50 |
+ "${FILESDIR}/${PN}-5.12.5-icu-65.patch" |
| 51 |
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960 |
| 52 |
- "${FILESDIR}/${P}-icu-65.patch" |
| 53 |
# QTBUG-76963, 5.13 branch: |
| 54 |
- "${FILESDIR}/${PN}-5.13.1-webrtc-missing-header-w-linux-headers-5.2.patch" |
| 55 |
+ "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch" |
| 56 |
# bug 693668, upstream(?) TODO: |
| 57 |
"${FILESDIR}/${P}-no-kcrash-reporting.patch" |
| 58 |
) |
Archives