Hello community, here is the log from the commit of package kmail for openSUSE:Factory checked in at 2017-10-23 16:31:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmail (Old) and /work/SRC/openSUSE:Factory/.kmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmail" Mon Oct 23 16:31:12 2017 rev:13 rq:534739 version:17.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kmail/kmail.changes 2017-10-01 17:00:30.277766194 +0200 +++ /work/SRC/openSUSE:Factory/.kmail.new/kmail.changes 2017-10-23 16:31:15.014583677 +0200 @@ -1,0 +2,19 @@ +Tue Oct 17 00:32:19 CEST 2017 - [email protected] + +- Update to 17.08.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.2.php +- Changes since 17.08.1: + * Add kconf_update script to adapt to .desktop name change in 17.08 + * Remove element not index. Now progress dialog is closed when we indexed all collections + * Don't eat each key event + * Update title when we switch folder. + +------------------------------------------------------------------- +Tue Oct 10 09:23:53 UTC 2017 - [email protected] + +- Add use-icon-filename-for-systray-icon.patch to use the desktop + theme's new mail icon in the system tray (boo#1055079, kde#354820) + +------------------------------------------------------------------- Old: ---- kmail-17.08.1.tar.xz New: ---- kmail-17.08.2.tar.xz use-icon-filename-for-systray-icon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmail.spec ++++++ --- /var/tmp/diff_new_pack.0z6J8h/_old 2017-10-23 16:31:15.974538735 +0200 +++ /var/tmp/diff_new_pack.0z6J8h/_new 2017-10-23 16:31:15.978538548 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kmail -Version: 17.08.1 +Version: 17.08.2 Release: 0 %define kf5_version 5.35.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -31,6 +31,8 @@ Group: Productivity/Networking/Email/Clients Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch: use-icon-filename-for-systray-icon.patch BuildRequires: extra-cmake-modules >= %{kf5_version} BuildRequires: gettext-devel BuildRequires: libgpgmepp-devel @@ -143,6 +145,7 @@ %prep %setup -q +%patch -p1 %build %cmake_kf5 -d build ++++++ kmail-17.08.1.tar.xz -> kmail-17.08.2.tar.xz ++++++ ++++ 59990 lines of diff (skipped) ++++++ use-icon-filename-for-systray-icon.patch ++++++ >From 07a3e9aecc5e79cffa8635f5f55c16b2e5064afe Mon Sep 17 00:00:00 2001 From: Martin Koller <[email protected]> Date: Tue, 10 Oct 2017 07:31:40 +0200 Subject: use icon filename for systray icon instead of sending pixmap over D-Bus Differential Revision: https://phabricator.kde.org/D8226 --- src/kmsystemtray.cpp | 5 ++--- src/kmsystemtray.h | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/kmsystemtray.cpp b/src/kmsystemtray.cpp index 548d179..4e121cb 100644 --- a/src/kmsystemtray.cpp +++ b/src/kmsystemtray.cpp @@ -58,7 +58,6 @@ using namespace KMail; KMSystemTray::KMSystemTray(QObject *parent) : KStatusNotifierItem(parent) - , mIcon(QIcon::fromTheme(QStringLiteral("mail-mark-unread-new"))) , mDesktopOfMainWin(0) , mCount(0) , mIconNotificationsEnabled(true) @@ -148,7 +147,7 @@ void KMSystemTray::slotGeneralFontChanged() /** * Update the count of unread messages. If there are unread messages, - * overlay the count on top of a transparent version of the KMail icon. + * show the "unread new mail" KMail icon. * If there is no unread mail, restore the normal KMail icon. */ void KMSystemTray::updateCount() @@ -156,7 +155,7 @@ void KMSystemTray::updateCount() if (mCount == 0) { setIconByName(QStringLiteral("kmail")); } else { - setIconByPixmap(mIcon); + setIconByName(QStringLiteral("mail-mark-unread-new")); } } diff --git a/src/kmsystemtray.h b/src/kmsystemtray.h index 75c43cb..e5af63f 100644 --- a/src/kmsystemtray.h +++ b/src/kmsystemtray.h @@ -19,7 +19,6 @@ #define KMSYSTEMTRAY_H #include <AkonadiCore/collection.h> -#include <qicon.h> #include <kstatusnotifieritem.h> #include <QAction> @@ -71,7 +70,6 @@ private: bool ignoreNewMailInFolder(const Akonadi::Collection &collection); private: - QIcon mIcon; int mDesktopOfMainWin; int mCount; -- cgit v0.11.2
