From bc992276b9a5898e1693bf1d62bd966a33d7c7ff Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Thu, 13 Nov 2014 15:41:28 +0000 Subject: [PATCH] Add upstream patch to fix a filtering bug in KMail. Despite what the patch's commit message says, this is actually a fix for https://bugs.kde.org/show_bug.cgi?id=340015, which is part of 4.14.3. It allows filtering based on the "List-Id" header to work again. --- deskutils/kdepim4/Makefile | 1 + ...atch-mailcommon__search__searchpattern.cpp | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 deskutils/kdepim4/files/patch-mailcommon__search__searchpattern.cpp diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index d9e1b9b76ebf..ec24daa27a99 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -3,6 +3,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} diff --git a/deskutils/kdepim4/files/patch-mailcommon__search__searchpattern.cpp b/deskutils/kdepim4/files/patch-mailcommon__search__searchpattern.cpp new file mode 100644 index 000000000000..fb804ef7ab69 --- /dev/null +++ b/deskutils/kdepim4/files/patch-mailcommon__search__searchpattern.cpp @@ -0,0 +1,27 @@ +commit 01764b0eb3c7b7407f3119ef711d5b07d7b9a313 +Author: Jean-Baptiste Mardelle +Date: Fri Oct 24 13:22:36 2014 +0200 + + Fix filtering of mailing-list based on "List-id". + BUG:339090 + FIXED-IN: 4.14.3 + CCBUG:339090 + +--- mailcommon/search/searchpattern.cpp ++++ mailcommon/search/searchpattern.cpp +@@ -672,7 +672,6 @@ SearchRule::RequiredPart SearchRuleString::requiredPart() const + kasciistricmp( f, "" ) == 0 || + kasciistricmp( f, "" ) == 0 || + kasciistricmp( f, "Subject" ) == 0 || +- kasciistricmp( f, "list-id" ) == 0 || + kasciistricmp( f, "from" ) == 0 || + kasciistricmp( f, "" )== 0) { + part = Envelope; +@@ -683,6 +682,7 @@ SearchRule::RequiredPart SearchRuleString::requiredPart() const + kasciistricmp( f, "cc" ) == 0 || + kasciistricmp( f, "bcc" ) == 0 || + kasciistricmp( f, "resent-from" ) == 0 || ++ kasciistricmp( f, "list-id" ) == 0 || + kasciistricmp( f, "x-loop" ) == 0 || + kasciistricmp( f, "x-mailing-list" ) == 0 || + kasciistricmp( f, "x-spam-flag" ) == 0 ||