[SCM] qtwebengine packaging branch, master, updated. debian/5.9.2+dfsg-2-2-g20f5a48

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=20f5a48

The following commit has been merged in the master branch:
commit 20f5a48edc4e70cf756b1b595cd327f3f9f8a37d
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Nov 9 13:47:04 2017 +0300

    Backport upstream patch to fix build with ICU 60.
---
 debian/changelog           |  2 ++
 debian/patches/icu60.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 60be536..1bf17b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qtwebengine-opensource-src (5.9.2+dfsg-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream patch to fix build with ICU 60.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 Nov 2017 13:46:23 +0300
 
diff --git a/debian/patches/icu60.patch b/debian/patches/icu60.patch
new file mode 100644
index 0000000..7bda9aa
--- /dev/null
+++ b/debian/patches/icu60.patch
@@ -0,0 +1,56 @@
+Description: disallow 5 aspirational scripts in IDN display
+ UTS 31 (http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts)
+ used to list 5 scripts in Table 6 as 'aspirational scripts', but it
+ deprecated the category and moved 5 scripts to Table 7 for limited use
+ scripts.
+ .
+ Given this, there's no basis to treat those 5 scripts differently from
+ other limited use scripts. Note that Mozilla stopped allowing those 5
+ scripts in IDN display a while ago.
+ .
+ This is also necessary for updating ICU to version 60.
+Origin: upstream, https://chromium-review.googlesource.com/731871
+Last-Update: 2017-11-08
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -474,39 +474,6 @@
+   const icu::UnicodeSet* inclusion_set = uspoof_getInclusionUnicodeSet(status);
+   allowed_set.addAll(*inclusion_set);
+ 
+-  // Five aspirational scripts are taken from UTR 31 Table 6 at
+-  // http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts .
+-  // Not all the characters of aspirational scripts are suitable for
+-  // identifiers. Therefore, only characters belonging to
+-  // [:Identifier_Type=Aspirational:] (listed in 'Status/Type=Aspirational'
+-  // section at
+-  // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are
+-  // 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
+-  const icu::UnicodeSet aspirational_scripts(
+-      icu::UnicodeString(
+-          // Unified Canadian Syllabics
+-          "[\u1401-\u166C\u166F-\u167F"
+-          // Mongolian
+-          "\u1810-\u1819\u1820-\u1877\u1880-\u18AA"
+-          // Unified Canadian Syllabics
+-          "\u18B0-\u18F5"
+-          // Tifinagh
+-          "\u2D30-\u2D67\u2D7F"
+-          // Yi
+-          "\uA000-\uA48C"
+-          // Miao
+-          "\U00016F00-\U00016F44\U00016F50-\U00016F7E"
+-          "\U00016F8F-\U00016F9F]",
+-          -1, US_INV),
+-      *status);
+-  allowed_set.addAll(aspirational_scripts);
+-#else
+-#error "Update aspirational_scripts per Unicode 10.0"
+-#endif
+-
+   // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in
+   // the inclusion set. However, they are blacklisted as a part of Mozilla's
+   // IDN blacklist (http://kb.mozillazine.org/Network.IDN.blacklist_chars).
diff --git a/debian/patches/series b/debian/patches/series
index 066d909..e72fcd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ system-icu-utf.patch
 no-icudtl-dat.patch
 disable-last_commit_position.patch
 verbose-gn-bootstrap.patch
+icu60.patch

-- 
qtwebengine packaging