This commit is contained in:
Jan Grulich 2018-02-14 09:02:55 +01:00
parent 92de09a0b7
commit e8014c39d4
4 changed files with 7 additions and 47 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
/qtwayland-opensource-src-5.9.2.tar.xz
/qtwayland-opensource-src-5.9.3.tar.xz
/qtwayland-everywhere-src-5.10.0.tar.xz
/qtwayland-everywhere-src-5.10.1.tar.xz

View File

@ -2,8 +2,8 @@
Summary: Qt5 - Wayland platform support and QtCompositor module
Name: qt5-%{qt_module}
Version: 5.10.0
Release: 3%{?dist}
Version: 5.10.1
Release: 1%{?dist}
License: LGPLv3
Url: http://www.qt.io
@ -11,10 +11,6 @@ Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/
# Upstream patches
# QTBUG-65553
# https://codereview.qt-project.org/#/c/210552/
Patch0: qtwayland-do-not-recreate-hidden-egl-surfaces.patch
# filter qml provides
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
@ -58,8 +54,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep
%setup -q -n %{qt_module}-everywhere-src-%{version}
%patch0 -p1 -b .do-not-recreate-hidden-egl-surfaces
%build
%{qmake_qt5}
make %{?_smp_mflags}
@ -119,6 +113,9 @@ popd
%changelog
* Wed Feb 14 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-1
- 5.10.1
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,38 +0,0 @@
From a343c589a966d0342fcc75e0d6ce24e1f5157540 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Wed, 3 Jan 2018 19:18:42 +0000
Subject: [PATCH] Don't recreate hidden egl surfaces
QWaylandEglWindow deletes surfaces when a window changes from hidden to
visible, presumably as a result of us not having a valid wl_surface
object. By extension it doesn't make sense to create a surface whilst a
window is still hidden.
This fixes a crash where a QQuickWindow hides and then is destroyed. In
QQuickWindow destruction we have to create a valid context in order to
delete any textures/assets owned by the scene graph; as the wl_surface
has gone this causes an error in the EGL libs when we create an EGL
surface.
Task-number: QTBUG-65553
Change-Id: I9b37a86326bf2cd7737c4e839c1aa8c74cf08116
---
.../client/wayland-egl/qwaylandglcontext.cpp | 2 +-
tests/auto/client/client/tst_client.cpp | 35 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 2a9e39e..f4dd6f4 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -407,7 +407,7 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
window->createDecoration();
if (eglSurface == EGL_NO_SURFACE) {
- window->updateSurface(true);
+ window->updateSurface(window->isExposed());
eglSurface = window->eglSurface();
}
--
2.7.4

View File

@ -1 +1 @@
SHA512 (qtwayland-everywhere-src-5.10.0.tar.xz) = 56c97f437fe01bf975cea06aaaeebe62053e8fc3d3d8227a0c9a7582c4cadf801d3806df349887fff513a60c5ffee302777010bc342b22a0fc0170ea7138e821
SHA512 (qtwayland-everywhere-src-5.10.1.tar.xz) = ca68abdc538c79a69776a55aa94c54db455536ab523e4b566f67fbdca7ee5a78f6eb95b52800425f79656dfe74ed06d5216be9d37babc833aacedeade7f4b2f3