1
0

Accepting request 748159 from home:Vogtinator:qt5.14

Qt 5.14 Beta 3

OBS-URL: https://build.opensuse.org/request/show/748159
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.14/libqt5-qtwebengine?expand=0&rev=5
This commit is contained in:
Christophe Giboudeaux 2019-11-14 08:34:41 +00:00 committed by Git OBS Bridge
parent 662fdf543d
commit cd1b125ddd
5 changed files with 24 additions and 40 deletions

View File

@ -1,32 +0,0 @@
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) {

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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> Thu Oct 24 13:23:15 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
@ -7,6 +16,15 @@ Thu Oct 24 13:23:15 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Drop patch, not necessary anymore: - Drop patch, not necessary anymore:
* harmony-fix.diff * harmony-fix.diff
-------------------------------------------------------------------
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> Tue Oct 15 12:35:01 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -52,16 +52,16 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries %global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine Name: libqt5-qtwebengine
Version: 5.14.0~beta2 Version: 5.14.0~beta3
Release: 0 Release: 0
Summary: Qt 5 WebEngine Library Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io Url: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.14.0-beta2 %define real_version 5.14.0-beta3
%define so_version 5.14.0 %define so_version 5.14.0
%define tar_version qtwebengine-everywhere-src-5.14.0-beta2 %define tar_version qtwebengine-everywhere-src-5.14.0-beta3
Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz Source: https://download.qt.io/development_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6 # 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 Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch # PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch
Patch3: 0001-fix-build-after-y2038-changes-in-glibc.patch Patch3: 0001-fix-build-after-y2038-changes-in-glibc.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 # http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x ExcludeArch: ppc ppc64 ppc64le s390 s390x
# Try to fix i586 MemoryErrors with rpmlint # Try to fix i586 MemoryErrors with rpmlint

View File

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

View File

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