Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2015-10-19 22:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2015-09-24 07:13:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2015-10-19 22:26:25.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 5 17:37:27 UTC 2015 - [email protected] + +- Update to 5.15.0 + * Don't send notification update signal twice + * Reparse notification config only when it changed + * Don't try to find X11 on WIN32 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.15.0.php + +------------------------------------------------------------------- Old: ---- knotifications-5.14.0.tar.xz New: ---- knotifications-5.15.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.j5qPmt/_old 2015-10-19 22:26:25.000000000 +0200 +++ /var/tmp/diff_new_pack.j5qPmt/_new 2015-10-19 22:26:25.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Notifications5 -%define _tar_path 5.14 +%define _tar_path 5.15 Name: knotifications -Version: 5.14.0 +Version: 5.15.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 ++++++ knotifications-5.14.0.tar.xz -> knotifications-5.15.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/CMakeLists.txt new/knotifications-5.15.0/CMakeLists.txt --- old/knotifications-5.14.0/CMakeLists.txt 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/CMakeLists.txt 2015-10-05 10:17:13.000000000 +0200 @@ -4,7 +4,7 @@ # ECM setup include(FeatureSummary) -find_package(ECM 5.14.0 NO_MODULE) +find_package(ECM 5.15.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) @@ -17,8 +17,8 @@ include(ECMQtDeclareLoggingCategory) include(ECMPoQmTools) -set(KF5_VERSION "5.14.0") # handled by release scripts -set(KF5_DEP_VERSION "5.14.0") # handled by release scripts +set(KF5_VERSION "5.15.0") # handled by release scripts +set(KF5_DEP_VERSION "5.15.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KNOTIFICATIONS @@ -42,7 +42,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -if (NOT APPLE) +if (NOT APPLE AND NOT WIN32) find_package(X11) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/po/eo/knotifications5_qt.po new/knotifications-5.15.0/po/eo/knotifications5_qt.po --- old/knotifications-5.14.0/po/eo/knotifications5_qt.po 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/po/eo/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 @@ -28,43 +28,32 @@ "X-Qt-Contexts: true\n" #: knotificationrestrictions.cpp:184 -#, fuzzy -#| msgid "Unknown Application" msgctxt "KNotificationRestrictions|" msgid "Unknown Application" -msgstr "Nekonata Aplikaĵon" +msgstr "Nekonata Aplikaĵo" #: kstatusnotifieritem.cpp:439 kstatusnotifieritem.cpp:884 -#, fuzzy -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|" msgid "&Minimize" msgstr "&Minimumigi" #: kstatusnotifieritem.cpp:709 -#, fuzzy -#| msgid "Quit" msgctxt "KStatusNotifierItem|" msgid "Quit" msgstr "Ĉesigi" #: kstatusnotifieritem.cpp:882 -#, fuzzy -#| msgid "&Restore" msgctxt "KStatusNotifierItem|" msgid "&Restore" msgstr "&Restarigi" #: kstatusnotifieritem.cpp:896 -#, fuzzy, qt-format -#| msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" +#, qt-format msgctxt "KStatusNotifierItem|" msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>" msgstr "<qt>Ĉu vi certas ke vi volas ĉesigi <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:899 -#, fuzzy -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|" msgid "Confirm Quit From System Tray" msgstr "Konfirmi la ĉesigon de la sistempleto" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/po/nb/knotifications5_qt.po new/knotifications-5.15.0/po/nb/knotifications5_qt.po --- old/knotifications-5.14.0/po/nb/knotifications5_qt.po 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/po/nb/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 @@ -1,5 +1,3 @@ -# Translation of knotifications5_qt to Norwegian Bokmål -# # Knut Yrvin <[email protected]>, 2002, 2003, 2004, 2005. # Bjørn Steensrud <[email protected]>, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Eskild Hustvedt <[email protected]>, 2004, 2005. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/po/se/knotifications5_qt.po new/knotifications-5.15.0/po/se/knotifications5_qt.po --- old/knotifications-5.14.0/po/se/knotifications5_qt.po 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/po/se/knotifications5_qt.po 2015-10-05 10:17:13.000000000 +0200 @@ -1,5 +1,3 @@ -# Translation of knotifications5_qt to Northern Sami -# # Børre Gaup <[email protected]>, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. msgid "" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/src/knotification.cpp new/knotifications-5.15.0/src/knotification.cpp --- old/knotifications-5.14.0/src/knotification.cpp 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/src/knotification.cpp 2015-10-05 10:17:13.000000000 +0200 @@ -426,7 +426,9 @@ void KNotification::update() { - KNotificationManager::self()->update(this); + if (d->needUpdate) { + KNotificationManager::self()->update(this); + } } bool KNotification::eventFilter(QObject *watched, QEvent *event) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/src/knotificationmanager.cpp new/knotifications-5.15.0/src/knotificationmanager.cpp --- old/knotifications-5.14.0/src/knotificationmanager.cpp 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/src/knotificationmanager.cpp 2015-10-05 10:17:13.000000000 +0200 @@ -1,5 +1,6 @@ /* This file is part of the KDE libraries Copyright (C) 2005 Olivier Goffart <ogoffart at kde.org> + Copyright (C) 2013-2015 Martin Klapetek <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -47,6 +48,7 @@ // incremental ids for notifications int notifyIdCounter; + QStringList dirtyConfigCache; }; class KNotificationManagerSingleton @@ -95,6 +97,14 @@ plugin->deleteLater(); } } + + QDBusConnection::sessionBus().connect(QString(), + QStringLiteral("/Config"), + QStringLiteral("org.kde.knotification"), + QStringLiteral("reparseConfiguration"), + this, + SLOT(reparseConfiguration(QString))); + } KNotificationManager::~KNotificationManager() @@ -160,6 +170,11 @@ { KNotifyConfig notifyConfig(n->appName(), n->contexts(), n->eventId()); + if (d->dirtyConfigCache.contains(n->appName())) { + notifyConfig.reparseSingleConfiguration(n->appName()); + d->dirtyConfigCache.removeOne(n->appName()); + } + QString notifyActions = notifyConfig.readEntry("Action"); if (notifyActions.isEmpty() || notifyActions == QLatin1String("None")) { @@ -216,4 +231,11 @@ notify(n); } +void KNotificationManager::reparseConfiguration(const QString &app) +{ + if (!d->dirtyConfigCache.contains(app)) { + d->dirtyConfigCache << app; + } +} + #include "moc_knotificationmanager_p.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/src/knotificationmanager_p.h new/knotifications-5.15.0/src/knotificationmanager_p.h --- old/knotifications-5.14.0/src/knotificationmanager_p.h 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/src/knotificationmanager_p.h 2015-10-05 10:17:13.000000000 +0200 @@ -67,6 +67,7 @@ void notificationClosed(); void notificationActivated(int id, int action); void notifyPluginFinished(KNotification *notification); + void reparseConfiguration(const QString &app); private: struct Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/src/knotifyconfig.cpp new/knotifications-5.15.0/src/knotifyconfig.cpp --- old/knotifications-5.14.0/src/knotifyconfig.cpp 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/src/knotifyconfig.cpp 2015-10-05 10:17:13.000000000 +0200 @@ -23,8 +23,6 @@ #include <ksharedconfig.h> #include <kconfiggroup.h> -// #include <kdebug.h> -// #include <kglobal.h> #include <QCache> #include <QDataStream> #include <QStandardPaths> @@ -36,7 +34,6 @@ { QCache<QString, KSharedConfig::Ptr> &cache = *static_cache; if (cache.contains(filename)) { - (*cache[filename])->reparseConfiguration(); return *cache[filename]; } @@ -54,6 +51,15 @@ } } +void KNotifyConfig::reparseSingleConfiguration(const QString &app) +{ + QCache<QString, KSharedConfig::Ptr> &cache = *static_cache; + const QString appCacheKey = app + QStringLiteral(".notifyrc"); + if (cache.contains(appCacheKey)) { + (*cache[appCacheKey])->reparseConfiguration(); + } +} + KNotifyConfig::KNotifyConfig(const QString &_appname, const ContextList &_contexts, const QString &_eventid) : appname (_appname), contexts(_contexts), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.14.0/src/knotifyconfig.h new/knotifications-5.15.0/src/knotifyconfig.h --- old/knotifications-5.14.0/src/knotifyconfig.h 2015-09-05 11:09:20.000000000 +0200 +++ new/knotifications-5.15.0/src/knotifyconfig.h 2015-10-05 10:17:13.000000000 +0200 @@ -101,6 +101,8 @@ * reparse the cached configs. to be used when the config may have changed */ static void reparseConfiguration(); + + static void reparseSingleConfiguration(const QString &app); }; #endif
