Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2018-06-26 10:35:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Tue Jun 26 10:35:55 2018 rev:86 rq:617979 version:5.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2018-06-13 15:32:00.144876040 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2018-06-26 10:36:02.245851715 +0200 @@ -1,0 +2,18 @@ +Tue Jun 19 14:45:15 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.13.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.13.1.php +- Changes since 5.13.0: + * Fix tooltip woes (kde#382571,kde#385947,kde#389469,kde#388749) + * Ref KConfig whilst we're using it (kde#394534) + * Fix accident. + * Touchpad KDED module: Convert to JSON metadata + * Swap Trash for Delete action when only one is enabled and the Shift modifier is pressed (kde#395155) + * Fonts KCM: Fix text readability regression +- Add patches to fix the touchpad KCM: + * 0001-Revert-Touchpad-KDED-module-Convert-to-JSON-metadata.patch + * 0002-Set-X-KDE-PluginInfo-Name-touchpad-in-KDED-desktop-f.patch + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.13.0.tar.xz New: ---- 0001-Revert-Touchpad-KDED-module-Convert-to-JSON-metadata.patch 0002-Set-X-KDE-PluginInfo-Name-touchpad-in-KDED-desktop-f.patch plasma-desktop-5.13.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.GekHI1/_old 2018-06-26 10:36:03.593802167 +0200 +++ /var/tmp/diff_new_pack.GekHI1/_new 2018-06-26 10:36:03.605801726 +0200 @@ -20,20 +20,22 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.13.0 +Version: 5.13.1 Release: 0 # Full Plasma 5 version (e.g. 5.9.3) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} # Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.3 in KUF) %{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: The KDE Plasma Workspace Components -License: GPL-2.0 +License: GPL-2.0-only Group: System/GUI/KDE Url: http://www.kde.org/ -Source: plasma-desktop-%{version}.tar.xz +Source: http://download.kde.org/stable/plasma/%{version}/plasma-desktop-%{version}.tar.xz # PATCH-FIX-OPENSUSE Patch1: 0001-Use-themed-user-face-icon-in-kickoff.patch # PATCHES 100-200 and above are from upstream 5.13 branch +Patch100: 0001-Revert-Touchpad-KDED-module-Convert-to-JSON-metadata.patch +Patch101: 0002-Set-X-KDE-PluginInfo-Name-touchpad-in-KDED-desktop-f.patch # PATCHES 201-300 and above are from upstream master/5.14 branch %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel ++++++ 0001-Revert-Touchpad-KDED-module-Convert-to-JSON-metadata.patch ++++++ >From 3432c3342b1f8014cf59f39565aca53d280c7f86 Mon Sep 17 00:00:00 2001 From: Jonathan Marten <j...@keelhaul.me.uk> Date: Tue, 19 Jun 2018 19:43:28 +0100 Subject: [PATCH 1/2] Revert "Touchpad KDED module: Convert to JSON metadata" This reverts commit de475576e65fd8aff4d86379e322c41f4429c745. There is a problem with the KDED plugin also acting as the KCM, as identified on https://phabricator.kde.org/D13360 BUG:395622 --- kcms/touchpad/src/CMakeLists.txt | 13 +++++--- .../src/kcm/xlib/touchpadconfigxlib.cpp | 1 + kcms/touchpad/src/kded/kded.cpp | 9 +----- kcms/touchpad/src/kded/kdedactions.cpp | 2 ++ kcms/touchpad/src/plugins.cpp | 32 +++++++++++++++++++ kcms/touchpad/src/plugins.h | 26 +++++++++++++++ 6 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 kcms/touchpad/src/plugins.cpp create mode 100644 kcms/touchpad/src/plugins.h diff --git a/kcms/touchpad/src/CMakeLists.txt b/kcms/touchpad/src/CMakeLists.txt index 91147289..b927c152 100644 --- a/kcms/touchpad/src/CMakeLists.txt +++ b/kcms/touchpad/src/CMakeLists.txt @@ -6,6 +6,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake" ) SET(SRCS + plugins.cpp touchpadbackend.cpp logging.cpp ) @@ -58,9 +59,6 @@ add_library(kded_touchpad MODULE ${SRCS} ${backend_SRCS} ) -kcoreaddons_desktop_to_json(kded_touchpad kded/kded_touchpad.desktop) -set_target_properties(kded_touchpad PROPERTIES OUTPUT_NAME touchpad) - target_link_libraries(kded_touchpad ${backend_LIBS} KF5::KCMUtils @@ -92,8 +90,9 @@ install(FILES kcm/kcm_touchpad.desktop install(FILES kded/touchpaddaemon.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) -install(TARGETS kded_touchpad - DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kded +install(FILES kded/kded_touchpad.desktop + DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kded + RENAME touchpad.desktop ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.touchpad.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} @@ -102,6 +101,10 @@ install(FILES kded/kcm_touchpad.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) +install(TARGETS kded_touchpad + DESTINATION ${KDE_INSTALL_PLUGINDIR} +) + install(FILES kcm/xlib/touchpad.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) diff --git a/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp b/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp index 7d7a992c..1ead5be8 100644 --- a/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp +++ b/kcms/touchpad/src/kcm/xlib/touchpadconfigxlib.cpp @@ -34,6 +34,7 @@ #include "customslider.h" #include "sliderpair.h" #include "touchpadbackend.h" +#include "plugins.h" #include "testarea.h" #include "touchpadinterface.h" #include "customconfigdialogmanager.h" diff --git a/kcms/touchpad/src/kded/kded.cpp b/kcms/touchpad/src/kded/kded.cpp index 3f25f137..e2fa3847 100644 --- a/kcms/touchpad/src/kded/kded.cpp +++ b/kcms/touchpad/src/kded/kded.cpp @@ -24,14 +24,10 @@ #include <QDBusConnectionInterface> #include <KNotification> #include <KLocalizedString> -#include <KPluginFactory> +#include "plugins.h" #include "kdedactions.h" -K_PLUGIN_FACTORY_WITH_JSON(TouchpadDisablerFactory, - "kded_touchpad.json", - registerPlugin<TouchpadDisabler>();) - bool TouchpadDisabler::workingTouchpadFound() const { return m_workingTouchpadFound; @@ -75,7 +71,6 @@ TouchpadDisabler::TouchpadDisabler(QObject *parent, const QVariantList &) connect(&m_keyboardActivityTimeout, SIGNAL(timeout()), SLOT(timerElapsed())); - updateCurrentState(); m_userRequestedState = m_touchpadEnabled; reloadSettings(); @@ -306,5 +301,3 @@ void TouchpadDisabler::showOsd() QDBusConnection::sessionBus().asyncCall(msg); } - -#include "kded.moc" diff --git a/kcms/touchpad/src/kded/kdedactions.cpp b/kcms/touchpad/src/kded/kdedactions.cpp index e0deae2c..250da3af 100644 --- a/kcms/touchpad/src/kded/kdedactions.cpp +++ b/kcms/touchpad/src/kded/kdedactions.cpp @@ -23,6 +23,8 @@ #include <KLocalizedString> #include <KGlobalAccel> +#include "plugins.h" + TouchpadGlobalActions::TouchpadGlobalActions(bool isConfiguration, QObject *parent) : KActionCollection(parent) { diff --git a/kcms/touchpad/src/plugins.cpp b/kcms/touchpad/src/plugins.cpp new file mode 100644 index 00000000..5abf3573 --- /dev/null +++ b/kcms/touchpad/src/plugins.cpp @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2013 Alexander Mezin <mezin.alexan...@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +//#include "plugins.h" + +#include <KPluginFactory> +#include <KLocalizedString> + +#include "kcm/touchpadconfigcontainer.h" +#include "kded/kded.h" + + +K_PLUGIN_FACTORY(TouchpadPluginFactory, + registerPlugin<TouchpadDisabler>(); + registerPlugin<TouchpadConfigContainer>("kcm");) +#include <plugins.moc> +//K_EXPORT_PLUGIN(TouchpadPluginFactory(buildAboutData())) diff --git a/kcms/touchpad/src/plugins.h b/kcms/touchpad/src/plugins.h new file mode 100644 index 00000000..bc2f0f10 --- /dev/null +++ b/kcms/touchpad/src/plugins.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2013 Alexander Mezin <mezin.alexan...@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef PLUGINS_H +#define PLUGINS_H + +#include <KPluginFactory> + +K_PLUGIN_FACTORY_DECLARATION(TouchpadPluginFactory) + +#endif // PLUGINS_H -- 2.17.1 ++++++ 0002-Set-X-KDE-PluginInfo-Name-touchpad-in-KDED-desktop-f.patch ++++++ >From f040cdb399b10df8a50c17ac13e4fd44693d3057 Mon Sep 17 00:00:00 2001 From: Jonathan Marten <j...@keelhaul.me.uk> Date: Tue, 19 Jun 2018 19:45:48 +0100 Subject: [PATCH 2/2] Set X-KDE-PluginInfo-Name=touchpad in KDED desktop file This gets the module registered under the correct name on DBus, as suggested on https://phabricator.kde.org/D13360 --- kcms/touchpad/src/kded/kded_touchpad.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/kcms/touchpad/src/kded/kded_touchpad.desktop b/kcms/touchpad/src/kded/kded_touchpad.desktop index 6187f372..af5244bb 100644 --- a/kcms/touchpad/src/kded/kded_touchpad.desktop +++ b/kcms/touchpad/src/kded/kded_touchpad.desktop @@ -3,6 +3,7 @@ Type=Service X-KDE-ServiceTypes=KDEDModule X-KDE-Library=kded_touchpad X-KDE-DBus-ModuleName=touchpad +X-KDE-PluginInfo-Name=touchpad X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true X-KDE-OnlyShowOnQtPlatforms=xcb -- 2.17.1 ++++++ plasma-desktop-5.13.0.tar.xz -> plasma-desktop-5.13.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-desktop/plasma-desktop-5.13.0.tar.xz /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma-desktop-5.13.1.tar.xz differ: char 25, line 1
