Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2018-10-22 11:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Mon Oct 22 11:14:17 2018 rev:59 rq:642335 version:5.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2018-10-01 08:07:59.970301929 +0200 +++ /work/SRC/openSUSE:Factory/.knotifications.new/knotifications.changes 2018-10-22 11:14:18.627722826 +0200 @@ -1,0 +2,16 @@ +Tue Oct 16 08:02:27 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Mon Oct 15 11:50:36 UTC 2018 - [email protected] + +- Update to 5.51.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.51.0.php +- Changes since 5.50.0: + * force-finish canberra notifications on close() (kde#398695) + * Fix minor EBN issues + +------------------------------------------------------------------- Old: ---- knotifications-5.50.0.tar.xz New: ---- knotifications-5.51.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.atOi9w/_old 2018-10-22 11:14:19.115722294 +0200 +++ /var/tmp/diff_new_pack.atOi9w/_new 2018-10-22 11:14:19.119722290 +0200 @@ -12,24 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define lname libKF5Notifications5 -%define _tar_path 5.50 +%define _tar_path 5.51 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: knotifications -Version: 5.50.0 +Version: 5.51.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later Group: System/GUI/KDE -URL: http://www.kde.org +URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRequires: cmake >= 3.0 ++++++ knotifications-5.50.0.tar.xz -> knotifications-5.51.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/CMakeLists.txt new/knotifications-5.51.0/CMakeLists.txt --- old/knotifications-5.50.0/CMakeLists.txt 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/CMakeLists.txt 2018-10-10 21:59:18.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.50.0") # handled by release scripts -set(KF5_DEP_VERSION "5.50.0") # handled by release scripts +set(KF5_VERSION "5.51.0") # handled by release scripts +set(KF5_DEP_VERSION "5.51.0") # handled by release scripts project(KNotifications VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.50.0 NO_MODULE) +find_package(ECM 5.51.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/autotests/fake_notifications_server.h new/knotifications-5.51.0/autotests/fake_notifications_server.h --- old/knotifications-5.50.0/autotests/fake_notifications_server.h 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/autotests/fake_notifications_server.h 2018-10-10 21:59:18.000000000 +0200 @@ -16,6 +16,9 @@ Boston, MA 02110-1301, USA. */ +#ifndef FAKE_NOTIFICATION_SERVER_H +#define FAKE_NOTIFICATION_SERVER_H + #include <QObject> #include <QHash> #include <QVariantMap> @@ -67,3 +70,5 @@ void newNotification(); }; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.51.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.50.0/po/zh_CN/knotifications5_qt.po 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/po/zh_CN/knotifications5_qt.po 2018-10-10 21:59:18.000000000 +0200 @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-08-30 13:09\n" -"Last-Translator: guoyunhebrave <[email protected]>\n" +"PO-Revision-Date: 2018-09-28 19:46\n" +"Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/knotification.h new/knotifications-5.51.0/src/knotification.h --- old/knotifications-5.50.0/src/knotification.h 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/knotification.h 2018-10-10 21:59:18.000000000 +0200 @@ -134,7 +134,7 @@ * KNotification as plugins, by deriving from KNotificationPlugin. * At the time of writing, the following actions are available: Taskbar, * Sound, Popup, Logfile, TTS, Execute. - * Actions can be combined by seperating them with '|'. + * Actions can be combined by separating them with '|'. * * Contexts is a comma separated list of possible context for this event. * @@ -317,7 +317,7 @@ /** * @brief the widget associated to the notification * - * If the widget is destroyed, the notification will be automatically cancelled. + * If the widget is destroyed, the notification will be automatically canceled. * If the widget is activated, the notification will be automatically closed if the NotificationFlags specify that * * When the notification is activated, the widget might be raised. @@ -532,7 +532,7 @@ * The parameter passed by the signal is the index of the action * in the QStringList set by setActions() call. * - * @param action will be 0 if the default aciton was activated, or the index of the action in the actions QStringList + * @param action will be 0 if the default action was activated, or the index of the action in the actions QStringList */ void activated(unsigned int action); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/knotificationmanager.cpp new/knotifications-5.51.0/src/knotificationmanager.cpp --- old/knotifications-5.50.0/src/knotificationmanager.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/knotificationmanager.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -126,7 +126,7 @@ // Load plugin. // We have a series of built-ins up first, and fall back to trying - // to instanciate an externally supplied plugin. + // to instantiate an externally supplied plugin. if (action == QLatin1String("Popup")) { if (d->inSandbox && d->portalDBusServiceExists) { plugin = new NotifyByFlatpak(this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/knotificationrestrictions.cpp new/knotifications-5.51.0/src/knotificationrestrictions.cpp --- old/knotifications-5.50.0/src/knotificationrestrictions.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/knotificationrestrictions.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -155,7 +155,7 @@ qCDebug(LOG_KNOTIFICATIONS) << "---- using XTest"; // send a fake event right away in case this got started after a period of - // innactivity leading to the screensaver set to activate in <55s + // inactivity leading to the screensaver set to activate in <55s screensaverFakeKeyEvent(); screensaverTimer->start(55000); #endif // HAVE_XTEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/kstatusnotifieritem.h new/knotifications-5.51.0/src/kstatusnotifieritem.h --- old/knotifications-5.50.0/src/kstatusnotifieritem.h 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/kstatusnotifieritem.h 2018-10-10 21:59:18.000000000 +0200 @@ -360,7 +360,7 @@ * usually you don't need to call this unless you want to use * a custom QMenu subclass as context menu. * - * The KStatusNotifierItem instance takes ownerhip of the menu, + * The KStatusNotifierItem instance takes ownership of the menu, * and will delete it upon its destruction. */ void setContextMenu(QMenu *menu); @@ -460,7 +460,7 @@ * Inform the host application that an activation has been requested, * for instance left mouse click, but this is not guaranteed since * it's dependent from the visualization - * @param active if it's true the application asked for the activatin + * @param active if it's true the application asked for the activation * of the main window, if it's false it asked for hiding * @param pos the position in the screen where the user clicked to * trigger this signal, QPoint() if it's not the consequence of a mouse click. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybyaudio_canberra.cpp new/knotifications-5.51.0/src/notifybyaudio_canberra.cpp --- old/knotifications-5.50.0/src/notifybyaudio_canberra.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybyaudio_canberra.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -148,6 +148,10 @@ void NotifyByAudio::finishCallback(uint32_t id, int error_code) { KNotification *notification = m_notifications.value(id, nullptr); + if (!notification) { + // We may have gotten a late finish callback. + return; + } if (error_code == CA_SUCCESS) { // Loop the sound now if we have one @@ -179,8 +183,14 @@ return; } } -} + // Consider the notification finished. ca_context_cancel schedules a cancel + // but we need to stop using the noficiation immediately or we could access + // a notification past its lifetime (close() may, or indeed must, + // schedule deletion of the notification). + // https://bugs.kde.org/show_bug.cgi?id=398695 + finishNotification(notification, id); +} void NotifyByAudio::finishNotification(KNotification *notification, quint32 id) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybyaudio_phonon.cpp new/knotifications-5.51.0/src/notifybyaudio_phonon.cpp --- old/knotifications-5.50.0/src/notifybyaudio_phonon.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybyaudio_phonon.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -94,12 +94,12 @@ m->play(); if (notification->flags() & KNotification::LoopSound) { - // Enqueing essentially prevents the subsystem pipeline from partial teardown + // Enqueuing essentially prevents the subsystem pipeline from partial teardown // which is the most desired thing in terms of load and delay between loop cycles. // All of this is timing dependent, which is why we want at least one source queued; // in reality the shorter the source the more sources we want to be queued to prevent // the MO from running out of sources. - // Point being that all phonon signals are forcefully queued (becuase qthread has problems detecting !pthread threads), + // Point being that all phonon signals are forcefully queued (because qthread has problems detecting !pthread threads), // so when you get for example the aboutToFinish signal the MO might already have stopped playing. // // And so we queue it three times at least; doesn't cost anything and keeps us safe. @@ -145,7 +145,7 @@ if (!notification) { // This means that close was called already so there's nothing else to do. // Ideally we should not be getting here if close has already been called - // since stoping a mediaobject means it won't emit finished() *BUT* + // since stopping a mediaobject means it won't emit finished() *BUT* // since the finished signal is a queued connection in phonon it can happen // that the playing had already finished and we just had not got the signal yet return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybyflatpak.cpp new/knotifications-5.51.0/src/notifybyflatpak.cpp --- old/knotifications-5.50.0/src/notifybyflatpak.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybyflatpak.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -131,7 +131,7 @@ // check if Notifications DBus service exists on bus, use it if it does if (d->dbusServiceExists) { if (!d->sendNotificationToPortal(notification, notifyConfig)) { - finish(notification); //an error ocurred. + finish(notification); //an error occurred. } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybyflatpak.h new/knotifications-5.51.0/src/notifybyflatpak.h --- old/knotifications-5.50.0/src/notifybyflatpak.h 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybyflatpak.h 2018-10-10 21:59:18.000000000 +0200 @@ -46,7 +46,7 @@ private Q_SLOTS: - // slot to catch appearance or dissapearance of org.freedesktop.Desktop DBus service + // slot to catch appearance or disappearance of org.freedesktop.Desktop DBus service void onServiceOwnerChanged(const QString &, const QString &, const QString &); void onPortalNotificationActionInvoked(const QString &, const QString &, const QVariantList &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybypopup.cpp new/knotifications-5.51.0/src/notifybypopup.cpp --- old/knotifications-5.50.0/src/notifybypopup.cpp 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybypopup.cpp 2018-10-10 21:59:18.000000000 +0200 @@ -218,7 +218,7 @@ void NotifyByPopup::notify(KNotification *notification, const KNotifyConfig ¬ifyConfig) { if (d->passivePopups.contains(notification) || d->galagoNotifications.contains(notification->id())) { - // notification is alrady on the screen, do nothing + // notification is already on the screen, do nothing finish(notification); return; } @@ -233,7 +233,7 @@ d->queryPopupServerCapabilities(); } else { if (!d->sendNotificationToGalagoServer(notification, notifyConfig)) { - finish(notification); //an error ocurred. + finish(notification); //an error occurred. } } return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.50.0/src/notifybypopup.h new/knotifications-5.51.0/src/notifybypopup.h --- old/knotifications-5.50.0/src/notifybypopup.h 2018-09-02 21:28:52.000000000 +0200 +++ new/knotifications-5.51.0/src/notifybypopup.h 2018-10-10 21:59:18.000000000 +0200 @@ -51,7 +51,7 @@ private Q_SLOTS: void onPassivePopupDestroyed(); void onPassivePopupLinkClicked(const QString &link); - // slot to catch appearance or dissapearance of Notifications DBus service + // slot to catch appearance or disappearance of Notifications DBus service void onServiceOwnerChanged(const QString &, const QString &, const QString &); // slot which gets called when DBus signals that some notification action was invoked void onGalagoNotificationActionInvoked(uint notificationId, const QString &actionKey);
