Hello community, here is the log from the commit of package powerdevil5 for openSUSE:Factory checked in at 2018-02-28 19:59:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerdevil5 (Old) and /work/SRC/openSUSE:Factory/.powerdevil5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerdevil5" Wed Feb 28 19:59:24 2018 rev:60 rq:579158 version:5.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/powerdevil5/powerdevil5.changes 2018-02-19 12:54:49.983352155 +0100 +++ /work/SRC/openSUSE:Factory/.powerdevil5.new/powerdevil5.changes 2018-02-28 19:59:25.763133473 +0100 @@ -1,0 +2,10 @@ +Wed Feb 21 23:57:10 CET 2018 - [email protected] + +- Update to 5.12.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.12.2.php +- Changes since 5.12.1: + * Fix PowerDevil shortcuts migration (kde#389991) + +------------------------------------------------------------------- Old: ---- powerdevil-5.12.1.tar.xz New: ---- powerdevil-5.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerdevil5.spec ++++++ --- /var/tmp/diff_new_pack.QpJJD2/_old 2018-02-28 19:59:26.687100040 +0100 +++ /var/tmp/diff_new_pack.QpJJD2/_new 2018-02-28 19:59:26.691099895 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: powerdevil5 -Version: 5.12.1 +Version: 5.12.2 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} @@ -114,7 +114,6 @@ %{_kf5_sharedir}/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy %{_kf5_sharedir}/dbus-1/system-services/org.kde.powerdevil.discretegpuhelper.service %{_kf5_sharedir}/polkit-1/actions/org.kde.powerdevil.discretegpuhelper.policy -%{_kf5_sharedir}/kconf_update/powerdevil_move_shortcuts.upd %{_kf5_configdir}/autostart/powerdevil.desktop ++++++ powerdevil-5.12.1.tar.xz -> powerdevil-5.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/CMakeLists.txt new/powerdevil-5.12.2/CMakeLists.txt --- old/powerdevil-5.12.1/CMakeLists.txt 2018-02-13 15:36:10.000000000 +0100 +++ new/powerdevil-5.12.2/CMakeLists.txt 2018-02-20 16:46:27.000000000 +0100 @@ -1,5 +1,5 @@ project(PowerDevil) -set(PROJECT_VERSION "5.12.1") +set(PROJECT_VERSION "5.12.2") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) @@ -75,8 +75,6 @@ add_subdirectory(daemon) add_subdirectory(kcmodule) add_subdirectory(doc) -add_subdirectory(kconf_update) - install( FILES powerdevil.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/daemon/actions/bundled/powerdevilrunscriptaction.desktop new/powerdevil-5.12.2/daemon/actions/bundled/powerdevilrunscriptaction.desktop --- old/powerdevil-5.12.1/daemon/actions/bundled/powerdevilrunscriptaction.desktop 2018-02-13 15:34:31.000000000 +0100 +++ new/powerdevil-5.12.2/daemon/actions/bundled/powerdevilrunscriptaction.desktop 2018-02-20 16:45:14.000000000 +0100 @@ -65,7 +65,7 @@ Comment[he]=הרץ סקריפט מותאם אישית Comment[hu]=Egyéni parancsfájl futtatása Comment[ia]=Il exeque un script personalisate -Comment[id]=Menjalankan sebuah skrip kostum +Comment[id]=Menjalankan sebuah skrip suaian Comment[it]=Avvia uno script personalizzato Comment[ja]=カスタムスクリプトを実行 Comment[ko]=사용자 정의 스크립트를 실행합니다 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/daemon/powerdevilapp.cpp new/powerdevil-5.12.2/daemon/powerdevilapp.cpp --- old/powerdevil-5.12.1/daemon/powerdevilapp.cpp 2018-02-13 15:34:31.000000000 +0100 +++ new/powerdevil-5.12.2/daemon/powerdevilapp.cpp 2018-02-20 16:45:15.000000000 +0100 @@ -31,17 +31,22 @@ #include <QDBusConnectionInterface> #include <QDebug> #include <QFileInfo> +#include <QAction> +#include <QKeySequence> #include <KCrash> #include <KDBusService> #include <KAboutData> #include <KSharedConfig> #include <KLocalizedString> +#include <KConfigGroup> +#include <KGlobalAccel> PowerDevilApp::PowerDevilApp(int &argc, char **argv) : QGuiApplication(argc, argv) , m_core(Q_NULLPTR) { + migratePre512KeyboardShortcuts(); } PowerDevilApp::~PowerDevilApp() @@ -137,6 +142,56 @@ QDBusConnection::sessionBus().registerObject(QLatin1String("/org/kde/Solid/PowerManagement/PolicyAgent"), PowerDevil::PolicyAgent::instance()); } + +/* + * 5.11 -> 5.12 migrated shortcuts from kded5 to the correct component name org_kde_powerdevil for good reasons +however despite a kconfupdate script working correctly and moving the old keys, +because kglobalaccel is running whilst we update it synced the old values, and then ignores the powerdevil copy +on future loads + +this removes the old powermanagent entries in the kded5 component at powerdevil startup +//which is at runtime where we can talk to kglobalaccel and then re-register ours + +this method can probably be deleted at some point in the future +*/ +void PowerDevilApp::migratePre512KeyboardShortcuts() +{ + auto configGroup = KSharedConfig::openConfig("powermanagementprofilesrc")->group("migration"); + if (!configGroup.hasKey("kdedShortcutMigration")) { + const QStringList actionIds({ + "Decrease Keyboard Brightness", + "Decrease Screen Brightness", + "Hibernate", + "Increase Keyboard Brightness", + "Increase Screen Brightness", + "PowerOff", + "Sleep", + "Toggle Keyboard Backlight" + }); + for (const QString &actionId: actionIds) { + QAction oldAction; + oldAction.setObjectName(actionId); + oldAction.setProperty("componentName", "kded5"); + + //claim the old shortcut so we can remove it.. + KGlobalAccel::self()->setShortcut(&oldAction, QList<QKeySequence>(), KGlobalAccel::Autoloading); + auto shortcuts = KGlobalAccel::self()->shortcut(&oldAction); + KGlobalAccel::self()->removeAllShortcuts(&oldAction); + + QAction newAction; + newAction.setObjectName(actionId); + newAction.setProperty("componentName", "org_kde_powerdevil"); + if (!shortcuts.isEmpty()) { + //register with no autoloading to sync config, we then delete our QAction, and powerdevil will + //re-register as normal + KGlobalAccel::self()->setShortcut(&newAction, shortcuts, KGlobalAccel::NoAutoloading); + } + } + } + configGroup.writeEntry(QStringLiteral("kdedShortcutMigration"), true); + configGroup.sync(); +} + int main(int argc, char **argv) { QGuiApplication::setDesktopSettingsAware(false); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/daemon/powerdevilapp.h new/powerdevil-5.12.2/daemon/powerdevilapp.h --- old/powerdevil-5.12.1/daemon/powerdevilapp.h 2018-02-13 15:34:31.000000000 +0100 +++ new/powerdevil-5.12.2/daemon/powerdevilapp.h 2018-02-20 16:45:15.000000000 +0100 @@ -46,6 +46,7 @@ private: PowerDevil::Core *m_core; + void migratePre512KeyboardShortcuts(); }; #endif // POWERDEVILAPP_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/kconf_update/CMakeLists.txt new/powerdevil-5.12.2/kconf_update/CMakeLists.txt --- old/powerdevil-5.12.1/kconf_update/CMakeLists.txt 2018-02-13 15:34:31.000000000 +0100 +++ new/powerdevil-5.12.2/kconf_update/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -install(FILES powerdevil_move_shortcuts.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/kconf_update/powerdevil_move_shortcuts.upd new/powerdevil-5.12.2/kconf_update/powerdevil_move_shortcuts.upd --- old/powerdevil-5.12.1/kconf_update/powerdevil_move_shortcuts.upd 2018-02-13 15:34:31.000000000 +0100 +++ new/powerdevil-5.12.2/kconf_update/powerdevil_move_shortcuts.upd 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -Version=5 -Id=powerdevil_move_shortcuts -File=kglobalshortcutsrc -Group=kded5, org_kde_powerdevil -Key=Hibernate -Key=PowerOff -Key=Sleep -Key=Decrease Keyboard Brightness -Key=Decrease Screen Brightness -Key=Increase Keyboard Brightness -Key=Increase Screen Brightness -Key=Toggle Keyboard Backlight diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/po/zh_CN/libpowerdevilcommonconfig.po new/powerdevil-5.12.2/po/zh_CN/libpowerdevilcommonconfig.po --- old/powerdevil-5.12.1/po/zh_CN/libpowerdevilcommonconfig.po 2018-02-13 15:35:55.000000000 +0100 +++ new/powerdevil-5.12.2/po/zh_CN/libpowerdevilcommonconfig.po 2018-02-20 16:46:15.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-10-17 08:24+0000\n" -"PO-Revision-Date: 2018-02-12 05:47-0500\n" +"PO-Revision-Date: 2018-02-19 19:14-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/po/zh_CN/powerdevil.po new/powerdevil-5.12.2/po/zh_CN/powerdevil.po --- old/powerdevil-5.12.1/po/zh_CN/powerdevil.po 2018-02-13 15:35:55.000000000 +0100 +++ new/powerdevil-5.12.2/po/zh_CN/powerdevil.po 2018-02-20 16:46:15.000000000 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-03 03:17+0100\n" -"PO-Revision-Date: 2018-02-12 05:47-0500\n" +"PO-Revision-Date: 2018-02-19 19:14-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/po/zh_CN/powerdevilactivitiesconfig.po new/powerdevil-5.12.2/po/zh_CN/powerdevilactivitiesconfig.po --- old/powerdevil-5.12.1/po/zh_CN/powerdevilactivitiesconfig.po 2018-02-13 15:35:55.000000000 +0100 +++ new/powerdevil-5.12.2/po/zh_CN/powerdevilactivitiesconfig.po 2018-02-20 16:46:15.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-05-09 03:03+0200\n" -"PO-Revision-Date: 2018-02-12 05:47-0500\n" +"PO-Revision-Date: 2018-02-19 19:14-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/po/zh_CN/powerdevilglobalconfig.po new/powerdevil-5.12.2/po/zh_CN/powerdevilglobalconfig.po --- old/powerdevil-5.12.1/po/zh_CN/powerdevilglobalconfig.po 2018-02-13 15:35:55.000000000 +0100 +++ new/powerdevil-5.12.2/po/zh_CN/powerdevilglobalconfig.po 2018-02-20 16:46:15.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-05-11 03:05+0200\n" -"PO-Revision-Date: 2018-02-12 05:47-0500\n" +"PO-Revision-Date: 2018-02-19 19:14-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerdevil-5.12.1/po/zh_CN/powerdevilprofilesconfig.po new/powerdevil-5.12.2/po/zh_CN/powerdevilprofilesconfig.po --- old/powerdevil-5.12.1/po/zh_CN/powerdevilprofilesconfig.po 2018-02-13 15:35:55.000000000 +0100 +++ new/powerdevil-5.12.2/po/zh_CN/powerdevilprofilesconfig.po 2018-02-20 16:46:15.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-05-09 03:03+0200\n" -"PO-Revision-Date: 2018-02-12 05:47-0500\n" +"PO-Revision-Date: 2018-02-19 19:14-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
