Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2018-01-09 14:42:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Tue Jan 9 14:42:00 2018 rev:49 rq:559440 version:5.41.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2017-11-16 14:37:55.665386031 +0100 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2018-01-09 14:42:01.723211553 +0100 @@ -1,0 +2,15 @@ +Sun Dec 17 09:43:48 CET 2017 - lbeltr...@kde.org + +- Update to 5.41.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.41.0.php +- Changes since 5.40.0: + * Remove double look-up + * Group some blocking dbus calls + * We depend against 5.7 + * kglobalacceld: Avoid loading an icon loader for no reason + * generate correct shortcut strings + * Port to debug category + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.40.0.tar.xz New: ---- kglobalaccel-5.41.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.9SHHVU/_old 2018-01-09 14:42:02.543173099 +0100 +++ /var/tmp/diff_new_pack.9SHHVU/_new 2018-01-09 14:42:02.543173099 +0100 @@ -19,9 +19,9 @@ %bcond_without lang %define lname libKF5GlobalAccel5 -%define _tar_path 5.40 +%define _tar_path 5.41 Name: kglobalaccel -Version: 5.40.0 +Version: 5.41.0 Release: 0 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} @@ -135,6 +135,7 @@ %files -n %{lname} %doc COPYING* README* %{_kf5_libdir}/libKF5GlobalAccel.so.* +%{_kf5_debugdir}/*.categories %files -n libKF5GlobalAccelPrivate5 %doc COPYING* README* ++++++ kglobalaccel-5.40.0.tar.xz -> kglobalaccel-5.41.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/CMakeLists.txt new/kglobalaccel-5.41.0/CMakeLists.txt --- old/kglobalaccel-5.40.0/CMakeLists.txt 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/CMakeLists.txt 2017-12-02 21:04:46.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.40.0") # handled by release scripts -set(KF5_DEP_VERSION "5.40.0") # handled by release scripts +set(KF5_VERSION "5.41.0") # handled by release scripts +set(KF5_DEP_VERSION "5.41.0") # handled by release scripts project(KGlobalAccel VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.40.0 NO_MODULE) +find_package(ECM 5.41.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) @@ -19,6 +19,7 @@ include(ECMGenerateHeaders) include(ECMAddQch) include(ECMMarkNonGuiExecutable) +include(ECMQtDeclareLoggingCategory) include(ECMPoQmTools) @@ -102,4 +103,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kglobalaccel_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +# contains list of debug categories, for kdebugsettings +install(FILES kglobalaccel.categories DESTINATION ${KDE_INSTALL_CONFDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/kglobalaccel.categories new/kglobalaccel-5.41.0/kglobalaccel.categories --- old/kglobalaccel-5.40.0/kglobalaccel.categories 1970-01-01 01:00:00.000000000 +0100 +++ new/kglobalaccel-5.41.0/kglobalaccel.categories 2017-12-02 21:04:46.000000000 +0100 @@ -0,0 +1 @@ +kf5.kglobalaccel KGlobalAccel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/po/ar/kglobalaccel5_qt.po new/kglobalaccel-5.41.0/po/ar/kglobalaccel5_qt.po --- old/kglobalaccel-5.40.0/po/ar/kglobalaccel5_qt.po 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/po/ar/kglobalaccel5_qt.po 2017-12-02 21:04:46.000000000 +0100 @@ -1,25 +1,25 @@ -# Safa Alfulaij <safa1996alful...@gmail.com>, 2014. +# Safa Alfulaij <safa1996alful...@gmail.com>, 2014, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-28 15:38+0300\n" -"PO-Revision-Date: 2014-06-06 11:25+0300\n" +"PO-Revision-Date: 2017-11-30 12:18+0300\n" "Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" -"Language-Team: Arabic <kde-i18n-...@kde.org>\n" +"Language-Team: Arabic <d...@arabeyes.org>\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: kglobalaccel.cpp:553 msgctxt "KGlobalAccel|" msgid "Conflict with Global Shortcut" -msgstr "تضارب مع اختصار عمومي" +msgstr "تضارب مع اختصار عموميّ" #: kglobalaccel.cpp:554 #, qt-format @@ -29,19 +29,19 @@ "\"%2\" in %3.\n" "Do you want to reassign it from that action to the current one?" msgstr "" +"تجميعة المفاتيح ’%1‘ حُجزت بالفعل للإجراء العموميّ ”%2“ في %3.\n" +"أتريد إعادة تعيينها من ذاك الإجراء إلى هذا؟" #: kglobalaccel.cpp:563 kglobalaccel.cpp:607 msgctxt "KGlobalAccel|" msgid "Reassign" -msgstr "" +msgstr "أعد التّعيين" #: kglobalaccel.cpp:585 -#, fuzzy, qt-format +#, qt-format msgctxt "KGlobalAccel|" msgid "The '%1' key combination is registered by application %2 for action %3:" -msgstr "" -"تجميعة المفاتيح '%1' مسجّلة للتطبيق %2.\n" -"%3" +msgstr "تجميعة المفاتيح ’%1‘ مسجّلة للتّطبيق %2 للإجراء ”%3“:" #: kglobalaccel.cpp:592 #, qt-format @@ -56,20 +56,20 @@ "The '%1' key combination is registered by application %2.\n" "%3" msgstr "" -"تجميعة المفاتيح '%1' مسجّلة للتطبيق %2.\n" +"تجميعة المفاتيح ’%1‘ مسجّلة للتّطبيق %2.\n" "%3" #: kglobalaccel.cpp:602 msgctxt "KGlobalAccel|" msgid "Conflict With Registered Global Shortcut" -msgstr "" +msgstr "تضارب مع اختصار عموميّ مسجّل" #: runtime/main.cpp:52 runtime/main.cpp:54 msgctxt "QObject|" msgid "KDE Global Shortcuts Service" -msgstr "" +msgstr "خدمة كدي للاختصارات العموميّة" #: runtime/main.cpp:57 runtime/main.cpp:58 msgctxt "QObject|" msgid "Maintainer" -msgstr "" +msgstr "المصين" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/src/CMakeLists.txt new/kglobalaccel-5.41.0/src/CMakeLists.txt --- old/kglobalaccel-5.40.0/src/CMakeLists.txt 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/src/CMakeLists.txt 2017-12-02 21:04:46.000000000 +0100 @@ -5,6 +5,8 @@ kglobalshortcutinfo.cpp kglobalshortcutinfo_dbus.cpp ) +ecm_qt_declare_logging_category(kglobalaccel_SRCS HEADER kglobalaccel_debug.h IDENTIFIER KGLOBALACCEL_LOG CATEGORY_NAME kf5.kglobalaccel) + ecm_create_qm_loader(kglobalaccel_SRCS kglobalaccel5_qt) set(kglobalaccel_xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.KGlobalAccel.xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/src/kglobalaccel.cpp new/kglobalaccel-5.41.0/src/kglobalaccel.cpp --- old/kglobalaccel-5.40.0/src/kglobalaccel.cpp 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/src/kglobalaccel.cpp 2017-12-02 21:04:46.000000000 +0100 @@ -22,12 +22,12 @@ #include "kglobalaccel.h" #include "kglobalaccel_p.h" +#include "kglobalaccel_debug.h" #include <memory> #include <QAction> #include <QActionEvent> -#include <QDebug> #include <QGuiApplication> #include <QMessageBox> #include <QPushButton> @@ -41,8 +41,11 @@ org::kde::kglobalaccel::Component *KGlobalAccelPrivate::getComponent(const QString &componentUnique, bool remember = false) { // Check if we already have this component - if (components.contains(componentUnique)) { - return components[componentUnique]; + { + auto component = components.value(componentUnique); + if (component) { + return component; + } } // Connect to the kglobalaccel daemon @@ -51,7 +54,7 @@ QStringLiteral("/kglobalaccel"), QDBusConnection::sessionBus()); if (!kglobalaccel.isValid()) { - qDebug() << "Failed to connect to the kglobalaccel daemon" << QDBusConnection::sessionBus().lastError(); + qCDebug(KGLOBALACCEL_LOG) << "Failed to connect to the kglobalaccel daemon" << QDBusConnection::sessionBus().lastError(); return nullptr; } @@ -66,7 +69,7 @@ } // An unknown error. - qDebug() << "Failed to get dbus path for component " << componentUnique << reply.error(); + qCDebug(KGLOBALACCEL_LOG) << "Failed to get dbus path for component " << componentUnique << reply.error(); return nullptr; } @@ -79,7 +82,7 @@ // No component no cleaning if (!component->isValid()) { - qDebug() << "Failed to get component" << componentUnique << QDBusConnection::sessionBus().lastError(); + qCDebug(KGLOBALACCEL_LOG) << "Failed to get component" << componentUnique << QDBusConnection::sessionBus().lastError(); return nullptr; } @@ -305,8 +308,6 @@ } QStringList actionId = makeActionId(action); - const QList<QKeySequence> activeShortcut = actionShortcuts.value(action); - const QList<QKeySequence> defaultShortcut = actionDefaultShortcuts.value(action); uint setterFlags = 0; if (globalFlags & NoAutoloading) { @@ -314,6 +315,7 @@ } if (actionFlags & ActiveShortcut) { + const QList<QKeySequence> activeShortcut = actionShortcuts.value(action); bool isConfigurationAction = action->property("isConfigurationAction").toBool(); uint activeSetterFlags = setterFlags; @@ -323,7 +325,7 @@ } // Sets the shortcut, returns the active/real keys - const QList<int> result = iface()->setShortcut( + const auto result = iface()->setShortcut( actionId, intListFromShortcut(activeShortcut), activeSetterFlags); @@ -356,6 +358,7 @@ } if (actionFlags & DefaultShortcut) { + const QList<QKeySequence> defaultShortcut = actionDefaultShortcuts.value(action); iface()->setShortcut(actionId, intListFromShortcut(defaultShortcut), setterFlags | IsDefault); } @@ -486,7 +489,7 @@ Q_UNUSED(oldOwner); if (name == QLatin1String("org.kde.kglobalaccel") && !newOwner.isEmpty()) { // kglobalaccel was restarted - qDebug() << "detected kglobalaccel restarting, re-registering all shortcut keys"; + qCDebug(KGLOBALACCEL_LOG) << "detected kglobalaccel restarting, re-registering all shortcut keys"; reRegisterAll(); } } @@ -714,7 +717,7 @@ bool KGlobalAccel::setGlobalShortcut(QAction *action, const QList<QKeySequence> &shortcut) { KGlobalAccel *g = KGlobalAccel::self(); - return g->setShortcut(action, shortcut) && g->setDefaultShortcut(action, shortcut); + return g->d->setShortcutWithDefault(action, shortcut, Autoloading); } bool KGlobalAccel::setGlobalShortcut(QAction *action, const QKeySequence &shortcut) @@ -722,5 +725,21 @@ return KGlobalAccel::setGlobalShortcut(action, QList<QKeySequence>() << shortcut); } +bool KGlobalAccelPrivate::setShortcutWithDefault(QAction* action, const QList<QKeySequence>& shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag) +{ + if (checkGarbageKeycode(shortcut)) { + return false; + } + + if (!doRegister(action)) { + return false; + } + + actionDefaultShortcuts.insert(action, shortcut); + actionShortcuts.insert(action, shortcut); + updateGlobalShortcut(action, KGlobalAccelPrivate::DefaultShortcut | KGlobalAccelPrivate::ActiveShortcut, loadFlag); + return true; +} + #include "moc_kglobalaccel.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/src/kglobalaccel_p.h new/kglobalaccel-5.41.0/src/kglobalaccel_p.h --- old/kglobalaccel-5.40.0/src/kglobalaccel_p.h 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/src/kglobalaccel_p.h 2017-12-02 21:04:46.000000000 +0100 @@ -100,6 +100,8 @@ QMap<const QAction *, QList<QKeySequence> > actionDefaultShortcuts; QMap<const QAction *, QList<QKeySequence> > actionShortcuts; + bool setShortcutWithDefault(QAction *action, const QList<QKeySequence> &shortcut, KGlobalAccel::GlobalShortcutLoading loadFlag); + private: org::kde::KGlobalAccel *m_iface; QDBusServiceWatcher *m_watcher; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/src/runtime/kserviceactioncomponent.cpp new/kglobalaccel-5.41.0/src/runtime/kserviceactioncomponent.cpp --- old/kglobalaccel-5.40.0/src/runtime/kserviceactioncomponent.cpp 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/src/runtime/kserviceactioncomponent.cpp 2017-12-02 21:04:46.000000000 +0100 @@ -114,7 +114,7 @@ QStringList shortcuts = m_desktopFile.desktopGroup().readEntry(QStringLiteral("X-KDE-Shortcuts"), QString()).split(QChar(',')); if (shortcuts.size() > 0) { - shortcutString = shortcuts.join(QChar('\\')); + shortcutString = shortcuts.join(QChar('\t')); } GlobalShortcut *shortcut = registerShortcut(QStringLiteral("_launch"), m_desktopFile.readName(), shortcutString, shortcutString); @@ -125,7 +125,7 @@ shortcuts = m_desktopFile.actionGroup(action).readEntry(QStringLiteral("X-KDE-Shortcuts"), QString()).split(QChar(',')); if (shortcuts.size() > 0) { - shortcutString = shortcuts.join(QChar('\\')); + shortcutString = shortcuts.join(QChar('\t')); } GlobalShortcut *shortcut = registerShortcut(action, m_desktopFile.actionGroup(action).readEntry(QStringLiteral("Name")), shortcutString, shortcutString); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.40.0/src/runtime/main.cpp new/kglobalaccel-5.41.0/src/runtime/main.cpp --- old/kglobalaccel-5.40.0/src/runtime/main.cpp 2017-11-05 09:30:36.000000000 +0100 +++ new/kglobalaccel-5.41.0/src/runtime/main.cpp 2017-12-02 21:04:46.000000000 +0100 @@ -57,7 +57,6 @@ aboutdata.addAuthor("Andreas Hartmetz", QObject::tr("Maintainer"), "ahartm...@gmail.com"); aboutdata.addAuthor("Michael Jansen", QObject::tr("Maintainer"), "k...@michael-jansen.biz"); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kglobalaccel"))); KAboutData::setApplicationData(aboutdata); { @@ -76,9 +75,7 @@ KDBusService service(KDBusService::Unique); app.setQuitOnLastWindowClosed( false ); -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) QGuiApplication::setFallbackSessionManagementEnabled(false); -#endif // Restart on a crash KCrash::setFlags(KCrash::AutoRestart);
