Date: Monday, December 2, 2019 @ 11:50:28 Author: arojas Revision: 370204
archrelease: copy trunk to extra-x86_64 Added: qt5-webengine/repos/extra-x86_64/PKGBUILD (from rev 370203, qt5-webengine/trunk/PKGBUILD) qt5-webengine/repos/extra-x86_64/icu65.patch (from rev 370203, qt5-webengine/trunk/icu65.patch) Deleted: qt5-webengine/repos/extra-x86_64/PKGBUILD qt5-webengine/repos/extra-x86_64/icu65.patch -------------+ PKGBUILD | 111 ++++++++++++++++++++++++++------------------------ icu65.patch | 128 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 122 insertions(+), 117 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-02 11:50:03 UTC (rev 370203) +++ PKGBUILD 2019-12-02 11:50:28 UTC (rev 370204) @@ -1,53 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=qt5-webengine -_qtver=5.13.2 -pkgver=${_qtver/-/} -pkgrel=3 -arch=('x86_64') -url='https://www.qt.io' -license=('LGPL3' 'LGPL2.1' 'BSD') -pkgdesc='Provides support for web applications using the Chromium browser project' -depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' - 'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx') -makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler') -groups=('qt' 'qt5') -_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" - icu65.patch - CVE-2019-13720.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10") -sha256sums=('adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb' - '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41' - '3b2ce75214e757f5d0d268fbb1009c2e0c660d19620ae27e8d92a0e492e5d9da') - -prepare() { - mkdir -p build - - cd $_pkgfqn/src/3rdparty - patch -p1 -i "$srcdir"/CVE-2019-13720.patch - patch -p1 -d chromium -i "$srcdir"/icu65.patch -} - -build() { - cd build - - qmake ../${_pkgfqn} -- \ - -proprietary-codecs \ - -system-ffmpeg \ - -webp \ - -spellchecker \ - -webengine-icu - make -} - -package() { - cd build - make INSTALL_ROOT="$pkgdir" install - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium -} Copied: qt5-webengine/repos/extra-x86_64/PKGBUILD (from rev 370203, qt5-webengine/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-02 11:50:28 UTC (rev 370204) @@ -0,0 +1,58 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=qt5-webengine +_qtver=5.13.2 +pkgver=${_qtver/-/} +pkgrel=4 +arch=('x86_64') +url='https://www.qt.io' +license=('LGPL3' 'LGPL2.1' 'BSD') +pkgdesc='Provides support for web applications using the Chromium browser project' +depends=('qt5-webchannel' 'qt5-location' 'libxcomposite' 'libxrandr' 'pciutils' 'libxss' + 'libevent' 'snappy' 'nss' 'libxslt' 'minizip' 'ffmpeg' 're2' 'libvpx') +makedepends=('python2' 'gperf' 'jsoncpp' 'ninja' 'qt5-tools' 'poppler') +groups=('qt' 'qt5') +_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz" + icu65.patch + CVE-2019-13720.patch::"https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10" + qtwebengine-flash.patch::"https://code.qt.io/cgit/qt/qtwebengine.git/patch/?id=e72fd513") +sha256sums=('adcf56b5de6f34744bba2307b696fc75611884f4270e87dfa760d6e99dd711bb' + '1de9bdbfed482295dda45c7d4e323cee55a34e42f66b892da1c1a778682b7a41' + '3b2ce75214e757f5d0d268fbb1009c2e0c660d19620ae27e8d92a0e492e5d9da' + '1a64c4418950b4f9da78fe88c602f7dc274c85197927a3335d35220378ade2df') + +prepare() { + mkdir -p build + + cd $_pkgfqn + patch -p1 -i ../qtwebengine-flash.patch # Fix Flash plugin + + cd src/3rdparty + patch -p1 -i "$srcdir"/CVE-2019-13720.patch + patch -p1 -d chromium -i "$srcdir"/icu65.patch +} + +build() { + cd build + + qmake ../${_pkgfqn} -- \ + -proprietary-codecs \ + -system-ffmpeg \ + -webp \ + -spellchecker \ + -webengine-icu + make +} + +package() { + cd build + make INSTALL_ROOT="$pkgdir" install + + # Drop QMAKE_PRL_BUILD_DIR because reference the build dir + find "$pkgdir/usr/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + + install -Dm644 "$srcdir"/${_pkgfqn}/src/3rdparty/chromium/LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE.chromium +} Deleted: icu65.patch =================================================================== --- icu65.patch 2019-12-02 11:50:03 UTC (rev 370203) +++ icu65.patch 2019-12-02 11:50:28 UTC (rev 370204) @@ -1,64 +0,0 @@ -From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 -From: Frank Tang <ft...@chromium.org> -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 <js...@chromium.org> -Reviewed-by: Doug Turner <do...@chromium.org> -Reviewed-by: Michael Wasserman <m...@chromium.org> -Reviewed-by: Kent Tamura <tk...@chromium.org> -Reviewed-by: Trent Apted <tap...@chromium.org> -Reviewed-by: Mason Freed <masonfr...@chromium.org> -Commit-Queue: Frank Tang <ft...@chromium.org> -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 Copied: qt5-webengine/repos/extra-x86_64/icu65.patch (from rev 370203, qt5-webengine/trunk/icu65.patch) =================================================================== --- icu65.patch (rev 0) +++ icu65.patch 2019-12-02 11:50:28 UTC (rev 370204) @@ -0,0 +1,64 @@ +From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001 +From: Frank Tang <ft...@chromium.org> +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 <js...@chromium.org> +Reviewed-by: Doug Turner <do...@chromium.org> +Reviewed-by: Michael Wasserman <m...@chromium.org> +Reviewed-by: Kent Tamura <tk...@chromium.org> +Reviewed-by: Trent Apted <tap...@chromium.org> +Reviewed-by: Mason Freed <masonfr...@chromium.org> +Commit-Queue: Frank Tang <ft...@chromium.org> +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