Hello community, here is the log from the commit of package knotifications for openSUSE:Factory checked in at 2020-12-15 12:29:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knotifications (Old) and /work/SRC/openSUSE:Factory/.knotifications.new.2328 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knotifications" Tue Dec 15 12:29:10 2020 rev:87 rq:855449 version:5.77.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knotifications/knotifications.changes 2020-11-23 10:32:48.085513276 +0100 +++ /work/SRC/openSUSE:Factory/.knotifications.new.2328/knotifications.changes 2020-12-15 12:31:28.520053046 +0100 @@ -1,0 +2,15 @@ +Sat Dec 5 18:56:48 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.77.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.77.0 +- Changes since 5.76.0: + * Remove redundant setLayout() call + * Don't pass transient hint (kde#422042) + * Add SPDX license statement for the impl on macOS + * Fix case-sensitive error of AppKit header on macOS + * Do not invoke invalid notification actions + * Fix memory handling for notifybysnore + +------------------------------------------------------------------- Old: ---- knotifications-5.76.0.tar.xz knotifications-5.76.0.tar.xz.sig New: ---- knotifications-5.77.0.tar.xz knotifications-5.77.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knotifications.spec ++++++ --- /var/tmp/diff_new_pack.qGvuvz/_old 2020-12-15 12:31:29.424053774 +0100 +++ /var/tmp/diff_new_pack.qGvuvz/_new 2020-12-15 12:31:29.428053777 +0100 @@ -17,14 +17,14 @@ %define lname libKF5Notifications5 -%define _tar_path 5.76 +%define _tar_path 5.77 # 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.76.0 +Version: 5.77.0 Release: 0 Summary: KDE Desktop notifications License: LGPL-2.1-or-later @@ -43,16 +43,16 @@ BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5CoreAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5DBus) >= 5.12.0 -BuildRequires: cmake(Qt5Test) >= 5.12.0 -BuildRequires: cmake(Qt5TextToSpeech) >= 5.12.0 -BuildRequires: cmake(Qt5Widgets) >= 5.12.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.12.0 +BuildRequires: cmake(Qt5DBus) >= 5.13.0 +BuildRequires: cmake(Qt5Test) >= 5.13.0 +BuildRequires: cmake(Qt5TextToSpeech) >= 5.13.0 +BuildRequires: cmake(Qt5Widgets) >= 5.13.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.13.0 BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(x11) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.12.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.13.0 %endif %description @@ -75,8 +75,8 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5DBus) >= 5.12.0 -Requires: cmake(Qt5Widgets) >= 5.12.0 +Requires: cmake(Qt5DBus) >= 5.13.0 +Requires: cmake(Qt5Widgets) >= 5.13.0 %description devel KNotification is used to notify the user of an event. It covers feedback and ++++++ knotifications-5.76.0.tar.xz -> knotifications-5.77.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/CMakeLists.txt new/knotifications-5.77.0/CMakeLists.txt --- old/knotifications-5.76.0/CMakeLists.txt 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/CMakeLists.txt 2020-12-05 13:51:48.000000000 +0100 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.76.0") # handled by release scripts -set(KF5_DEP_VERSION "5.76.0") # handled by release scripts +set(KF5_VERSION "5.77.0") # handled by release scripts +set(KF5_DEP_VERSION "5.77.0") # handled by release scripts project(KNotifications VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.76.0 NO_MODULE) +find_package(ECM 5.77.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -34,7 +34,7 @@ SOVERSION 5) # Dependencies -set(REQUIRED_QT_VERSION 5.12.0) +set(REQUIRED_QT_VERSION 5.13.0) set(CMAKE_AUTORCC TRUE) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/po/hu/knotifications5_qt.po new/knotifications-5.77.0/po/hu/knotifications5_qt.po --- old/knotifications-5.76.0/po/hu/knotifications5_qt.po 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/po/hu/knotifications5_qt.po 2020-12-05 13:51:48.000000000 +0100 @@ -1,29 +1,28 @@ # Kiszel Kristóf <ulys...@kubuntu.org>, 2010. -# Kristóf Kiszel <ulys...@kubuntu.org>, 2010, 2011, 2012, 2014. +# Kristóf Kiszel <ulys...@kubuntu.org>, 2010, 2011, 2012, 2014, 2020. # Balázs Úr <urbal...@gmail.com>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: KDE 4.4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2014-03-28 22:50+0100\n" -"Last-Translator: Kristóf Kiszel <ulys...@kubuntu.org>\n" +"PO-Revision-Date: 2020-11-28 15:04+0100\n" +"Last-Translator: Kristóf Kiszel <kiszel.kris...@gmail.com>\n" "Language-Team: Hungarian <kde-l10n...@kde.org>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 21.03.70\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed #: knotificationjobuidelegate.cpp:28 -#, fuzzy, qt-format -#| msgid "%1 (Link)" +#, qt-format msgctxt "KNotificationJobUiDelegate|" msgid "%1 (Failed)" -msgstr "%1 (link)" +msgstr "%1 (Sikertelen)" #: knotificationrestrictions.cpp:180 msgctxt "KNotificationRestrictions|" @@ -31,25 +30,16 @@ msgstr "Ismeretlen alkalmazás" #: kstatusnotifieritem.cpp:531 kstatusnotifieritem.cpp:1110 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Minimize" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Minimize" msgstr "M&inimalizálás" #: kstatusnotifieritem.cpp:849 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Quit" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "Quit" msgstr "Kilépés" #: kstatusnotifieritem.cpp:1108 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "&Restore" msgctxt "KStatusNotifierItem|@action:inmenu" msgid "&Restore" msgstr "&Visszaállítás" @@ -61,9 +51,6 @@ msgstr "<qt>Biztosan be szeretné zárni ezt: <b>%1</b>?</qt>" #: kstatusnotifieritem.cpp:1125 -#, fuzzy -#| msgctxt "KStatusNotifierItem|" -#| msgid "Confirm Quit From System Tray" msgctxt "KStatusNotifierItem|@title:window" msgid "Confirm Quit From System Tray" msgstr "Bezárás a paneltálcában" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/po/ml/knotifications5_qt.po new/knotifications-5.77.0/po/ml/knotifications5_qt.po --- old/knotifications-5.76.0/po/ml/knotifications5_qt.po 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/po/ml/knotifications5_qt.po 2020-12-05 13:51:48.000000000 +0100 @@ -20,8 +20,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" -"X-Poedit-Country: INDIA\n" "X-Qt-Contexts: true\n" #. Job name, e.g. Copying has failed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/po/zh_CN/knotifications5_qt.po new/knotifications-5.77.0/po/zh_CN/knotifications5_qt.po --- old/knotifications-5.76.0/po/zh_CN/knotifications5_qt.po 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/po/zh_CN/knotifications5_qt.po 2020-12-05 13:51:48.000000000 +0100 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-10-08 19:21\n" +"PO-Revision-Date: 2020-11-10 15:01\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.76.0/src/kpassivepopup.cpp new/knotifications-5.77.0/src/kpassivepopup.cpp --- old/knotifications-5.76.0/src/kpassivepopup.cpp 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/src/kpassivepopup.cpp 2020-12-05 13:51:48.000000000 +0100 @@ -301,7 +301,6 @@ QWidget *top = new QWidget(parent ? parent : this); QVBoxLayout *vb = new QVBoxLayout(top); vb->setContentsMargins(0, 0, 0, 0); - top->setLayout(vb); QHBoxLayout *hb = nullptr; if (!icon.isNull()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/src/notifybymacosnotificationcenter.h new/knotifications-5.77.0/src/notifybymacosnotificationcenter.h --- old/knotifications-5.76.0/src/notifybymacosnotificationcenter.h 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/src/notifybymacosnotificationcenter.h 2020-12-05 13:51:48.000000000 +0100 @@ -1,3 +1,9 @@ +/* + SPDX-FileCopyrightText: 2019-2020 Weixuan XIAO <veyx.shaw at gmail.com> + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ + #ifndef NOTIFYBYMACOSNOTIFICATIONCENTER_H #define NOTIFYBYMACOSNOTIFICATIONCENTER_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/src/notifybymacosnotificationcenter.mm new/knotifications-5.77.0/src/notifybymacosnotificationcenter.mm --- old/knotifications-5.76.0/src/notifybymacosnotificationcenter.mm 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/src/notifybymacosnotificationcenter.mm 2020-12-05 13:51:48.000000000 +0100 @@ -1,3 +1,9 @@ +/* + SPDX-FileCopyrightText: 2019-2020 Weixuan XIAO <veyx.shaw at gmail.com> + + SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +*/ + #include "notifybymacosnotificationcenter.h" #include "knotification.h" #include "knotifyconfig.h" @@ -7,7 +13,7 @@ #include <QDebug> #include <QtMac> -#import <Appkit/Appkit.h> +#import <AppKit/AppKit.h> #import <Foundation/Foundation.h> #import <objc/runtime.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/src/notifybypopup.cpp new/knotifications-5.77.0/src/notifybypopup.cpp --- old/knotifications-5.76.0/src/notifybypopup.cpp 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/src/notifybypopup.cpp 2020-12-05 13:51:48.000000000 +0100 @@ -174,10 +174,10 @@ const int actionIndex = actionKey.toInt(&ok); if (!ok || actionIndex < 1 || actionIndex > n->actions().size()) { - qCWarning(LOG_KNOTIFICATIONS) << "Invalid action key" << actionKey; + qCWarning(LOG_KNOTIFICATIONS) << "Ignored invalid action key" << actionKey; + } else { + emit actionInvoked(n->id(), actionIndex); } - - emit actionInvoked(n->id(), actionIndex); } } else { d->notifications.erase(iter); @@ -285,10 +285,6 @@ hintsMap[QStringLiteral("x-kde-skipGrouping")] = 1; } - if (!(notification->flags() & KNotification::Persistent)) { - hintsMap[QStringLiteral("transient")] = true; - } - QString desktopFileName = QGuiApplication::desktopFileName(); if (!desktopFileName.isEmpty()) { // handle apps which set the desktopFileName property with filename suffix, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knotifications-5.76.0/src/notifybysnore.cpp new/knotifications-5.77.0/src/notifybysnore.cpp --- old/knotifications-5.76.0/src/notifybysnore.cpp 2020-11-07 13:13:13.000000000 +0100 +++ new/knotifications-5.77.0/src/notifybysnore.cpp 2020-12-05 13:51:48.000000000 +0100 @@ -144,6 +144,8 @@ void NotifyBySnore::notifyDeferred(KNotification* notification) { + m_notifications.insert(notification->id(), notification); + const QString notificationTitle = ((!notification->title().isEmpty()) ? stripRichText(notification->title()) : qApp->applicationDisplayName()); QStringList snoretoastArgsList { @@ -168,20 +170,35 @@ snoretoastArgsList << QStringLiteral("-b") << notification->actions().join(QLatin1Char(';')); } - qCDebug(LOG_KNOTIFICATIONS) << snoretoastArgsList; - QProcess* snoretoastProcess = new QProcess(); - connect(snoretoastProcess, &QProcess::started, [this, notification]() { - m_notifications.insert(notification->id(), notification); // TODO: handle failure of this call - qCDebug(LOG_KNOTIFICATIONS) << "Inserted notification into m_notifications"; + connect(snoretoastProcess, &QProcess::readyReadStandardError, + [snoretoastProcess, snoretoastArgsList]() { + const auto data = snoretoastProcess->readAllStandardError(); + qCDebug(LOG_KNOTIFICATIONS) << "SnoreToast process stderr:" + << snoretoastArgsList << data; }); - - connect(snoretoastProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), - [this, snoretoastProcess, iconPath](int exitCode, QProcess::ExitStatus exitStatus) { + connect(snoretoastProcess, &QProcess::readyReadStandardOutput, + [snoretoastProcess, snoretoastArgsList]() { + const auto data = snoretoastProcess->readAllStandardOutput(); + qCDebug(LOG_KNOTIFICATIONS) << "SnoreToast process stdout:" + << snoretoastArgsList << data; + }); + connect(snoretoastProcess, &QProcess::errorOccurred, this, + [this, snoretoastProcess, snoretoastArgsList, iconPath](QProcess::ProcessError error) { + qCWarning(LOG_KNOTIFICATIONS) << "SnoreToast process errored:" + << snoretoastArgsList << error; + snoretoastProcess->deleteLater(); + QFile::remove(iconPath); + }); + connect(snoretoastProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, + [this, snoretoastProcess, snoretoastArgsList, iconPath](int exitCode, QProcess::ExitStatus exitStatus) { + qCDebug(LOG_KNOTIFICATIONS) << "SnoreToast process finished:" << snoretoastArgsList; + qCDebug(LOG_KNOTIFICATIONS) << "code:" << exitCode << "status:" << exitStatus; snoretoastProcess->deleteLater(); QFile::remove(iconPath); }); + qCDebug(LOG_KNOTIFICATIONS) << "SnoreToast process starting:" << snoretoastArgsList; snoretoastProcess->start(SnoreToastExecName(), snoretoastArgsList); } @@ -193,21 +210,18 @@ return; } + m_notifications.remove(notification->id()); + const QStringList snoretoastArgsList{ QStringLiteral("-close"), QString::number(notification->id()), QStringLiteral("-appID"), qApp->applicationName() }; - qCDebug(LOG_KNOTIFICATIONS) << "SnoreToast closing notification with ID:" << notification->id(); - - QProcess* snoretoastProcess = new QProcess(); - connect(snoretoastProcess, &QProcess::started, [this, notification]() { - qCDebug(LOG_KNOTIFICATIONS) << "Removed" << m_notifications.remove(notification->id()) << "notifications from m_notifications"; - }); + qCDebug(LOG_KNOTIFICATIONS) << "Closing notification; SnoreToast process arguments:" << snoretoastArgsList; + QProcess::startDetached(SnoreToastExecName(), snoretoastArgsList); - connect(snoretoastProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), snoretoastProcess, &QProcess::deleteLater); - snoretoastProcess->start(SnoreToastExecName(), snoretoastArgsList); + finish(notification); } void NotifyBySnore::update(KNotification *notification, KNotifyConfig *config) _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
