Hello community, here is the log from the commit of package libqt5-qtwayland for openSUSE:Factory checked in at 2014-10-18 09:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwayland (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqt5-qtwayland" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwayland/libqt5-qtwayland.changes 2014-09-12 10:03:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwayland.new/libqt5-qtwayland.changes 2014-10-18 09:09:26.000000000 +0200 @@ -1,0 +2,9 @@ +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 + +------------------------------------------------------------------- Old: ---- qtwayland-opensource-src-5.4.0-alpha.tar.xz New: ---- adjust_api.diff qtwayland-opensource-src-5.4.0-beta.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwayland.spec ++++++ --- /var/tmp/diff_new_pack.h9OwW7/_old 2014-10-18 09:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.h9OwW7/_new 2014-10-18 09:09:27.000000000 +0200 @@ -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 @@ 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 @@ %prep %setup -q -n qtwayland-opensource-src-%{real_version} +%patch0 -p1 %post -n libQt5Compositor5 -p /sbin/ldconfig ++++++ adjust_api.diff ++++++ 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()); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org