Your message dated Sat, 08 May 2021 19:25:34 +0000
with message-id <e1lfszy-0007sf...@respighi.debian.org>
and subject line unblock kf5-messagelib
has caused the Debian Bug report #988235,
regarding unblock: kf5-messagelib/4:20.08.3-4
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
988235: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988235
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pkg-kde-t...@alioth-lists.debian.net
Please unblock package kf5-messagelib
#986404 (KeyResolver-Enable-ContactPreferences-again.patch):
When using encryption you also want to be able to save and reuse
contact preferences, to hanble case where a GPG Key does not match
with the email address of a recipient. This patch was applied at
upstream in Feburary without any issue.
[ Impact ]
For users it is frustrating not to be able to save contact
preferences and also rises the barrier to use encryption.
[ Tests ]
The patch exist for more than 30 days in unstable without any bad
expierence also not bad response form upstream. Run kmail in daily
life.
[ Risks ]
The patch is easy and no other packes are affected by this.
The alternative is to do the selection of keys every time you write an
email, what is annoying.
#964963 (mail-thread-ignored-and-mail-thread-watched-exist-in.patch):
Fixing two not shown icons.
[ Impact ]
Two missing icons.
[ Tests ]
see above.
[ Risks ]
Patch is trival and no other packages are affected.
#986452:
Fixing just a packaging failure, that happend because I was not
focused. This fixes the debdiff to what I wanted to commit.
[ Checklist ]
[ x ] all changes are documented in the d/changelog
[ x ] I reviewed all changes and I approve them
[ x ] attach debdiff against the package in testing
[ Other info ]
(Anything else the release team should know.)
unblock kf5-messagelib/4:20.08.3-4
diff -Nru kf5-messagelib-20.08.3/debian/changelog
kf5-messagelib-20.08.3/debian/changelog
--- kf5-messagelib-20.08.3/debian/changelog 2021-02-01 20:34:19.000000000
+0100
+++ kf5-messagelib-20.08.3/debian/changelog 2021-04-06 16:22:38.000000000
+0200
@@ -1,3 +1,17 @@
+kf5-messagelib (4:20.08.3-4) unstable; urgency=medium
+
+ * Fix broken patch series file (Closes: #986452).
+
+ -- Sandro Knauß <he...@debian.org> Tue, 06 Apr 2021 16:22:38 +0200
+
+kf5-messagelib (4:20.08.3-3) unstable; urgency=medium
+
+ * Add upstream patch to show correct icons (Closes: #964963).
+ * Add upstream patch to reenable contact preferences again
+ (Closes: #986404).
+
+ -- Sandro Knauß <he...@debian.org> Mon, 05 Apr 2021 13:06:12 +0200
+
kf5-messagelib (4:20.08.3-2) unstable; urgency=medium
* Add upstream patch to not break the signature of mails.
diff -Nru
kf5-messagelib-20.08.3/debian/patches/KeyResolver-Enable-ContactPreferences-again.patch
kf5-messagelib-20.08.3/debian/patches/KeyResolver-Enable-ContactPreferences-again.patch
---
kf5-messagelib-20.08.3/debian/patches/KeyResolver-Enable-ContactPreferences-again.patch
1970-01-01 01:00:00.000000000 +0100
+++
kf5-messagelib-20.08.3/debian/patches/KeyResolver-Enable-ContactPreferences-again.patch
2021-04-05 12:39:55.000000000 +0200
@@ -0,0 +1,38 @@
+From a347940b23b438da02aa5437baa8d2a70184b4ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <skna...@kde.org>
+Date: Thu, 4 Feb 2021 23:23:30 +0100
+Subject: [PATCH 3/3] KeyResolver: Enable ContactPreferences again.
+
+It was disabled in 2018, but without any further notice. The code itself
+does not seems like it can lock.
+
+CCMAIL: mon...@kde.org
+
+This reverts commit 409e75042323d5fa104c864b155081ed8e94bcbe.
+
+(cherry picked from commit 9285ece174b41beb4ea00744cc702329e05520dd)
+---
+ messagecomposer/src/composer/keyresolver.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/messagecomposer/src/composer/keyresolver.cpp
++++ b/messagecomposer/src/composer/keyresolver.cpp
+@@ -1887,7 +1887,6 @@ void Kleo::KeyResolver::addKeys(const st
+
+ Kleo::KeyResolver::ContactPreferences
Kleo::KeyResolver::lookupContactPreferences(const QString &address) const
+ {
+-#ifdef HAVE_A_FIX_FOR_LOCK
+ const Private::ContactPreferencesMap::iterator it
+ = d->mContactPreferencesMap.find(address);
+ if (it != d->mContactPreferencesMap.end()) {
+@@ -1923,10 +1922,6 @@ Kleo::KeyResolver::ContactPreferences Kl
+ // insert into map and grab resulting iterator
+ d->mContactPreferencesMap.insert(std::make_pair(address, pref));
+ return pref;
+-#else
+- Q_UNUSED(address)
+- return ContactPreferences();
+-#endif
+ }
+
+ void Kleo::KeyResolver::saveContactPreference(const QString &email, const
ContactPreferences &pref) const
diff -Nru
kf5-messagelib-20.08.3/debian/patches/mail-thread-ignored-and-mail-thread-watched-exist-in.patch
kf5-messagelib-20.08.3/debian/patches/mail-thread-ignored-and-mail-thread-watched-exist-in.patch
---
kf5-messagelib-20.08.3/debian/patches/mail-thread-ignored-and-mail-thread-watched-exist-in.patch
1970-01-01 01:00:00.000000000 +0100
+++
kf5-messagelib-20.08.3/debian/patches/mail-thread-ignored-and-mail-thread-watched-exist-in.patch
2021-04-05 12:29:53.000000000 +0200
@@ -0,0 +1,50 @@
+From f96638fe15b6073838f561d37183832e0548f179 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <skna...@kde.org>
+Date: Wed, 3 Feb 2021 23:39:21 +0100
+Subject: [PATCH 1/3] mail-thread-ignored and mail-thread-watched exist in
+ breeze-icons.
+
+Just update the paths, so icons are found.
+
+(cherry picked from commit 4d472ca06c6448ae029a91f63266242dd316d745)
+---
+ messagelist/src/core/theme.cpp | 4 ++--
+ messagelist/src/core/widgets/searchlinestatus.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/messagelist/src/core/theme.cpp b/messagelist/src/core/theme.cpp
+index d3226d31e..2ada7e596 100644
+--- a/messagelist/src/core/theme.cpp
++++ b/messagelist/src/core/theme.cpp
+@@ -1255,8 +1255,8 @@ void Theme::populatePixmapCache() const
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-sent")).pixmap(mIconSize,
mIconSize))
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-forwarded")).pixmap(mIconSize,
mIconSize))
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-mark-important")).pixmap(mIconSize,
mIconSize)) // "flag"
+- << new
QPixmap(QIcon::fromTheme(QStringLiteral("messagelist/pics/mail-thread-watch.png")).pixmap(mIconSize,
mIconSize))
+- << new
QPixmap(QIcon::fromTheme(QStringLiteral("messagelist/pics/mail-thread-ignored.png")).pixmap(mIconSize,
mIconSize))
++ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-thread-watch")).pixmap(mIconSize,
mIconSize))
++ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-thread-ignored")).pixmap(mIconSize,
mIconSize))
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-mark-junk")).pixmap(mIconSize,
mIconSize))
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-mark-notjunk")).pixmap(mIconSize,
mIconSize))
+ << new
QPixmap(QIcon::fromTheme(QStringLiteral("mail-signed-verified")).pixmap(mIconSize,
mIconSize))
+diff --git a/messagelist/src/core/widgets/searchlinestatus.cpp
b/messagelist/src/core/widgets/searchlinestatus.cpp
+index 6c4c49df3..3e204c924 100644
+--- a/messagelist/src/core/widgets/searchlinestatus.cpp
++++ b/messagelist/src/core/widgets/searchlinestatus.cpp
+@@ -206,11 +206,11 @@ void SearchLineStatus::createMenuSearch()
+ i18nc("@action:inmenu Status of a message", "Action
Item"),
+ Akonadi::MessageStatus::statusToAct().toQInt32());
+
+-
createFilterAction(QIcon::fromTheme(QStringLiteral("mail-thread-watch.png")),
++ createFilterAction(QIcon::fromTheme(QStringLiteral("mail-thread-watch")),
+ i18nc("@action:inmenu Status of a message", "Watched"),
+ Akonadi::MessageStatus::statusWatched().toQInt32());
+
+-
createFilterAction(QIcon::fromTheme(QStringLiteral("mail-thread-ignored.png")),
++
createFilterAction(QIcon::fromTheme(QStringLiteral("mail-thread-ignored")),
+ i18nc("@action:inmenu Status of a message", "Ignored"),
+ Akonadi::MessageStatus::statusIgnored().toQInt32());
+
+--
+2.31.0
+
diff -Nru kf5-messagelib-20.08.3/debian/patches/series
kf5-messagelib-20.08.3/debian/patches/series
--- kf5-messagelib-20.08.3/debian/patches/series 2021-02-01
20:26:55.000000000 +0100
+++ kf5-messagelib-20.08.3/debian/patches/series 2021-04-06
16:11:15.000000000 +0200
@@ -2,3 +2,5 @@
upstream-FIX-messagecomposer-cryptocomposertests-Use-EncryptJ.patch
Fix-messagecomposer-Do-copy-all-mail-headers-instad-.patch
messagecomposer-Move-protected-headers-to-signed-par.patch
+mail-thread-ignored-and-mail-thread-watched-exist-in.patch
+KeyResolver-Enable-ContactPreferences-again.patch
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
