Luca Beltrame 2020-03-01 08:58:08 +00:00 committed by Git OBS Bridge
parent 340ac32eb7
commit 1fde2ee1a2
5 changed files with 17 additions and 32 deletions

View File

@ -1,24 +0,0 @@
From f614d0a165d92af75d2aa2bfc286cd2687e03831 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
Date: Thu, 13 Feb 2020 16:31:53 +0100
Subject: [PATCH] Fix missing webenginview in designer plugin
The feature name is 'webengine-widgets', but module name
is 'webenginewidgets'.
Fixes: QTBUG-82123
Change-Id: I501815dc74ca96527a888a708121c656447bf7a5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
src/plugins/plugins.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 71c24e6c2..50181aa19 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(webengine-widgets): qtHaveModule(designer): SUBDIRS += qwebengineview
+qtHaveModule(webenginewidgets): qtHaveModule(designer): SUBDIRS += qwebengineview
qtHaveModule(pdf): qtConfig(imageformatplugin): SUBDIRS += imageformats

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Feb 28 09:59:24 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.15.0-beta1:
* New bugfix release
* No changelog available
- Drop patches, now upstream:
* fix-missing-designerplugin.patch
-------------------------------------------------------------------
Wed Feb 19 10:17:00 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -35,16 +35,16 @@
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine
Version: 5.15.0~alpha
Version: 5.15.0~beta1
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.15.0-alpha
%define real_version 5.15.0-beta1
%define so_version 5.15.0
%define tar_version qtwebengine-everywhere-src-5.15.0-alpha
%define tar_version qtwebengine-everywhere-src-5.15.0-beta1
Source: https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
@ -53,8 +53,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
Patch4: fix-missing-designerplugin.patch
# http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x
# Try to fix i586 MemoryErrors with rpmlint
@ -70,6 +68,8 @@ BuildRequires: git-core
BuildRequires: krb5
BuildRequires: krb5-devel
BuildRequires: libQt5QuickControls2-devel
# For building pdf exmples...
BuildRequires: libqt5-qtsvg-devel
BuildRequires: libcap-devel
BuildRequires: libgcrypt-devel
BuildRequires: libicu-devel

View File

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

View File

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