From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/
Date: Fri, 15 Dec 2017 22:04:34 +0000 (UTC) [thread overview]
Message-ID: <1513375284.8e488dabaa7ea2058ed9fefc1986b2ddedaebe5c.chiitoo@gentoo> (raw)
commit: 8e488dabaa7ea2058ed9fefc1986b2ddedaebe5c
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 21:57:25 2017 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 22:01:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8e488dab
dev-qt/qtwebengine: bring back the ICU patch for 5.9.9999
While 9fc33af6d26ab78fa51e4570e972502cad3bb9ee is correct in that
this patch does not apply on 5.9999 and 5.10.*, it's still required
for 5.9.9999 (and the others do have the same issue still, but
require a different patch).
Package-Manager: Portage-2.3.18, Repoman-2.3.6
.../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
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
new file mode 100644
index 00000000..9866ab92
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+ // are added to the allowed set. The list has to be updated when a new
+ // version of Unicode is released. The current version is 9.0.0 and ICU 60
+ // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+ const icu::UnicodeSet aspirational_scripts(
+ icu::UnicodeString(
+ // Unified Canadian Syllabics
next reply other threads:[~2017-12-15 22:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-15 22:04 Jimi Huotari [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-18 15:33 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/ Andreas Sturmlechner
2018-06-21 9:16 Jimi Huotari
2018-03-17 4:14 Davide Pesavento
2018-02-09 11:40 Michael Palimaka
2016-04-23 19:37 Davide Pesavento
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513375284.8e488dabaa7ea2058ed9fefc1986b2ddedaebe5c.chiitoo@gentoo \
--to=chiitoo@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox