Hello community,
here is the log from the commit of package kwayland-integration for
openSUSE:Factory checked in at 2019-10-14 12:37:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwayland-integration (Old)
and /work/SRC/openSUSE:Factory/.kwayland-integration.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland-integration"
Mon Oct 14 12:37:51 2019 rev:72 rq:737473 version:5.17.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kwayland-integration/kwayland-integration.changes
2019-09-07 11:38:45.602394203 +0200
+++
/work/SRC/openSUSE:Factory/.kwayland-integration.new.2352/kwayland-integration.changes
2019-10-14 12:37:52.819268520 +0200
@@ -1,0 +2,23 @@
+Thu Oct 10 14:25:46 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.17.0
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.17.0.php
+- No code changes since 5.16.90
+
+-------------------------------------------------------------------
+Thu Sep 19 12:32:35 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Update to 5.16.90
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/plasma-5.16.90.php
+- Changes since 5.16.5:
+ * update to latest kf5 dependency
+ * Remove unused variable
+ * Remove unused includes
+ * Provide a KModifierKeyInfoProvider implementation
+ * Use new logging category directory if we use kf5 5.59.0
+
+-------------------------------------------------------------------
Old:
----
kwayland-integration-5.16.5.tar.xz
kwayland-integration-5.16.5.tar.xz.sig
New:
----
kwayland-integration-5.17.0.tar.xz
kwayland-integration-5.17.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwayland-integration.spec ++++++
--- /var/tmp/diff_new_pack.AgmdRr/_old 2019-10-14 12:37:53.427266931 +0200
+++ /var/tmp/diff_new_pack.AgmdRr/_new 2019-10-14 12:37:53.431266920 +0200
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kwayland-integration
-Version: 5.16.5
+Version: 5.17.0
Release: 0
# Full Plasma 5 version (e.g. 5.8.95)
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -28,14 +28,15 @@
License: LGPL-2.1-or-later
Group: Development/Libraries/KDE
Url: http://www.kde.org
-Source:
https://download.kde.org/stable/plasma/%{version}/kwayland-integration-%{version}.tar.xz
+Source: kwayland-integration-%{version}.tar.xz
%if %{with lang}
-Source1:
https://download.kde.org/stable/plasma/%{version}/kwayland-integration-%{version}.tar.xz.sig
+Source1: kwayland-integration-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.11
BuildRequires: kf5-filesystem
+BuildRequires: cmake(KF5GuiAddons) >= 5.60.0
BuildRequires: cmake(KF5IdleTime) >= 5.24.0
BuildRequires: cmake(KF5Wayland) >= 5.24.0
BuildRequires: cmake(KF5WindowSystem) >= 5.24.0
++++++ kwayland-integration-5.16.5.tar.xz -> kwayland-integration-5.17.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.16.5/CMakeLists.txt
new/kwayland-integration-5.17.0/CMakeLists.txt
--- old/kwayland-integration-5.16.5/CMakeLists.txt 2019-09-03
15:49:49.000000000 +0200
+++ new/kwayland-integration-5.17.0/CMakeLists.txt 2019-10-10
14:35:51.000000000 +0200
@@ -1,10 +1,10 @@
project(kwayland-integration)
-set(PROJECT_VERSION "5.16.5")
+set(PROJECT_VERSION "5.17.0")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
set(QT_MIN_VERSION "5.12.0")
-set(KF5_MIN_VERSION "5.58.0")
+set(KF5_MIN_VERSION "5.62.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
@@ -28,6 +28,7 @@
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
IdleTime
WindowSystem
+ GuiAddons
)
find_package(KF5Wayland CONFIG REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.16.5/src/CMakeLists.txt
new/kwayland-integration-5.17.0/src/CMakeLists.txt
--- old/kwayland-integration-5.16.5/src/CMakeLists.txt 2019-09-03
15:49:49.000000000 +0200
+++ new/kwayland-integration-5.17.0/src/CMakeLists.txt 2019-10-10
14:35:51.000000000 +0200
@@ -1,2 +1,3 @@
add_subdirectory(idletime)
add_subdirectory(windowsystem)
+add_subdirectory(kmodifierkeyinfoprovider)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
--- old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
2019-10-10 14:35:51.000000000 +0200
@@ -0,0 +1,3 @@
+add_library(kmodifierkey_wayland MODULE kmodifierkeyinfoprovider_wayland.cpp)
+target_link_libraries(kmodifierkey_wayland PRIVATE KF5::WaylandClient
KF5::GuiAddons)
+install(TARGETS kmodifierkey_wayland DESTINATION
${PLUGIN_INSTALL_DIR}/kf5/kguiaddons/kmodifierkey/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
---
old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
1970-01-01 01:00:00.000000000 +0100
+++
new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
2019-10-10 14:35:51.000000000 +0200
@@ -0,0 +1,95 @@
+/*
+ Copyright 2019 Aleix Pol Gonzalez <[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 WARRAKModifierKeyInfoProviderNTY; 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/>.
+*/
+
+#include "kmodifierkeyinfoprovider_wayland.h"
+#include <KWayland/Client/registry.h>
+#include <KWayland/Client/connection_thread.h>
+#include <QDebug>
+#include <QTimer>
+
+using namespace KWayland::Client;
+
+KModifierKeyInfoProviderWayland::KModifierKeyInfoProviderWayland()
+{
+ auto registry = new Registry(this);
+
+ auto m_waylandConnection = ConnectionThread::fromApplication(this);
+ if (!m_waylandConnection) {
+ qWarning() << "Failed getting Wayland connection from QPA";
+ return;
+ }
+ registry->create(m_waylandConnection);
+ registry->setup();
+
+ connect(registry, &Registry::keystateAnnounced, this, [this,
registry](quint32 name, quint32 version) {
+ m_keystate = registry->createKeystate(name, version, this);
+ connect(m_keystate, &Keystate::stateChanged, this,
&KModifierKeyInfoProviderWayland::updateModifiers);
+ m_keystate->fetchStates();
+ });
+
+ stateUpdated(Qt::Key_CapsLock, KModifierKeyInfoProvider::Nothing);
+ stateUpdated(Qt::Key_NumLock, KModifierKeyInfoProvider::Nothing);
+ stateUpdated(Qt::Key_ScrollLock, KModifierKeyInfoProvider::Nothing);
+}
+
+KModifierKeyInfoProviderWayland::~KModifierKeyInfoProviderWayland() = default;
+
+bool KModifierKeyInfoProviderWayland::setKeyLatched(Qt::Key /*key*/, bool
/*latched*/)
+{
+ return false;
+}
+
+bool KModifierKeyInfoProviderWayland::setKeyLocked(Qt::Key /*key*/, bool
/*locked*/)
+{
+ return false;
+}
+
+KModifierKeyInfoProvider::ModifierState toState(Keystate::State state)
+{
+ switch(state) {
+ case Keystate::State::Unlocked:
+ return KModifierKeyInfoProvider::Nothing;
+ case Keystate::State::Latched:
+ return KModifierKeyInfoProvider::Latched;
+ case Keystate::State::Locked:
+ return KModifierKeyInfoProvider::Locked;
+ }
+ Q_UNREACHABLE();
+ return KModifierKeyInfoProvider::Nothing;
+}
+
+Qt::Key toKey(Keystate::Key key)
+{
+ switch(key) {
+ case Keystate::Key::CapsLock:
+ return Qt::Key_CapsLock;
+ case Keystate::Key::NumLock:
+ return Qt::Key_NumLock;
+ case Keystate::Key::ScrollLock:
+ return Qt::Key_ScrollLock;
+ }
+ Q_UNREACHABLE();
+ return {};
+}
+
+void KModifierKeyInfoProviderWayland::updateModifiers(Keystate::Key key,
Keystate::State state)
+{
+ stateUpdated(toKey(key), toState(state));
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
---
old/kwayland-integration-5.16.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
1970-01-01 01:00:00.000000000 +0100
+++
new/kwayland-integration-5.17.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
2019-10-10 14:35:51.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ Copyright 2019 Aleix Pol Gonzalez <[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/>.
+*/
+
+#ifndef KMODIFIERKEYINFOPROVIDERWAYLAND_H
+#define KMODIFIERKEYINFOPROVIDERWAYLAND_H
+
+#include <kmodifierkeyinfoprovider_p.h>
+#include <KWayland/Client/keystate.h>
+#include <QPointer>
+
+class KModifierKeyInfoProviderWayland : public KModifierKeyInfoProvider
+{
+Q_OBJECT
+Q_PLUGIN_METADATA(IID "org.kde.kguiaddons.KModifierKeyInfoProvider.Wayland")
+public:
+ KModifierKeyInfoProviderWayland();
+ ~KModifierKeyInfoProviderWayland();
+
+ bool setKeyLatched(Qt::Key key, bool latched) override;
+ bool setKeyLocked(Qt::Key key, bool locked) override;
+
+private:
+ void updateModifiers(KWayland::Client::Keystate::Key key,
KWayland::Client::Keystate::State state);
+
+ QPointer<KWayland::Client::Keystate> m_keystate;
+};
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.16.5/src/windowsystem/CMakeLists.txt
new/kwayland-integration-5.17.0/src/windowsystem/CMakeLists.txt
--- old/kwayland-integration-5.16.5/src/windowsystem/CMakeLists.txt
2019-09-03 15:49:49.000000000 +0200
+++ new/kwayland-integration-5.17.0/src/windowsystem/CMakeLists.txt
2019-10-10 14:35:51.000000000 +0200
@@ -23,4 +23,9 @@
${PLUGIN_INSTALL_DIR}/kf5/org.kde.kwindowsystem.platforms/
)
-install( FILES kwindowsystem.kwayland.categories DESTINATION
${KDE_INSTALL_CONFDIR} )
+if (${ECM_VERSION} STRGREATER "5.58.0")
+ install(FILES kwindowsystem.kwayland.categories DESTINATION
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+else()
+ install(FILES kwindowsystem.kwayland.categories DESTINATION
${KDE_INSTALL_CONFDIR})
+endif()
+
