diff --git a/adjust_api.diff b/adjust_api.diff new file mode 100644 index 0000000..69a6fa0 --- /dev/null +++ b/adjust_api.diff @@ -0,0 +1,17 @@ +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()); + } + diff --git a/libqt5-qtwayland.changes b/libqt5-qtwayland.changes index 91ad978..7966a8c 100644 --- a/libqt5-qtwayland.changes +++ b/libqt5-qtwayland.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 17 09:35:32 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.4.0 beta + * New feature release, please see + http://blog.qt.digia.com/blog/2014/10/17/qt-5-4-beta-available/ + and http://qt-project.org/wiki/New-Features-in-Qt-5.4 +- Added adjust_api.diff, to guard QPA usage found in 5.3 and 5.4 + ------------------------------------------------------------------- Mon Sep 8 20:15:30 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtwayland.spec b/libqt5-qtwayland.spec index 111bec1..de3419e 100644 --- a/libqt5-qtwayland.spec +++ b/libqt5-qtwayland.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQt5Compositor5 %define base_name libqt5 -%define real_version 5.4.0-alpha +%define real_version 5.4.0-beta %define so_version 5.4.0 %define tar_version qtwayland-opensource-src-%{real_version} Name: libqt5-qtwayland -Version: 5.4.0~alpha +Version: 5.4.0~beta Release: 0 Summary: Qt 5 Wayland Addon License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 @@ -31,6 +31,8 @@ Group: Development/Libraries/X11 Url: http://qt.digia.com Source: %{tar_version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM adjust_api.diff -- make qtwayland build with 5.3.x QPA API +Patch0: adjust_api.diff BuildRequires: fdupes BuildRequires: libqt5-qtbase-private-headers-devel >= 5.2.0 BuildRequires: libqt5-qtdeclarative-private-headers-devel >= 5.2.0 @@ -101,6 +103,7 @@ Examples for libqt5-qtwayland module. %prep %setup -q -n qtwayland-opensource-src-%{real_version} +%patch0 -p1 %post -n libQt5Compositor5 -p /sbin/ldconfig diff --git a/qtwayland-opensource-src-5.4.0-alpha.tar.xz b/qtwayland-opensource-src-5.4.0-alpha.tar.xz deleted file mode 100644 index 6b2e212..0000000 --- a/qtwayland-opensource-src-5.4.0-alpha.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93e2c4036b0bd3c87f7905f4d958c37bd9ee17a7a87d5a6b91cf2da847b453c6 -size 244672 diff --git a/qtwayland-opensource-src-5.4.0-beta.tar.xz b/qtwayland-opensource-src-5.4.0-beta.tar.xz new file mode 100644 index 0000000..863dc23 --- /dev/null +++ b/qtwayland-opensource-src-5.4.0-beta.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:144b43cc336f3de7892ccc1b0f7844ee96ce0fc00b28acc7be17091a4770459b +size 247676