Accepting request 743230 from home:Vogtinator:qt5.14

Qt 5.14.0 Beta 2

OBS-URL: https://build.opensuse.org/request/show/743230
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtwebengine?expand=0&rev=3

harmony-fix.diff

@@ -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;
-         }
-     }
- }

libqt5-qtwebengine.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+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 necesary 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>
 

libqt5-qtwebengine.spec

@@ -52,16 +52,16 @@
 %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
 
 Name:           libqt5-qtwebengine
-Version:        5.14.0~alpha
+Version:        5.14.0~beta2
 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.14.0-alpha
+%define real_version 5.14.0-beta2
 %define so_version 5.14.0
-%define tar_version qtwebengine-everywhere-src-5.14.0-alpha
+%define tar_version qtwebengine-everywhere-src-5.14.0-beta2
 Source:         https://download.qt.io/development_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
@@ -70,8 +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 https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/271538
 Patch6:         fix-system-icu.patch
 # http://www.chromium.org/blink not ported to PowerPC
@@ -275,9 +273,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

qtwebengine-everywhere-src-5.14.0-alpha.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3471ee9db68e6139e4a77afb902a004f7f85e80a13f8fc9a24022e9181cdd969
-size 264070480

qtwebengine-everywhere-src-5.14.0-beta2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f0cd5bebb82d1a8a79c0855e1ad28395eab2d649a88d3798fe37e36f4aa4466
+size 241742116