Hello community, here is the log from the commit of package kglobalaccel for openSUSE:Factory checked in at 2015-09-02 07:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kglobalaccel (Old) and /work/SRC/openSUSE:Factory/.kglobalaccel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kglobalaccel" Changes: -------- --- /work/SRC/openSUSE:Factory/kglobalaccel/kglobalaccel.changes 2015-07-14 17:23:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kglobalaccel.new/kglobalaccel.changes 2015-09-02 07:45:48.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Aug 4 19:20:26 UTC 2015 - [email protected] + +- Update to 5.13.0 + * The Qt version requirement has been bumped from 5.2 to 5.3 + * Debug output has been ported to categorized output, for less + noise by default + * Docbook documentation has been reviewed and updated + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.13.0.php + +------------------------------------------------------------------- Old: ---- kglobalaccel-5.12.0.tar.xz New: ---- kglobalaccel-5.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kglobalaccel.spec ++++++ --- /var/tmp/diff_new_pack.C4D5j7/_old 2015-09-02 07:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.C4D5j7/_new 2015-09-02 07:45:49.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5GlobalAccel5 -%define _tar_path 5.12 +%define _tar_path 5.13 Name: kglobalaccel -Version: 5.12.0 +Version: 5.13.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -33,13 +33,13 @@ BuildRequires: kf5-filesystem BuildRequires: kwindowsystem-devel >= %{_tar_path} %if %{with lang} -BuildRequires: libqt5-linguist-devel >= 5.2.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.3.0 %endif BuildRequires: libxcb-devel -BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2.0 +BuildRequires: cmake(Qt5DBus) >= 5.3.0 +BuildRequires: cmake(Qt5Test) >= 5.3.0 +BuildRequires: cmake(Qt5Widgets) >= 5.3.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-keysyms) Summary: Global desktop keyboard shortcuts @@ -85,8 +85,8 @@ Requires: %lname = %{version} Requires: extra-cmake-modules Requires: libKF5GlobalAccelPrivate5 = %{version} -Requires: pkgconfig(Qt5DBus) >= 5.2.0 -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: cmake(Qt5DBus) >= 5.3.0 +Requires: cmake(Qt5Widgets) >= 5.3.0 %description devel KGlobalAccel allows you to have global accelerators that are independent of ++++++ kglobalaccel-5.12.0.tar.xz -> kglobalaccel-5.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/CMakeLists.txt new/kglobalaccel-5.13.0/CMakeLists.txt --- old/kglobalaccel-5.12.0/CMakeLists.txt 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/CMakeLists.txt 2015-08-04 12:57:17.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.12.0 NO_MODULE) +find_package(ECM 5.13.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) @@ -18,8 +18,8 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.12.0") # handled by release scripts -set(KF5_DEP_VERSION "5.12.0") # handled by release scripts +set(KF5_VERSION "5.13.0") # handled by release scripts +set(KF5_DEP_VERSION "5.13.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KGLOBALACCEL VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kglobalaccel_version.h" @@ -27,7 +27,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.2.0) +set(REQUIRED_QT_VERSION 5.3.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus Widgets) include(KDEInstallDirs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/autotests/CMakeLists.txt new/kglobalaccel-5.13.0/autotests/CMakeLists.txt --- old/kglobalaccel-5.12.0/autotests/CMakeLists.txt 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/autotests/CMakeLists.txt 2015-08-04 12:57:17.000000000 +0200 @@ -1,4 +1,4 @@ -find_package(Qt5 5.2.0 CONFIG REQUIRED Test) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) remove_definitions(-DQT_NO_CAST_FROM_ASCII) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/po/ast/kglobalaccel5_qt.po new/kglobalaccel-5.13.0/po/ast/kglobalaccel5_qt.po --- old/kglobalaccel-5.12.0/po/ast/kglobalaccel5_qt.po 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/po/ast/kglobalaccel5_qt.po 2015-08-04 12:57:17.000000000 +0200 @@ -7,8 +7,8 @@ "Project-Id-Version: kdelibs4-1\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2015-06-30 16:35+0100\n" -"Last-Translator: Enol P. <[email protected]>\n" +"PO-Revision-Date: 2015-07-11 16:23+0100\n" +"Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" "Language: ast\n" "MIME-Version: 1.0\n" @@ -20,6 +20,7 @@ "X-Generator: Lokalize 2.0\n" #: kglobalaccel.cpp:520 +#, fuzzy msgctxt "KGlobalAccel|" msgid "Conflict with Global Shortcut" msgstr "Conflictu col atayu global" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/po/da/kglobalaccel5_qt.po new/kglobalaccel-5.13.0/po/da/kglobalaccel5_qt.po --- old/kglobalaccel-5.12.0/po/da/kglobalaccel5_qt.po 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/po/da/kglobalaccel5_qt.po 2015-08-04 12:57:17.000000000 +0200 @@ -4,14 +4,14 @@ # # Martin Schlander, 2008. # Martin Schlander <[email protected]>, 2008. -# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Martin Schlander <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. # Keld Simonsen <[email protected]>, 2010. msgid "" msgstr "" "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-09-21 15:38+0200\n" +"PO-Revision-Date: 2015-07-08 20:42+0200\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" "Language: da\n" @@ -75,11 +75,9 @@ #: runtime/main.cpp:61 runtime/main.cpp:63 msgctxt "QObject|" msgid "KDE Global Shortcuts Service" -msgstr "" +msgstr "KDE's globale genvejstjeneste" #: runtime/main.cpp:66 runtime/main.cpp:67 -#, fuzzy -#| msgid "Maintainer" msgctxt "QObject|" msgid "Maintainer" msgstr "Vedligeholder" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/po/nb/kglobalaccel5_qt.po new/kglobalaccel-5.13.0/po/nb/kglobalaccel5_qt.po --- old/kglobalaccel-5.12.0/po/nb/kglobalaccel5_qt.po 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/po/nb/kglobalaccel5_qt.po 2015-08-04 12:57:17.000000000 +0200 @@ -26,12 +26,12 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: kglobalaccel.cpp:512 +#: kglobalaccel.cpp:520 msgctxt "KGlobalAccel|" msgid "Conflict with Global Shortcut" msgstr "Konflikt med global snarvei" -#: kglobalaccel.cpp:513 +#: kglobalaccel.cpp:521 #, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -43,12 +43,12 @@ "i %3.\n" "Vil du bruke kombinasjonen til den nye handlinga i stedet?" -#: kglobalaccel.cpp:522 kglobalaccel.cpp:566 +#: kglobalaccel.cpp:530 kglobalaccel.cpp:574 msgctxt "KGlobalAccel|" msgid "Reassign" msgstr "Tilordne på nytt" -#: kglobalaccel.cpp:544 +#: kglobalaccel.cpp:552 #, qt-format msgctxt "KGlobalAccel|" msgid "The '%1' key combination is registered by application %2 for action %3:" @@ -56,13 +56,13 @@ "Tastekombinasjonen «%1» er allerede registrert av programmet %2 for " "handling %3:" -#: kglobalaccel.cpp:551 +#: kglobalaccel.cpp:559 #, qt-format msgctxt "KGlobalAccel|" msgid "In context '%1' for action '%2'\n" msgstr "I konteksten «%1» for handling «%2»\n" -#: kglobalaccel.cpp:555 +#: kglobalaccel.cpp:563 #, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -72,7 +72,7 @@ "Tastekombinasjonen «%1» er registrert av programmet %2.\n" "%3" -#: kglobalaccel.cpp:561 +#: kglobalaccel.cpp:569 msgctxt "KGlobalAccel|" msgid "Conflict With Registered Global Shortcut" msgstr "Konflikt med registrert global snarvei" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/po/nn/kglobalaccel5_qt.po new/kglobalaccel-5.13.0/po/nn/kglobalaccel5_qt.po --- old/kglobalaccel-5.12.0/po/nn/kglobalaccel5_qt.po 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/po/nn/kglobalaccel5_qt.po 2015-08-04 12:57:17.000000000 +0200 @@ -23,12 +23,12 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: kglobalaccel.cpp:512 +#: kglobalaccel.cpp:520 msgctxt "KGlobalAccel|" msgid "Conflict with Global Shortcut" msgstr "Konflikt med globale snarvegar" -#: kglobalaccel.cpp:513 +#: kglobalaccel.cpp:521 #, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -39,25 +39,25 @@ "Tastekombinasjonen «%1» er alt i bruk for den globale handlinga «%2» i %3.\n" "Vil du bruka han til den nye handlinga i staden?" -#: kglobalaccel.cpp:522 kglobalaccel.cpp:566 +#: kglobalaccel.cpp:530 kglobalaccel.cpp:574 msgctxt "KGlobalAccel|" msgid "Reassign" msgstr "Tilordna på nytt" -#: kglobalaccel.cpp:544 +#: kglobalaccel.cpp:552 #, qt-format msgctxt "KGlobalAccel|" msgid "The '%1' key combination is registered by application %2 for action %3:" msgstr "" "Tastekombinasjonen «%1» er alt i bruk av programmet %2 til handlinga %3:" -#: kglobalaccel.cpp:551 +#: kglobalaccel.cpp:559 #, qt-format msgctxt "KGlobalAccel|" msgid "In context '%1' for action '%2'\n" msgstr "I samanhengen «%1» for handlinga «%2»\n" -#: kglobalaccel.cpp:555 +#: kglobalaccel.cpp:563 #, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -67,7 +67,7 @@ "Tastekombinasjonen «%1» er registrert av programmet %2.\n" "%3" -#: kglobalaccel.cpp:561 +#: kglobalaccel.cpp:569 msgctxt "KGlobalAccel|" msgid "Conflict With Registered Global Shortcut" msgstr "Konflikt med registrert global snarveg" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/po/se/kglobalaccel5_qt.po new/kglobalaccel-5.13.0/po/se/kglobalaccel5_qt.po --- old/kglobalaccel-5.12.0/po/se/kglobalaccel5_qt.po 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/po/se/kglobalaccel5_qt.po 2015-08-04 12:57:17.000000000 +0200 @@ -20,13 +20,13 @@ "X-Text-Markup: qtrich\n" "X-Qt-Contexts: true\n" -#: kglobalaccel.cpp:512 +#: kglobalaccel.cpp:520 #, fuzzy msgctxt "KGlobalAccel|" msgid "Conflict with Global Shortcut" msgstr "Gávdno juo globála njuolggobálggisin" -#: kglobalaccel.cpp:513 +#: kglobalaccel.cpp:521 #, fuzzy, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -37,25 +37,25 @@ "«%1» boallokombinašuvdna geavahuvvo juo almmolaš «%2» doibmii «%3:s».\n" "Háliidatgo liikká bidjat dan kombinašuvnna dan ođđa doibmii?" -#: kglobalaccel.cpp:522 kglobalaccel.cpp:566 +#: kglobalaccel.cpp:530 kglobalaccel.cpp:574 #, fuzzy msgctxt "KGlobalAccel|" msgid "Reassign" msgstr "Bija ođđasit" -#: kglobalaccel.cpp:544 +#: kglobalaccel.cpp:552 #, fuzzy, qt-format msgctxt "KGlobalAccel|" msgid "The '%1' key combination is registered by application %2 for action %3:" msgstr "«%1»-boallokombinašuvdna geavahuvvo %2-prográmmas %3-doaimmas:" -#: kglobalaccel.cpp:551 +#: kglobalaccel.cpp:559 #, fuzzy, qt-format msgctxt "KGlobalAccel|" msgid "In context '%1' for action '%2'\n" msgstr "«%1»-oktavuođas «%2»-doibmii\n" -#: kglobalaccel.cpp:555 +#: kglobalaccel.cpp:563 #, fuzzy, qt-format msgctxt "KGlobalAccel|" msgid "" @@ -65,7 +65,7 @@ "«%1»-boallokombinašuvdna geavahuvvo %2-prográmmas.\n" "%3" -#: kglobalaccel.cpp:561 +#: kglobalaccel.cpp:569 #, fuzzy msgctxt "KGlobalAccel|" msgid "Conflict With Registered Global Shortcut" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/src/runtime/globalshortcutsregistry.cpp new/kglobalaccel-5.13.0/src/runtime/globalshortcutsregistry.cpp --- old/kglobalaccel-5.12.0/src/runtime/globalshortcutsregistry.cpp 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/src/runtime/globalshortcutsregistry.cpp 2015-08-04 12:57:17.000000000 +0200 @@ -36,13 +36,17 @@ static KGlobalAccelInterface *loadPlugin(GlobalShortcutsRegistry *parent) { const QVector<KPluginMetaData> candidates = KPluginLoader::findPlugins(QStringLiteral("org.kde.kglobalaccel5.platforms")); + QString platformName = QString::fromLocal8Bit(qgetenv("KGLOBALACCELD_PLATFORM")); + if (platformName.isEmpty()) { + platformName = QGuiApplication::platformName(); + } foreach (const KPluginMetaData &candidate, candidates) { const QJsonArray platforms = candidate.rawData().value(QStringLiteral("platforms")).toArray(); for (auto it = platforms.begin(); it != platforms.end(); ++it) { - if (QString::compare(QGuiApplication::platformName(), (*it).toString(), Qt::CaseInsensitive) == 0) { + if (QString::compare(platformName, (*it).toString(), Qt::CaseInsensitive) == 0) { KGlobalAccelInterface *interface = qobject_cast< KGlobalAccelInterface* >(candidate.instantiate()); if (interface) { - qCDebug(KGLOBALACCELD) << "Loaded plugin" << candidate.fileName() << "for platform" << QGuiApplication::platformName(); + qCDebug(KGLOBALACCELD) << "Loaded plugin" << candidate.fileName() << "for platform" << platformName; interface->setRegistry(parent); return interface; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kglobalaccel-5.12.0/src/runtime/logging.cpp new/kglobalaccel-5.13.0/src/runtime/logging.cpp --- old/kglobalaccel-5.12.0/src/runtime/logging.cpp 2015-07-05 11:03:32.000000000 +0200 +++ new/kglobalaccel-5.13.0/src/runtime/logging.cpp 2015-08-04 12:57:17.000000000 +0200 @@ -18,4 +18,10 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. *********************************************************************/ #include "logging_p.h" -Q_LOGGING_CATEGORY(KGLOBALACCELD, "kglobalaccel-runtime"); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) +// logging category for this framework, default: log stuff >= warning +Q_LOGGING_CATEGORY(KGLOBALACCELD, "kglobalaccel-runtime", QtWarningMsg) +#else +Q_LOGGING_CATEGORY(KGLOBALACCELD, "kglobalaccel-runtime") +#endif
