From d56d6a774618f1daba86628a1a45d2847e310c53 Mon Sep 17 00:00:00 2001 From: seppiofish Date: Sun, 17 Nov 2019 10:37:14 +0100 Subject: Temporarily adds patch resolving a build failure against icu 65 --- .SRCINFO | 2 ++ PKGBUILD | 9 +++++++-- icu65.patch | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 icu65.patch diff --git a/.SRCINFO b/.SRCINFO index 3308f52..1ab144a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -63,10 +63,12 @@ pkgbase = ungoogled-chromium source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz source = https://github.com/Eloston/ungoogled-chromium/archive/78.0.3904.97-2.tar.gz source = https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/f2914b4d0e0a062da92f1434780dd168b12678db.tar.gz + source = icu65.patch sha256sums = d1f49ab9f4f973536166f587114553c21a29977bdc350dd407a89d34e22a9d07 sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1 sha256sums = 75f20b8bd35f64aeb4b079044f536e494dccbfa6ef6e4d5450dd3abf6abec368 sha256sums = 781bc4f83298286c45fcc941484cbe23cf913a7149bf7233181922f8d58cd833 + sha256sums = 1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41 pkgname = ungoogled-chromium diff --git a/PKGBUILD b/PKGBUILD index 1f5bec4..f66ca49 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -29,11 +29,13 @@ conflicts=('chromium') source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-$pkgrel.tar.gz - https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz) + https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz + icu65.patch) sha256sums=('d1f49ab9f4f973536166f587114553c21a29977bdc350dd407a89d34e22a9d07' '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1' '75f20b8bd35f64aeb4b079044f536e494dccbfa6ef6e4d5450dd3abf6abec368' - '781bc4f83298286c45fcc941484cbe23cf913a7149bf7233181922f8d58cd833') + '781bc4f83298286c45fcc941484cbe23cf913a7149bf7233181922f8d58cd833' + '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py # Keys are the names in the above script; values are the dependencies in Arch @@ -71,6 +73,9 @@ prepare() { cd "$srcdir/chromium-$pkgver" + # https://crbug.com/1014272 + patch -Np1 -i ../icu65.patch + msg2 'Pruning binaries' python "$_utils/prune_binaries.py" ./ "$_ungoogled_repo/pruning.list" msg2 'Applying patches' diff --git a/icu65.patch b/icu65.patch new file mode 100644 index 0000000..811d562 --- /dev/null +++ b/icu65.patch @@ -0,0 +1,64 @@ +From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Wed, 30 Oct 2019 22:49:47 +0000 +Subject: [PATCH] Update ICU to 65.1 from 64 and fix broken tests + +ICU 65-1 release note +http://site.icu-project.org/download/65 + +CLDR 36 release blog +http://blog.unicode.org/2019/10/unicode-cldr-version-36-languagelocale.html + +Most of the test expectation change is due to CLDR 36 update +of Grapheme Cluster for Indic languages +See the following for related changes in ICU 65.1 in this area: +https://unicode-org.atlassian.net/browse/CLDR-10994 +https://unicode-org.atlassian.net/browse/ICU-13637 +https://github.com/unicode-org/cldr/blob/master/common/properties/segments/readme.txt + +Bug: chromium:1014272, chromium:1017047 +Change-Id: I9fc6d4620bf2a4c189940d06d8c79893502db3dd +Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng_disabled +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1866059 +Reviewed-by: Jungshik Shin +Reviewed-by: Doug Turner +Reviewed-by: Michael Wasserman +Reviewed-by: Kent Tamura +Reviewed-by: Trent Apted +Reviewed-by: Mason Freed +Commit-Queue: Frank Tang +Cr-Commit-Position: refs/heads/master@{#711027} +--- + third_party/blink/renderer/core/dom/document.cc | 2 +- + ui/gfx/render_text_harfbuzz.cc | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc +index 511aac29086..f188cf548a6 100644 +--- a/third_party/blink/renderer/core/dom/document.cc ++++ b/third_party/blink/renderer/core/dom/document.cc +@@ -6191,7 +6191,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( + + for (unsigned i = 0; i < length;) { + UChar32 c; +- U16_NEXT(characters, i, length, c) ++ U16_NEXT(characters, i, length, c); + if (c == ':') { + if (saw_colon) + return ParseQualifiedNameResult(kQNMultipleColons); +diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc +index 50e86af6b97..0339ff3ff8e 100644 +--- a/ui/gfx/render_text_harfbuzz.cc ++++ b/ui/gfx/render_text_harfbuzz.cc +@@ -971,7 +971,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBounds(RenderTextHarfBuzz* render_text, + ++total; + } + } +- DCHECK_GT(total, 0); ++ // With ICU 65.1, DCHECK_GT() below fails. ++ // See https://crbug.com/1017047 for more details. ++ // ++ // DCHECK_GT(total, 0); + + // It's possible for |text_index| to point to a diacritical mark, at the end + // of |chars|. In this case all the grapheme boundaries come before it. Just -- cgit v1.2.3