Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2016-09-14 23:28:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland" Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2016-08-29 15:11:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kwayland.new/kwayland.changes 2016-09-14 23:28:58.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 6 20:54:11 UTC 2016 - [email protected] + +- Update to 5.26.0 + * Make linux/input.h compile time optional + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.26.0.php + +------------------------------------------------------------------- Old: ---- kwayland-5.25.0.tar.xz New: ---- kwayland-5.26.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.TC9lMr/_old 2016-09-14 23:28:59.000000000 +0200 +++ /var/tmp/diff_new_pack.TC9lMr/_new 2016-09-14 23:28:59.000000000 +0200 @@ -16,9 +16,9 @@ # -%define _tar_path 5.25 +%define _tar_path 5.26 Name: kwayland -Version: 5.25.0 +Version: 5.26.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1+ ++++++ kwayland-5.25.0.tar.xz -> kwayland-5.26.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/CMakeLists.txt new/kwayland-5.26.0/CMakeLists.txt --- old/kwayland-5.25.0/CMakeLists.txt 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/CMakeLists.txt 2016-09-06 00:44:32.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.25.0 NO_MODULE) +find_package(ECM 5.26.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -18,7 +18,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.25.0") # handled by release scripts +set(KF5_VERSION "5.26.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KWAYLAND VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwayland_version.h" @@ -42,6 +42,11 @@ include(KDEInstallDirs) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) +include(CheckIncludeFile) + +check_include_file("linux/input.h" HAVE_LINUX_INPUT_H) +configure_file(config-kwayland.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwayland.h) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) # adjusting CMAKE_C_FLAGS to get wayland protocols to compile set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/autotests/client/CMakeLists.txt new/kwayland-5.26.0/autotests/client/CMakeLists.txt --- old/kwayland-5.25.0/autotests/client/CMakeLists.txt 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/autotests/client/CMakeLists.txt 2016-09-06 00:44:32.000000000 +0200 @@ -69,13 +69,15 @@ ######################################################## # Test WaylandSeat ######################################################## -set( testWaylandSeat_SRCS - test_wayland_seat.cpp - ) -add_executable(testWaylandSeat ${testWaylandSeat_SRCS}) -target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) -add_test(kwayland-testWaylandSeat testWaylandSeat) -ecm_mark_as_test(testWaylandSeat) +if (HAVE_LINUX_INPUT_H) + set( testWaylandSeat_SRCS + test_wayland_seat.cpp + ) + add_executable(testWaylandSeat ${testWaylandSeat_SRCS}) + target_link_libraries( testWaylandSeat Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer Wayland::Client Wayland::Server) + add_test(kwayland-testWaylandSeat testWaylandSeat) + ecm_mark_as_test(testWaylandSeat) +endif() ######################################################## # Test ShmPool @@ -279,24 +281,28 @@ ######################################################## # Test FakeInput ######################################################## -set( testFakeInput_SRCS - test_fake_input.cpp - ) -add_executable(testFakeInput ${testFakeInput_SRCS}) -target_link_libraries( testFakeInput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) -add_test(kwayland-testFakeInput testFakeInput) -ecm_mark_as_test(testFakeInput) +if (HAVE_LINUX_INPUT_H) + set( testFakeInput_SRCS + test_fake_input.cpp + ) + add_executable(testFakeInput ${testFakeInput_SRCS}) + target_link_libraries( testFakeInput Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) + add_test(kwayland-testFakeInput testFakeInput) + ecm_mark_as_test(testFakeInput) +endif() ######################################################## # Test PlasmaWindowModel ######################################################## -set( testPlasmaWindowModel_SRCS - test_plasma_window_model.cpp - ) -add_executable(testPlasmaWindowModel ${testPlasmaWindowModel_SRCS}) -target_link_libraries( testPlasmaWindowModel Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) -add_test(kwayland-testPlasmaWindowModel testPlasmaWindowModel) -ecm_mark_as_test(testPlasmaWindowModel) +if (HAVE_LINUX_INPUT_H) + set( testPlasmaWindowModel_SRCS + test_plasma_window_model.cpp + ) + add_executable(testPlasmaWindowModel ${testPlasmaWindowModel_SRCS}) + target_link_libraries( testPlasmaWindowModel Qt5::Test Qt5::Gui KF5::WaylandClient KF5::WaylandServer) + add_test(kwayland-testPlasmaWindowModel testPlasmaWindowModel) + ecm_mark_as_test(testPlasmaWindowModel) +endif() ######################################################## # Test TextInput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/autotests/client/test_idle.cpp new/kwayland-5.26.0/autotests/client/test_idle.cpp --- old/kwayland-5.25.0/autotests/client/test_idle.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/autotests/client/test_idle.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -152,6 +152,10 @@ QVERIFY(resumedFormIdleSpy.isEmpty()); m_seatInterface->setTimestamp(1); QVERIFY(resumedFormIdleSpy.wait()); + + timeout.reset(); + m_connection->flush(); + m_display->dispatchEvents(); } void IdleTest::testSimulateUserActivity() @@ -176,6 +180,10 @@ QVERIFY(resumedFormIdleSpy.isEmpty()); timeout->simulateUserActivity(); QVERIFY(resumedFormIdleSpy.wait()); + + timeout.reset(); + m_connection->flush(); + m_display->dispatchEvents(); } QTEST_GUILESS_MAIN(IdleTest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/autotests/client/test_wayland_fullscreen_shell.cpp new/kwayland-5.26.0/autotests/client/test_wayland_fullscreen_shell.cpp --- old/kwayland-5.25.0/autotests/client/test_wayland_fullscreen_shell.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/autotests/client/test_wayland_fullscreen_shell.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -105,12 +105,19 @@ QVERIFY(connectedSpy.wait()); KWayland::Client::Registry registry; + QSignalSpy interfacesAnnouncedSpy(®istry, &KWayland::Client::Registry::interfaceAnnounced); + QVERIFY(interfacesAnnouncedSpy.isValid()); QSignalSpy announced(®istry, SIGNAL(fullscreenShellAnnounced(quint32,quint32))); registry.create(connection.display()); QVERIFY(registry.isValid()); registry.setup(); wl_display_flush(connection.display()); - QVERIFY(announced.wait()); + QVERIFY(interfacesAnnouncedSpy.wait()); + + if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) { + QSKIP("Weston does not have fullscreen shell support"); + } + QCOMPARE(announced.count(), 1); KWayland::Client::FullscreenShell fullscreenShell; QVERIFY(!fullscreenShell.isValid()); @@ -132,12 +139,19 @@ QVERIFY(connectedSpy.wait()); KWayland::Client::Registry registry; + QSignalSpy interfacesAnnouncedSpy(®istry, &KWayland::Client::Registry::interfaceAnnounced); + QVERIFY(interfacesAnnouncedSpy.isValid()); QSignalSpy announced(®istry, SIGNAL(fullscreenShellAnnounced(quint32,quint32))); registry.create(connection.display()); QVERIFY(registry.isValid()); registry.setup(); wl_display_flush(connection.display()); - QVERIFY(announced.wait()); + QVERIFY(interfacesAnnouncedSpy.wait()); + + if (!registry.hasInterface(KWayland::Client::Registry::Interface::FullscreenShell)) { + QSKIP("Weston does not have fullscreen shell support"); + } + QCOMPARE(announced.count(), 1); KWayland::Client::FullscreenShell *fullscreenShell = registry.createFullscreenShell(announced.first().first().value<quint32>(), 1, ®istry); QVERIFY(fullscreenShell->isValid()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/autotests/client/test_wayland_surface.cpp new/kwayland-5.26.0/autotests/client/test_wayland_surface.cpp --- old/kwayland-5.25.0/autotests/client/test_wayland_surface.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/autotests/client/test_wayland_surface.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -945,7 +945,9 @@ } QVERIFY(clientDisconnectedSpy.wait()); QCOMPARE(clientDisconnectedSpy.count(), 1); - QCOMPARE(surfaceDestroyedSpy.count(), 0); + if (surfaceDestroyedSpy.isEmpty()) { + QVERIFY(surfaceDestroyedSpy.wait()); + } QTRY_COMPARE(surfaceDestroyedSpy.count(), 1); s->destroy(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/autotests/client/test_wayland_windowmanagement.cpp new/kwayland-5.26.0/autotests/client/test_wayland_windowmanagement.cpp --- old/kwayland-5.25.0/autotests/client/test_wayland_windowmanagement.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/autotests/client/test_wayland_windowmanagement.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -226,6 +226,7 @@ } if (m_thread) { if (m_connection) { + m_connection->flush(); m_connection->deleteLater(); } m_thread->quit(); @@ -235,6 +236,7 @@ } m_connection = nullptr; + m_display->dispatchEvents(); delete m_windowManagementInterface; m_windowManagementInterface = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/config-kwayland.h.cmake new/kwayland-5.26.0/config-kwayland.h.cmake --- old/kwayland-5.25.0/config-kwayland.h.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kwayland-5.26.0/config-kwayland.h.cmake 2016-09-06 00:44:32.000000000 +0200 @@ -0,0 +1 @@ +#cmakedefine01 HAVE_LINUX_INPUT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/src/client/fakeinput.cpp new/kwayland-5.26.0/src/client/fakeinput.cpp --- old/kwayland-5.25.0/src/client/fakeinput.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/src/client/fakeinput.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -24,7 +24,10 @@ #include <QPointF> #include <QSizeF> +#include <config-kwayland.h> +#if HAVE_LINUX_INPUT_H #include <linux/input.h> +#endif #include <wayland-fake-input-client-protocol.h> @@ -99,6 +102,7 @@ void FakeInput::Private::sendPointerButtonState(Qt::MouseButton button, quint32 state) { +#if HAVE_LINUX_INPUT_H Q_ASSERT(manager.isValid()); uint32_t b = 0; switch (button) { @@ -117,6 +121,7 @@ return; } org_kde_kwin_fake_input_button(manager, b, state); +#endif } void FakeInput::requestPointerButtonPress(Qt::MouseButton button) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/src/server/seat_interface.cpp new/kwayland-5.26.0/src/server/seat_interface.cpp --- old/kwayland-5.25.0/src/server/seat_interface.cpp 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/src/server/seat_interface.cpp 2016-09-06 00:44:32.000000000 +0200 @@ -33,7 +33,10 @@ #define WL_SEAT_NAME_SINCE_VERSION 2 #endif // linux +#include <config-kwayland.h> +#if HAVE_LINUX_INPUT_H #include <linux/input.h> +#endif namespace KWayland { @@ -682,6 +685,7 @@ namespace { static quint32 qtToWaylandButton(Qt::MouseButton button) { +#if HAVE_LINUX_INPUT_H static const QHash<Qt::MouseButton, quint32> s_buttons({ {Qt::LeftButton, BTN_LEFT}, {Qt::RightButton, BTN_RIGHT}, @@ -702,6 +706,9 @@ // further mapping not possible, 0x120 is BTN_JOYSTICK }); return s_buttons.value(button, 0); +#else + return 0; +#endif } } @@ -1075,6 +1082,7 @@ if (d->touchInterface.focus.touch && d->touchInterface.focus.surface) { d->touchInterface.focus.touch->down(id, serial, globalPosition - d->touchInterface.focus.offset); } else if (id == 0 && focusedTouchSurface()) { +#if HAVE_LINUX_INPUT_H auto p = d->pointerForSurface(focusedTouchSurface()); if (!p) { return id; @@ -1087,6 +1095,7 @@ wl_fixed_from_double(pos.x()), wl_fixed_from_double(pos.y())); wl_pointer_send_button(p->resource(), serial, timestamp(), BTN_LEFT, WL_POINTER_BUTTON_STATE_PRESSED); +#endif } d->touchInterface.ids << id; @@ -1117,6 +1126,7 @@ if (d->touchInterface.focus.touch && d->touchInterface.focus.surface) { d->touchInterface.focus.touch->up(id, display()->nextSerial()); } else if (id == 0 && focusedTouchSurface()) { +#if HAVE_LINUX_INPUT_H const quint32 serial = display()->nextSerial(); auto p = d->pointerForSurface(focusedTouchSurface()); if (!p) { @@ -1124,6 +1134,7 @@ } wl_pointer_send_button(p->resource(), serial, timestamp(), BTN_LEFT, WL_POINTER_BUTTON_STATE_RELEASED); +#endif } d->touchInterface.ids.removeAll(id); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.25.0/tests/CMakeLists.txt new/kwayland-5.26.0/tests/CMakeLists.txt --- old/kwayland-5.25.0/tests/CMakeLists.txt 2016-08-06 10:41:15.000000000 +0200 +++ new/kwayland-5.26.0/tests/CMakeLists.txt 2016-09-06 00:44:32.000000000 +0200 @@ -30,21 +30,28 @@ ecm_mark_as_test(pasteClient) endif() -add_executable(touchClientTest touchclienttest.cpp) -target_link_libraries(touchClientTest KF5::WaylandClient) - - -add_executable(panelTest paneltest.cpp) -target_link_libraries(panelTest KF5::WaylandClient) -ecm_mark_as_test(panelTest) +if (HAVE_LINUX_INPUT_H) + add_executable(touchClientTest touchclienttest.cpp) + target_link_libraries(touchClientTest KF5::WaylandClient) + + + add_executable(panelTest paneltest.cpp) + target_link_libraries(panelTest KF5::WaylandClient) + ecm_mark_as_test(panelTest) + + add_executable(qtwayland-integration-test qtwaylandintegrationtest.cpp) + target_link_libraries(qtwayland-integration-test Qt5::Core Qt5::Gui KF5::WaylandClient) + ecm_mark_as_test(qtwayland-integration-test) + + add_executable(subsurface-test subsurfacetest.cpp) + target_link_libraries(subsurface-test Qt5::Core Qt5::Gui KF5::WaylandClient) + ecm_mark_as_test(subsurface-test) +endif() add_executable(shadowTest shadowtest.cpp) target_link_libraries(shadowTest KF5::WaylandClient) ecm_mark_as_test(shadowTest) -add_executable(qtwayland-integration-test qtwaylandintegrationtest.cpp) -target_link_libraries(qtwayland-integration-test Qt5::Core Qt5::Gui KF5::WaylandClient) -ecm_mark_as_test(qtwayland-integration-test) if (Qt5Widgets_FOUND) add_executable(dpmsTest dpmstest.cpp) @@ -52,10 +59,6 @@ ecm_mark_as_test(dpmsTest) endif() -add_executable(subsurface-test subsurfacetest.cpp) -target_link_libraries(subsurface-test Qt5::Core Qt5::Gui KF5::WaylandClient) -ecm_mark_as_test(subsurface-test) - add_executable(plasmasurface-test plasmasurfacetest.cpp) target_link_libraries(plasmasurface-test Qt5::Gui KF5::WaylandClient) ecm_mark_as_test(plasmasurface-test)
