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

Accepting request 756386 from KDE:Qt:5.14

Browse Source 
Update to 5.14.0

OBS-URL: https://build.opensuse.org/request/show/756386
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2020-01-19 19:54:02 +00:00 committed by Git OBS Bridge
commit 5e82dc347c
7 changed files with 66 additions and 1515 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1358
chromium-non-void-return.patch
View File

File diff suppressed because it is too large Load Diff

79
harmony-fix.diff
View File

@ -1,79 +0,0 @@
From: Jan Steffens <heftig@archlinux.org>
Date: 2017-09-19 23:30:08 -0700
Subject: This is required for QtWebEngine to show the patent-free LCD rendering. Without this patch, only grayscale rendering is used.
References: boo#1061344
Upstream: submitted
Index: qtwebengine-everywhere-src-5.13.0-beta2/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
===================================================================
--- qtwebengine-everywhere-src-5.13.0-beta2.orig/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+++ qtwebengine-everywhere-src-5.13.0-beta2/src/3rdparty/chromium/third_party/skia/src/ports/SkFontHost_FreeType.cpp
@@ -122,8 +122,6 @@ public:
: fGetVarDesignCoordinates(nullptr)
, fGetVarAxisFlags(nullptr)
, fLibrary(nullptr)
- , fIsLCDSupported(false)
- , fLCDExtra(0)
{
if (FT_New_Library(&gFTMemory, &fLibrary)) {
return;
@@ -186,8 +184,6 @@ public:
// Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
// The default has changed over time, so this doesn't mean the same thing to all users.
if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
- fIsLCDSupported = true;
- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
}
}
~FreeTypeLibrary() {
@@ -197,8 +193,6 @@ public:
}
FT_Library library() { return fLibrary; }
- bool isLCDSupported() { return fIsLCDSupported; }
- int lcdExtra() { return fLCDExtra; }
// FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
// Prior to this there was no way to get the coordinates out of the FT_Face.
@@ -215,8 +209,6 @@ public:
private:
FT_Library fLibrary;
- bool fIsLCDSupported;
- int fLCDExtra;
// FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
// The following platforms provide FreeType of at least 2.4.0.
@@ -713,17 +705,6 @@ void SkTypeface_FreeType::onFilterRec(Sk
rec->fTextSize = SkIntToScalar(1 << 14);
}
- if (isLCD(*rec)) {
- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr.
- SkAutoMutexAcquire ama(gFTMutex);
- ref_ft_library();
- if (!gFTLibrary->isLCDSupported()) {
- // If the runtime Freetype library doesn't support LCD, disable it here.
- rec->fMaskFormat = SkMask::kA8_Format;
- }
- unref_ft_library();
- }
-
SkFontHinting h = rec->getHinting();
if (kFull_SkFontHinting == h && !isLCD(*rec)) {
// collapse full->normal hinting if we're not doing LCD
@@ -1121,11 +1102,11 @@ bool SkScalerContext_FreeType::getCBoxFo
void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
if (glyph->fMaskFormat == SkMask::kLCD16_Format) {
if (fLCDIsVert) {
- glyph->fHeight += gFTLibrary->lcdExtra();
- glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
+ glyph->fHeight += 2;
+ glyph->fTop -= 1;
} else {
- glyph->fWidth += gFTLibrary->lcdExtra();
- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1;
+ glyph->fWidth += 2;
+ glyph->fLeft -= 1;
}
}
}

62
icu-build-fix.patch
View File

@ -1,62 +0,0 @@
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

57
libqt5-qtwebengine.changes
View File

@ -1,7 +1,60 @@
-------------------------------------------------------------------
Wed Nov 13 19:05:24 UTC 2019 - Michael Gorse <mgorse@suse.com>
Thu Dec 12 12:59:01 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Add icu-build-fix.patch: fix build with icu 65.1.
- Update to 5.14.0:
* New bugfix release
* For the changes between 5.13.2 and 5.14.0 please see:
https://code.qt.io/cgit/qt/qtwebengine.git/tree/dist/changes-5.14.0?h=v5.14.0
* For the changes between 5.13.1 and 5.13.2 please see:
https://code.qt.io/cgit/qt/qtwebengine.git/tree/dist/changes-5.13.2?h=v5.14.0
-------------------------------------------------------------------
Wed Dec 4 14:38:17 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-rc:
* New bugfix release
* No changelog available
* For more details please see:
* For more details about Qt 5.14 please see:
https://wiki.qt.io/New_Features_in_Qt_5.14
-------------------------------------------------------------------
Tue Nov 12 13:03:47 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta3:
* New bugfix release
* No changelog available
- Remove patches, now upstream:
* fix-system-icu.patch
-------------------------------------------------------------------
Thu Oct 24 13:23:15 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta2:
* New bugfix release
* No changelog available
- Drop patch, not necessary anymore:
* harmony-fix.diff
-------------------------------------------------------------------
Tue Oct 15 12:35:01 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta1:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Mon Sep 30 13:30:50 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-alpha:
* New feature release
* No changelog available
* For more details about Qt 5.14 please see:
https://wiki.qt.io/New_Features_in_Qt_5.14
- Drop chromium-non-void-return.patch, with newer post-build-checks
this is not necessary anymore
- Add patch to fix build with system ICU (QTBUG-78911):
* fix-system-icu.patch
-------------------------------------------------------------------
Thu Sep 19 07:48:11 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

19
libqt5-qtwebengine.spec
View File

@ -52,17 +52,17 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine
Version: 5.13.1
Version: 5.14.0
Release: 0
Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
%define real_version 5.13.1
%define so_version 5.13.1
%define tar_version qtwebengine-everywhere-src-5.13.1
Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz
%define real_version 5.14.0
%define so_version 5.14.0
%define tar_version qtwebengine-everywhere-src-5.14.0
Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
Patch1: armv6-ffmpeg-no-thumb.patch
@ -70,12 +70,6 @@ Patch1: armv6-ffmpeg-no-thumb.patch
Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch
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
ExcludeArch: ppc ppc64 ppc64le s390 s390x
# Try to fix i586 MemoryErrors with rpmlint
@ -277,9 +271,12 @@ mv qtwebengine{_new,}.pro
RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
%endif
# Upstream does not care about those warnings, but optflags has -Werror=return-type.
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -Wno-return-type"
# It does not actually include proprietary codecs, it only makes it attempt to use ffmpeg
# Link pulseaudio to work around QTBUG-77037
%qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
QMAKE_CXXFLAGS="$RPM_OPT_FLAGS" \
QMAKE_LFLAGS+="-Wl,--no-keep-memory -Wl,--hash-size=31 -Wl,--reduce-memory-overheads" \
gn_args+="link_pulseaudio=true" \
%if 0%{?suse_version} < 1330

3
qtwebengine-everywhere-src-5.13.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f12e710b76ff2be4497bf368fc01ecd2419e2e962fb90599b0ece00ae2eb7d0
size 256985764

3
qtwebengine-everywhere-src-5.14.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74f8c11cc318612c8d9dc87cf791badb1efe7080c10d8b3ed5843b249a942d32
size 241565016