Hello community,
here is the log from the commit of package kwayland-integration for
openSUSE:Factory checked in at 2016-07-15 12:25:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwayland-integration (Old)
and /work/SRC/openSUSE:Factory/.kwayland-integration.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland-integration"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kwayland-integration/kwayland-integration.changes
2016-05-19 12:12:35.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kwayland-integration.new/kwayland-integration.changes
2016-07-15 12:25:50.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Jun 30 12:02:25 UTC 2016 - [email protected]
+
+- Update to 5.7.0
+ * New feature release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.7.0.php
+
+-------------------------------------------------------------------
Old:
----
kwayland-integration-5.6.4.tar.xz
New:
----
kwayland-integration-5.7.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwayland-integration.spec ++++++
--- /var/tmp/diff_new_pack.eU7VIN/_old 2016-07-15 12:25:50.000000000 +0200
+++ /var/tmp/diff_new_pack.eU7VIN/_new 2016-07-15 12:25:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: kwayland-integration
-Version: 5.6.4
+Version: 5.7.0
Release: 0
Summary: Integration plugins for various KDE frameworks for wayland
windowing system
License: LGPL-2.1+
@@ -31,6 +31,7 @@
BuildRequires: cmake(KF5Wayland) >= %{version}
BuildRequires: cmake(KF5WindowSystem) >= 5.12.0
BuildRequires: cmake(Qt5Core) >= 5.4.0
+BuildRequires: cmake(Qt5Test) >= 5.4.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ kwayland-integration-5.6.4.tar.xz -> kwayland-integration-5.7.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.6.4/CMakeLists.txt
new/kwayland-integration-5.7.0/CMakeLists.txt
--- old/kwayland-integration-5.6.4/CMakeLists.txt 2016-05-10
18:40:29.000000000 +0200
+++ new/kwayland-integration-5.7.0/CMakeLists.txt 2016-06-30
17:00:00.000000000 +0200
@@ -1,10 +1,10 @@
project(kwayland-integration)
-set(PROJECT_VERSION "5.6.4")
+set(PROJECT_VERSION "5.7.0")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.4.0")
-set(KF5_MIN_VERSION "5.12.0")
+set(KF5_MIN_VERSION "5.23.0")
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
@@ -30,5 +30,6 @@
find_package(KF5Wayland CONFIG REQUIRED)
add_subdirectory(src)
+add_subdirectory(autotests)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.6.4/autotests/CMakeLists.txt
new/kwayland-integration-5.7.0/autotests/CMakeLists.txt
--- old/kwayland-integration-5.6.4/autotests/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/kwayland-integration-5.7.0/autotests/CMakeLists.txt 2016-06-30
17:00:00.000000000 +0200
@@ -0,0 +1,4 @@
+include(ECMMarkAsTest)
+find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
+
+add_subdirectory(idletime)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.6.4/autotests/idletime/CMakeLists.txt
new/kwayland-integration-5.7.0/autotests/idletime/CMakeLists.txt
--- old/kwayland-integration-5.6.4/autotests/idletime/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/kwayland-integration-5.7.0/autotests/idletime/CMakeLists.txt
2016-06-30 17:00:00.000000000 +0200
@@ -0,0 +1,4 @@
+add_executable(idleTest idle_test.cpp)
+target_link_libraries(idleTest Qt5::Gui Qt5::Test KF5::IdleTime
KF5::WaylandClient)
+kwaylandtest(idleTest)
+ecm_mark_as_test(idleTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.6.4/autotests/idletime/idle_test.cpp
new/kwayland-integration-5.7.0/autotests/idletime/idle_test.cpp
--- old/kwayland-integration-5.6.4/autotests/idletime/idle_test.cpp
1970-01-01 01:00:00.000000000 +0100
+++ new/kwayland-integration-5.7.0/autotests/idletime/idle_test.cpp
2016-06-30 17:00:00.000000000 +0200
@@ -0,0 +1,121 @@
+/*
+Copyright (C) 2016 Martin Gräßlin <[email protected]>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) version 3, or any
+later version accepted by the membership of KDE e.V. (or its
+successor approved by the membership of KDE e.V.), which shall
+act as a proxy defined in Section 6 of version 3 of the license.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*/
+// Qt
+#include <QtTest/QtTest>
+#include <QSignalSpy>
+// Frameworks
+#include <KIdleTime>
+#include <KWayland/Client/connection_thread.h>
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/fakeinput.h>
+
+using namespace KWayland::Client;
+
+class IdleTest : public QObject
+{
+ Q_OBJECT
+private Q_SLOTS:
+ void init();
+ void cleanup();
+
+ void testCatchNextResumeEvent();
+ void testTimeout();
+
+private:
+ ConnectionThread *m_connection = nullptr;
+ FakeInput *m_fakeInput = nullptr;
+};
+
+void IdleTest::init()
+{
+ m_connection = ConnectionThread::fromApplication(this);
+ QVERIFY(m_connection);
+ Registry registry;
+ registry.create(m_connection);
+ QSignalSpy interfacesAnnounced(®istry, &Registry::interfacesAnnounced);
+ QVERIFY(interfacesAnnounced.isValid());
+ registry.setup();
+ QVERIFY(interfacesAnnounced.wait());
+ const auto fakeInterface =
registry.interface(Registry::Interface::FakeInput);
+ QVERIFY(fakeInterface.name != 0);
+ m_fakeInput = registry.createFakeInput(fakeInterface.name,
fakeInterface.version, this);
+}
+
+void IdleTest::cleanup()
+{
+ delete m_fakeInput;
+ m_fakeInput = nullptr;
+ delete m_connection;
+ m_connection = nullptr;
+}
+
+void IdleTest::testCatchNextResumeEvent()
+{
+ // this test uses catch next resume event to get the resuming from idle
signal
+ QSignalSpy spy(KIdleTime::instance(), &KIdleTime::resumingFromIdle);
+ QVERIFY(spy.isValid());
+ KIdleTime::instance()->catchNextResumeEvent();
+ // on Wayland there is a five sec minimum time
+ QTest::qWait(6000);
+ // now fake input
+ QCOMPARE(spy.count(), 0);
+ m_fakeInput->requestPointerMove(QSizeF(1, 2));
+ QVERIFY(spy.wait());
+}
+
+void IdleTest::testTimeout()
+{
+ // this test verifies adding a timeout and firing it
+ QVERIFY(KIdleTime::instance()->idleTimeouts().isEmpty());
+ QSignalSpy timeout1Spy(KIdleTime::instance(), SIGNAL(timeoutReached(int)));
+ QVERIFY(timeout1Spy.isValid());
+ QSignalSpy timeout2Spy(KIdleTime::instance(),
SIGNAL(timeoutReached(int,int)));
+ QVERIFY(timeout2Spy.isValid());
+
+ const auto id = KIdleTime::instance()->addIdleTimeout(6000);
+ QCOMPARE(KIdleTime::instance()->idleTimeouts().size(), 1);
+ QVERIFY(KIdleTime::instance()->idleTimeouts().contains(id));
+ QCOMPARE(KIdleTime::instance()->idleTimeouts().value(id), 6000);
+ // Wait some time
+ QTest::qWait(4000);
+ // now we should be able to wait for the timeout
+ QVERIFY(timeout1Spy.wait());
+ QCOMPARE(timeout1Spy.count(), 1);
+ QCOMPARE(timeout2Spy.count(), 1);
+ QCOMPARE(timeout1Spy.first().at(0).toInt(), id);
+ QCOMPARE(timeout2Spy.first().at(0).toInt(), id);
+ QCOMPARE(timeout2Spy.first().at(1).toInt(), 6000);
+
+ // let's fake some input
+ // first wait
+ QTest::qWait(4000);
+ m_fakeInput->requestPointerMove(QSizeF(1, 2));
+ QVERIFY(!timeout1Spy.wait());
+
+ // now let's remove the timeout
+ KIdleTime::instance()->removeIdleTimeout(id);
+ QVERIFY(KIdleTime::instance()->idleTimeouts().isEmpty());
+ // now waiting should not trigger the timeout
+ QTest::qWait(4000);
+ QVERIFY(!timeout1Spy.wait());
+}
+
+QTEST_MAIN(IdleTest)
+#include "idle_test.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.6.4/src/windowsystem/logging.cpp
new/kwayland-integration-5.7.0/src/windowsystem/logging.cpp
--- old/kwayland-integration-5.6.4/src/windowsystem/logging.cpp 2016-05-10
18:40:29.000000000 +0200
+++ new/kwayland-integration-5.7.0/src/windowsystem/logging.cpp 2016-06-30
17:00:00.000000000 +0200
@@ -1,2 +1,2 @@
#include "logging.h"
-Q_LOGGING_CATEGORY(KWAYLAND_KWS, "org.kde.kf5.kwindowsystem.kwayland")
+Q_LOGGING_CATEGORY(KWAYLAND_KWS, "org.kde.kf5.kwindowsystem.kwayland",
QtWarningMsg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.6.4/src/windowsystem/waylandintegration.cpp
new/kwayland-integration-5.7.0/src/windowsystem/waylandintegration.cpp
--- old/kwayland-integration-5.6.4/src/windowsystem/waylandintegration.cpp
2016-05-10 18:40:29.000000000 +0200
+++ new/kwayland-integration-5.7.0/src/windowsystem/waylandintegration.cpp
2016-06-30 17:00:00.000000000 +0200
@@ -31,7 +31,6 @@
#include <KWayland/Client/contrast.h>
#include <KWayland/Client/region.h>
#include <KWayland/Client/slide.h>
-#include <KWayland/Client/shell.h>
#include <KWindowSystem/KWindowSystem>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.6.4/src/windowsystem/windowsystem.cpp
new/kwayland-integration-5.7.0/src/windowsystem/windowsystem.cpp
--- old/kwayland-integration-5.6.4/src/windowsystem/windowsystem.cpp
2016-05-10 18:40:29.000000000 +0200
+++ new/kwayland-integration-5.7.0/src/windowsystem/windowsystem.cpp
2016-06-30 17:00:00.000000000 +0200
@@ -172,14 +172,20 @@
void WindowSystem::minimizeWindow(WId win)
{
- Q_UNUSED(win)
- qCDebug(KWAYLAND_KWS) << "This plugin does not support minimize window";
+ if (PlasmaWindow *w = window(win)) {
+ if (!w->isMinimized()) {
+ w->requestToggleMinimized();
+ }
+ }
}
void WindowSystem::unminimizeWindow(WId win)
{
- Q_UNUSED(win)
- qCDebug(KWAYLAND_KWS) << "This plugin does not support minimizing windows";
+ if (PlasmaWindow *w = window(win)) {
+ if (w->isMinimized()) {
+ w->requestToggleMinimized();
+ }
+ }
}
int WindowSystem::numberOfDesktops()
