| 1 |
commit: 0f96244f88e39a6132b484dde151de55ebad29a3 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 5 11:25:20 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 5 11:25:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0f96244f |
| 7 |
|
| 8 |
dev-qt/qtwebengine: Fix build with >=ICU-60 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/639220 |
| 11 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++ |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild | 2 ++ |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild | 2 ++ |
| 16 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++ |
| 17 |
4 files changed, 22 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000..9866ab92 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch |
| 24 |
@@ -0,0 +1,16 @@ |
| 25 |
+Fix build with >=ICU-60 |
| 26 |
+ |
| 27 |
+Bug: https://bugs.gentoo.org/639220 |
| 28 |
+Bug: https://bugreports.qt.io/browse/QTBUG-64925 |
| 29 |
+ |
| 30 |
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc |
| 31 |
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc |
| 32 |
+@@ -488,7 +488,7 @@ |
| 33 |
+ // are added to the allowed set. The list has to be updated when a new |
| 34 |
+ // version of Unicode is released. The current version is 9.0.0 and ICU 60 |
| 35 |
+ // will have Unicode 10.0 data. |
| 36 |
+-#if U_ICU_VERSION_MAJOR_NUM < 60 |
| 37 |
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT) |
| 38 |
+ const icu::UnicodeSet aspirational_scripts( |
| 39 |
+ icu::UnicodeString( |
| 40 |
+ // Unified Canadian Syllabics |
| 41 |
|
| 42 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 43 |
index 2c0bd638..afb0d89d 100644 |
| 44 |
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 45 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild |
| 46 |
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND} |
| 47 |
pax_kernel? ( sys-apps/elfix ) |
| 48 |
" |
| 49 |
|
| 50 |
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) |
| 51 |
+ |
| 52 |
src_prepare() { |
| 53 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 57 |
index 2c0bd638..afb0d89d 100644 |
| 58 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 59 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.9999.ebuild |
| 60 |
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND} |
| 61 |
pax_kernel? ( sys-apps/elfix ) |
| 62 |
" |
| 63 |
|
| 64 |
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
| 68 |
|
| 69 |
|
| 70 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 71 |
index 2c0bd638..afb0d89d 100644 |
| 72 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 73 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 74 |
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND} |
| 75 |
pax_kernel? ( sys-apps/elfix ) |
| 76 |
" |
| 77 |
|
| 78 |
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" ) |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" ) |
Archives