summaryrefslogtreecommitdiff
path: root/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-29 19:45:41 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2017-01-29 20:12:23 -0300
commita88aac20379bade38bf0473dad8d81ce2a26a4e8 (patch)
tree7ca262e1cdab2ad1aabe24542d11d9b9a28ee4ee /libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
parente3ffc5523be982bb32b89d36d15762c5b976cd31 (diff)
downloadabslibre-a88aac20379bade38bf0473dad8d81ce2a26a4e8.tar.gz
abslibre-a88aac20379bade38bf0473dad8d81ce2a26a4e8.tar.bz2
abslibre-a88aac20379bade38bf0473dad8d81ce2a26a4e8.zip
qt5-webengine-5.8.0-1.parabola1: updating version
Diffstat (limited to 'libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch')
-rw-r--r--libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch56
1 files changed, 55 insertions, 1 deletions
diff --git a/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch b/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
index ced5367c4..f3f6bdee0 100644
--- a/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
+++ b/libre/qt5-webengine/qtwebengine-5.7.0-icu58.patch
@@ -1,4 +1,58 @@
-diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
+From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001
+From: jshin <jshin@chromium.org>
+Date: Fri, 21 Oct 2016 01:15:50 -0700
+Subject: [PATCH] Update aspirational_scripts per Unicode 9
+
+This is a preparation to update ICU to 58.1.
+Without this change, ICU update CL cannot be tested on
+trybots because a compile will fail due to '#error' checking
+if ICU version is less than 58.
+
+BUG=637001
+TEST=None
+TBR=pkasting@chromium.org
+
+Review-Url: https://chromiumcodereview.appspot.com/2436113003
+Cr-Commit-Position: refs/heads/master@{#426749}
+---
+ components/url_formatter/url_formatter.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
+index 4455db3..2b82c0c 100644
+--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -428,9 +428,9 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
+ // 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 8.0.0 and ICU 58
+- // will have Unicode 9.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 58
++ // 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
+@@ -444,13 +444,13 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
+ // Yi
+ "\\uA000-\\uA48C"
+ // Miao
+- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F"
++ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E"
+ "\\U00016F8F-\\U00016F9F]",
+ -1, US_INV),
+ *status);
+ allowed_set.addAll(aspirational_scripts);
+ #else
+-#error "Update aspirational_scripts per Unicode 9.0"
++#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
+diff -Naur qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
+qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp
--- qtwebengine-opensource-src-5.7.0.orig/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:07:38.680665385 -0800
+++ qtwebengine-opensource-src-5.7.0/src/3rdparty/chromium/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-15 17:12:17.564001354 -0800
@@ -26,6 +26,9 @@