Accepting request 379845 from KDE:Qt5
Update to 5.6.0 OBS-URL: https://build.opensuse.org/request/show/379845 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwayland?expand=0&rev=8
This commit is contained in:
parent
6db3031e3e
commit
f8fdf567c6
12
0001-partially-revert-505c373.diff
Normal file
12
0001-partially-revert-505c373.diff
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro
|
||||||
|
index 8d7f488..9f7751a 100644
|
||||||
|
--- a/examples/wayland/server-buffer/compositor/compositor.pro
|
||||||
|
+++ b/examples/wayland/server-buffer/compositor/compositor.pro
|
||||||
|
@@ -17,4 +17,7 @@ RESOURCES += compositor.qrc
|
||||||
|
CONFIG +=wayland-scanner
|
||||||
|
WAYLANDSERVERSOURCES += ../share-buffer.xml
|
||||||
|
|
||||||
|
+CONFIG += link_pkgconfig
|
||||||
|
+PKGCONFIG += wayland-server
|
||||||
|
+
|
||||||
|
DEFINES += QT_COMPOSITOR_QUICK
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp
|
|
||||||
index 5c625ed..aa0ec27 100644
|
|
||||||
--- a/src/client/qwaylandscreen.cpp
|
|
||||||
+++ b/src/client/qwaylandscreen.cpp
|
|
||||||
@@ -220,7 +220,12 @@ void QWaylandScreen::output_done()
|
|
||||||
QWindowSystemInterface::handleScreenOrientationChange(screen(), m_orientation);
|
|
||||||
mTransform = -1;
|
|
||||||
}
|
|
||||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
|
|
||||||
+ QWindowSystemInterface::handleScreenGeometryChange(screen(), mGeometry);
|
|
||||||
+ QWindowSystemInterface::handleScreenAvailableGeometryChange(screen(), mGeometry);
|
|
||||||
+#else
|
|
||||||
QWindowSystemInterface::handleScreenGeometryChange(screen(), mGeometry, mGeometry);
|
|
||||||
+#endif
|
|
||||||
QWindowSystemInterface::handleScreenRefreshRateChange(screen(), refreshRate());
|
|
||||||
}
|
|
||||||
|
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 18 19:03:29 UTC 2016 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
- Update to 5.6.0
|
||||||
|
* For more details please see:
|
||||||
|
http://blog.qt.io/blog/2016/03/16/qt-5-6-released/
|
||||||
|
and https://wiki.qt.io/New_Features_in_Qt_5.6
|
||||||
|
- Drop adjust_api.diff, we don't need nor want to support Qt 5.3
|
||||||
|
- Added 0001-partially-revert-505c373.diff: use pkgconfig to gather
|
||||||
|
wayland includes
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Oct 16 20:22:38 UTC 2015 - hrvoje.senjan@gmail.com
|
Fri Oct 16 20:22:38 UTC 2015 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package libqt5-qtwayland
|
# spec file for package libqt5-qtwayland
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,14 +16,14 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define qt5_snapshot 0
|
%define qt5_snapshot 1
|
||||||
%define libname libQt5Compositor5
|
%define libname libQt5Compositor5
|
||||||
%define base_name libqt5
|
%define base_name libqt5
|
||||||
%define real_version 5.5.1
|
%define real_version 5.6.0
|
||||||
%define so_version 5.5.1
|
%define so_version 5.6.0
|
||||||
%define tar_version qtwayland-opensource-src-%{real_version}
|
%define tar_version qtwayland-opensource-src-%{real_version}
|
||||||
Name: libqt5-qtwayland
|
Name: libqt5-qtwayland
|
||||||
Version: 5.5.1
|
Version: 5.6.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Qt 5 Wayland Addon
|
Summary: Qt 5 Wayland Addon
|
||||||
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
|
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
|
||||||
@ -31,8 +31,8 @@ Group: Development/Libraries/X11
|
|||||||
Url: http://qt.digia.com
|
Url: http://qt.digia.com
|
||||||
Source: %{tar_version}.tar.xz
|
Source: %{tar_version}.tar.xz
|
||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM adjust_api.diff -- make qtwayland build with 5.3.x QPA API
|
# PATCH-FIX-UPSTREAM -- 0001-partially-revert-505c373.diff -- Fix the build
|
||||||
Patch0: adjust_api.diff
|
Patch0: 0001-partially-revert-505c373.diff
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: libqt5-qtbase-private-headers-devel >= 5.2.0
|
BuildRequires: libqt5-qtbase-private-headers-devel >= 5.2.0
|
||||||
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.2.0
|
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.2.0
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:c3804bdc49a952af0301bbccdb402d8f859044732246f5a12ae8e0f4ae8bdda6
|
|
||||||
size 259312
|
|
3
qtwayland-opensource-src-5.6.0.tar.xz
Normal file
3
qtwayland-opensource-src-5.6.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:b55d0142f245c927970031ef908e98cb20f1d7a2a5441647ed937252fed3bfcc
|
||||||
|
size 262996
|
Loading…
x
Reference in New Issue
Block a user