| 1 |
commit: bf2b3bb1663224ea5a711de4be9d972352002d2b |
| 2 |
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 4 18:38:31 2019 +0000 |
| 4 |
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 4 18:39:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bf2b3bb1 |
| 7 |
|
| 8 |
dev-qt/qtwebengine: fix build with USE="system-icu" |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 11 |
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/qtwebengine-5.13.0-fixup-system-icu.patch | 17 +++++++++++++++++ |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild | 2 ++ |
| 15 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 ++ |
| 16 |
3 files changed, 21 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch b/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000..e7fb9f81 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch |
| 23 |
@@ -0,0 +1,17 @@ |
| 24 |
+From https://codereview.qt-project.org/#/c/251995/ |
| 25 |
+ |
| 26 |
+--- a/src/3rdparty/chromium/url/url_idna_icu.cc |
| 27 |
++++ b/src/3rdparty/chromium/url/url_idna_icu.cc |
| 28 |
+@@ -86,8 +86,10 @@ bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { |
| 29 |
+ while (true) { |
| 30 |
+ UErrorCode err = U_ZERO_ERROR; |
| 31 |
+ UIDNAInfo info = UIDNA_INFO_INITIALIZER; |
| 32 |
+- int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(), |
| 33 |
+- output->capacity(), &info, &err); |
| 34 |
++ int output_length = uidna_nameToASCII(uidna, |
| 35 |
++ reinterpret_cast<const UChar*>(src), src_len, |
| 36 |
++ reinterpret_cast<UChar*>(output->data()), output->capacity(), |
| 37 |
++ &info, &err); |
| 38 |
+ if (U_SUCCESS(err) && info.errors == 0) { |
| 39 |
+ output->set_length(output_length); |
| 40 |
+ return true; |
| 41 |
|
| 42 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild |
| 43 |
index cff56886..ff148cf7 100644 |
| 44 |
--- a/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild |
| 45 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.9999.ebuild |
| 46 |
@@ -79,6 +79,8 @@ DEPEND="${RDEPEND} |
| 47 |
pax_kernel? ( sys-apps/elfix ) |
| 48 |
" |
| 49 |
|
| 50 |
+PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" ) |
| 51 |
+ |
| 52 |
src_prepare() { |
| 53 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 57 |
index cff56886..ff148cf7 100644 |
| 58 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 59 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 60 |
@@ -79,6 +79,8 @@ DEPEND="${RDEPEND} |
| 61 |
pax_kernel? ( sys-apps/elfix ) |
| 62 |
" |
| 63 |
|
| 64 |
+PATCHES=( "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" ) |
| 65 |
+ |
| 66 |
src_prepare() { |
| 67 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
Archives