rpm/libqt5-qtwebengine
SHA256
1
0
Fork 0
forked from pool/libqt5-qtwebengine
Code Pull Requests Activity

Accepting request 748687 from KDE:Qt5

Browse Source 
- Add icu-build-fix.patch: fix build with icu 65.1.

OBS-URL: https://build.opensuse.org/request/show/748687
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=51
This commit is contained in:
Dominique Leuenberger 2019-11-17 18:22:03 +00:00 committed by Git OBS Bridge
parent 3ecf206e26
commit 515c38b809
3 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
icu-build-fix.patch Normal file
View File

@ -0,0 +1,62 @@
From 5679c3c191ed62b62d8db22f1657a296ee9bfe8e Mon Sep 17 00:00:00 2001
From: Frank Tang <ftang@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 <jshin@chromium.org>
Reviewed-by: Doug Turner <dougt@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Mason Freed <masonfreed@chromium.org>
Commit-Queue: Frank Tang <ftang@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 -urp qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
--- qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc 2019-08-09 08:46:06.000000000 -0500
+++ qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc 2019-11-13 13:00:38.366988759 -0600
@@ -5710,7 +5710,7 @@ static ParseQualifiedNameResult ParseQua
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 -urp qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/ui/gfx/render_text_harfbuzz.cc qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/ui/gfx/render_text_harfbuzz.cc
--- qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/ui/gfx/render_text_harfbuzz.cc 2019-08-09 08:46:06.000000000 -0500
+++ qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/ui/gfx/render_text_harfbuzz.cc 2019-11-14 06:59:00.204944216 -0600
@@ -864,7 +864,10 @@ RangeF TextRunHarfBuzz::GetGraphemeBound
++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

5
libqt5-qtwebengine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 13 19:05:24 UTC 2019 - Michael Gorse <mgorse@suse.com>
- Add icu-build-fix.patch: fix build with icu 65.1.
-------------------------------------------------------------------
Thu Sep 19 07:48:11 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

2
libqt5-qtwebengine.spec
View File

@ -72,6 +72,8 @@ Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
Patch3: 0001-fix-build-after-y2038-changes-in-glibc.patch
# PATCH-FIX-UPSTREAM harmony-fix.diff -- Show the patent-free LCD rendering. Without this patch, only grayscale rendering is used. (for freetype-2.8.1) boo#1061344
Patch5: harmony-fix.diff
# PATCH-FIX-UPSTREAM icu-build-fix.patch: fix build with icu 65.1.
Patch6: icu-build-fix.patch
# PATCH-FIX-OPENSUSE (copied from the chromium package)
Patch9: chromium-non-void-return.patch
# http://www.chromium.org/blink not ported to PowerPC