5.11.0
use %make_build %ldconfig_scriptlets
This commit is contained in:
parent
13a9a5b837
commit
91817d3782
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,5 +1 @@
|
||||
/qtwayland-opensource-src-5.9.1.tar.xz
|
||||
/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
|
||||
/qtwayland-everywhere-src-5.11.0.tar.xz
|
||||
|
@ -2,16 +2,13 @@
|
||||
|
||||
Summary: Qt5 - Wayland platform support and QtCompositor module
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.10.1
|
||||
Release: 2%{?dist}
|
||||
Version: 5.11.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: LGPLv3
|
||||
Url: http://www.qt.io
|
||||
Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||
|
||||
# Upstream patches
|
||||
# https://codereview.qt-project.org/#/c/222139/
|
||||
Patch0: qtwayland-test-for-null-pointer-before-using-it.patch
|
||||
%global majmin %(echo %{version} | cut -d. -f1-2)
|
||||
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
|
||||
|
||||
# filter qml provides
|
||||
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
||||
@ -60,7 +57,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%build
|
||||
%{qmake_qt5}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
@ -79,12 +77,11 @@ done
|
||||
popd
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%doc README
|
||||
%license LICENSE.LGPL*
|
||||
%license LICENSE.*
|
||||
%{_qt5_libdir}/libQt5WaylandCompositor.so.5*
|
||||
%{_qt5_libdir}/libQt5WaylandClient.so.5*
|
||||
%{_qt5_plugindir}/wayland-decoration-client/
|
||||
@ -117,6 +114,10 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
|
||||
- 5.11.0
|
||||
- use %%make_build %%ldconfig_scriptlets
|
||||
|
||||
* Tue Mar 13 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-2
|
||||
- Do not crash when opening dialogs
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
|
||||
index 54395a64..edaf2bec 100644
|
||||
--- a/src/client/qwaylandwindow.cpp
|
||||
+++ b/src/client/qwaylandwindow.cpp
|
||||
@@ -801,7 +801,7 @@ static QWaylandWindow *closestShellSurfaceWindow(QWindow *window)
|
||||
{
|
||||
while (window) {
|
||||
auto w = static_cast<QWaylandWindow *>(window->handle());
|
||||
- if (w->shellSurface())
|
||||
+ if (w && w->shellSurface())
|
||||
return w;
|
||||
window = window->transientParent() ? window->transientParent() : window->parent();
|
||||
}
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (qtwayland-everywhere-src-5.10.1.tar.xz) = ca68abdc538c79a69776a55aa94c54db455536ab523e4b566f67fbdca7ee5a78f6eb95b52800425f79656dfe74ed06d5216be9d37babc833aacedeade7f4b2f3
|
||||
SHA512 (qtwayland-everywhere-src-5.11.0.tar.xz) = 87ac51381344062e2ae67dd41e4660c3d1fc01901fe4e0b30c3021f9c11fdaac9bebefeda61524493d0063f8d7eca42697eb3502bc439de5d49828bb5d811eba
|
||||
|
Loading…
Reference in New Issue
Block a user