Accepting request 734738 from home:Vogtinator:qt5.14

Qt 5.14 Alpha

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

fix-system-icu.patch

@@ -0,0 +1,32 @@
+From 7bc2392c19118a80380c7661fb86c69022eb2b47 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev <kirill.burtsev@qt.io>
+Date: Fri, 23 Aug 2019 15:09:25 +0200
+Subject: [PATCH] Fix compilation with system ICU
+
+system_icu_config is missing default type for UCHAR_TYPE, that causes
+a mismatch of types all over Chromium. uint16_t is defined as a base type
+under linux in chromium/build/linux/unbundle/icu.gn.
+Necessary constructions were lost during recent refactorings,
+and seems to be restored in later chromium > 76.
+
+Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
+---
+
+diff --git a/src/3rdparty/chromium/third_party/icu/BUILD.gn b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+index be3c919..639f8fd 100644
+--- a/src/3rdparty/chromium/third_party/icu/BUILD.gn
++++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn
+@@ -1175,6 +1175,12 @@
+     "USING_SYSTEM_ICU=1",
+     "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
+   ]
++
++  if (is_win) {
++    defines += [ "UCHAR_TYPE=wchar_t" ]
++  } else {
++    defines += [ "UCHAR_TYPE=uint16_t" ]
++  }
+ }
+ 
+ if (use_system_icu) {
+

libqt5-qtwebengine.changes

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

libqt5-qtwebengine.spec

@@ -52,17 +52,17 @@
 %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
 
 Name:           libqt5-qtwebengine
-Version:        5.13.1
+Version:        5.14.0~alpha
 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-alpha
+%define so_version 5.14.0
+%define tar_version qtwebengine-everywhere-src-5.14.0-alpha
+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
 Patch1:         armv6-ffmpeg-no-thumb.patch
@@ -72,8 +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-OPENSUSE (copied from the chromium package)
-Patch9:         chromium-non-void-return.patch
+# 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
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
 # Try to fix i586 MemoryErrors with rpmlint

qtwebengine-everywhere-src-5.13.1.tar.xz

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

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

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