| 1 |
commit: b15d1aecf2a9022c2b4716fc70152db3e3e6596e |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 09:25:31 2019 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 09:26:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b15d1aec |
| 7 |
|
| 8 |
dev-qt/qtwebengine: remove patch landed upstream |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/qtwebengine-5.13.0-fixup-system-icu.patch | 17 ----------------- |
| 14 |
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 4 ---- |
| 15 |
2 files changed, 21 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
deleted file mode 100644 |
| 19 |
index e7fb9f81..00000000 |
| 20 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.13.0-fixup-system-icu.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,17 +0,0 @@ |
| 23 |
-From https://codereview.qt-project.org/#/c/251995/ |
| 24 |
- |
| 25 |
---- a/src/3rdparty/chromium/url/url_idna_icu.cc |
| 26 |
-+++ b/src/3rdparty/chromium/url/url_idna_icu.cc |
| 27 |
-@@ -86,8 +86,10 @@ bool IDNToASCII(const base::char16* src, int src_len, CanonOutputW* output) { |
| 28 |
- while (true) { |
| 29 |
- UErrorCode err = U_ZERO_ERROR; |
| 30 |
- UIDNAInfo info = UIDNA_INFO_INITIALIZER; |
| 31 |
-- int output_length = uidna_nameToASCII(uidna, src, src_len, output->data(), |
| 32 |
-- output->capacity(), &info, &err); |
| 33 |
-+ int output_length = uidna_nameToASCII(uidna, |
| 34 |
-+ reinterpret_cast<const UChar*>(src), src_len, |
| 35 |
-+ reinterpret_cast<UChar*>(output->data()), output->capacity(), |
| 36 |
-+ &info, &err); |
| 37 |
- if (U_SUCCESS(err) && info.errors == 0) { |
| 38 |
- output->set_length(output_length); |
| 39 |
- return true; |
| 40 |
|
| 41 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 42 |
index f880cc18..92ce913b 100644 |
| 43 |
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 44 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild |
| 45 |
@@ -78,10 +78,6 @@ DEPEND="${RDEPEND} |
| 46 |
pax_kernel? ( sys-apps/elfix ) |
| 47 |
" |
| 48 |
|
| 49 |
-PATCHES=( |
| 50 |
- "${FILESDIR}/${PN}-5.13.0-fixup-system-icu.patch" |
| 51 |
-) |
| 52 |
- |
| 53 |
src_prepare() { |
| 54 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" ) |
Archives