Remove unused patches.

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

7 files changed, 7 insertions, 120 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 6fc7c2d6b16b..57cbe3f7eef1 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.323 2013/01/05 20:18:58 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.324 2013/01/08 12:18:24 kensington Exp $
+
+  08 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  -files/kmail-4.7.4-gcc44.patch, -files/kmail-4.8.3-qt47-compat.patch,
+  -files/kmail-4.8.4-sec.patch, -files/kmail-4.8.5-spamfilter-mail-loss.patch,
+  -files/kmail-4.9.0-gcc44.patch, -files/kmail-4.9.0-spamfilter-mail-loss.patch:
+  Remove unused patches.
 
 *kmail-4.9.5 (05 Jan 2013)
 
diff --git a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch b/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
deleted file mode 100644
index 363620292c70..000000000000
--- a/kde-base/kmail/files/kmail-4.7.4-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kmail-4.7.4.orig/messagecomposer/akonadisender.cpp kmail-4.7.4/messagecomposer/akonadisender.cpp
---- kmail-4.7.4.orig/messagecomposer/akonadisender.cpp	2011-12-02 00:25:40.000000000 +0100
-+++ kmail-4.7.4/messagecomposer/akonadisender.cpp	2011-12-30 23:10:05.151509937 +0100
-@@ -38,7 +38,6 @@
- #include <messagecore/stringutil.h>
- #include <messagecore/messagehelpers.h>
- 
--using namespace KMime;
- using namespace KMime::Types;
- using namespace KPIM;
- using namespace MailTransport;
diff --git a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch b/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
deleted file mode 100644
index a6c553260feb..000000000000
--- a/kde-base/kmail/files/kmail-4.8.3-qt47-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/messageviewer/viewer_p.cpp
-+++ b/messageviewer/viewer_p.cpp
-@@ -1930,8 +1930,10 @@ void ViewerPrivate::slotToggleHtmlMode()
- 
- void ViewerPrivate::slotFind()
- {
-+#if QT_VERSION >= 0x040800
-   if ( mViewer->hasSelection() )
-     mFindBar->setText( mViewer->selectedText() );
-+#endif  
-   mFindBar->show();
-   mFindBar->focusAndSetCursor();
- }
diff --git a/kde-base/kmail/files/kmail-4.8.4-sec.patch b/kde-base/kmail/files/kmail-4.8.4-sec.patch
deleted file mode 100644
index 0e1aa39a068c..000000000000
--- a/kde-base/kmail/files/kmail-4.8.4-sec.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dbb2f72f4745e00f53031965a9c10b2d6862bd54 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Mon, 2 Jul 2012 07:00:53 +0200
-Subject: [PATCH] Security fix found by David yesterday during debug (cherry
- picked from commit
- b6a46407d83ad9368a9825c687fa44e660f7104a)
-
----
- messageviewer/htmlquotecolorer.cpp |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/messageviewer/htmlquotecolorer.cpp b/messageviewer/htmlquotecolorer.cpp
-index b54e989..67c3062 100644
---- a/messageviewer/htmlquotecolorer.cpp
-+++ b/messageviewer/htmlquotecolorer.cpp
-@@ -40,6 +40,10 @@ QString HTMLQuoteColorer::process( const QString &htmlSource )
- #ifndef KDEPIM_NO_WEBKIT
-   // Create a DOM Document from the HTML source
-   QWebPage page(0);
-+  page.settings()->setAttribute( QWebSettings::JavascriptEnabled, false );
-+  page.settings()->setAttribute( QWebSettings::JavaEnabled, false );
-+  page.settings()->setAttribute( QWebSettings::PluginsEnabled, false );
-+
-   QWebFrame *frame = page.mainFrame();
-   frame->setHtml( htmlSource );
-   
--- 
-1.7.9.2
-
diff --git a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
deleted file mode 100644
index 5e9210ecb9a2..000000000000
--- a/kde-base/kmail/files/kmail-4.8.5-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 628faec2651f6f20a438f61fc9c861c0d5eab0f8
-Author: Andras Mantia <amantia@kde.org>
-Date:   Sat Aug 25 11:52:45 2012 +0300
-
-    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that needs a content.
-    
-    FIXED-IN: 4.8.6
-    
-    BUG: 295484
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 5f66e74..4e37ac7 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -111,6 +111,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
- 
-   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
-   if (m_filterManager->requiresFullMailBody()) {
-+    changeRecorder()->itemFetchScope().setCacheOnly(false);
-     changeRecorder()->itemFetchScope().fetchFullPayload();
-   } else {
-     changeRecorder()->itemFetchScope().fetchPayloadPart( Akonadi::MessagePart::Header, true );
diff --git a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch b/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
deleted file mode 100644
index 29e7115e1960..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-gcc44.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 92bface95453799620cd2368a7c0771c4304bbf3
-Author: David Faure <faure@kde.org>
-Date:   Thu Aug 9 11:58:30 2012 +0200
-
-    Fix compilation with gcc-4.4.7, a gentoo user reported this fixed the issue.
-    
-    (Message::Foo was ambiguous due to KMime::Message and namespace Message in
-    messagecomposer/util.h)
-
-diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
-index 92593f2..c4bcd86 100644
---- a/kmail/kmreaderwin.cpp
-+++ b/kmail/kmreaderwin.cpp
-@@ -45,7 +45,6 @@ using MessageViewer::CSSHelper;
- #include "stringutil.h"
- 
- #include <kmime/kmime_mdn.h>
--using namespace KMime;
- 
- #include "messageviewer/viewer.h"
- using namespace MessageViewer;
diff --git a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch b/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
deleted file mode 100644
index 9a2dc4b5b095..000000000000
--- a/kde-base/kmail/files/kmail-4.9.0-spamfilter-mail-loss.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit e98937475a7f03e69a3a3c6a4ee67a8d41f027b5
-Author: Andras Mantia <amantia@kde.org>
-Date:   Sat Aug 25 11:47:36 2012 +0300
-
-    Now fix for real the mail loss on spam filtering. The previous fix's idea was good, just that unfortunately the default value is "setCacheOnly(true)" set in AgentBasePrivate, so we have to explicitely set the cacheonly to false, otherwise mail content is not fetched from the mail server when passing through a filter that *needs* a content.
-    
-    FIXED-IN: 4.9.1
-    
-    BUG: 295484
-    (cherry picked from commit c691cb5d9cc7bb337c149e0279e21397f168c314)
-
-diff --git a/mailfilteragent/mailfilteragent.cpp b/mailfilteragent/mailfilteragent.cpp
-index 7220d90..75d6f05 100644
---- a/mailfilteragent/mailfilteragent.cpp
-+++ b/mailfilteragent/mailfilteragent.cpp
-@@ -117,6 +117,7 @@ void MailFilterAgent::initialCollectionFetchingDone( KJob *job )
-   Akonadi::CollectionFetchJob *fetchJob = qobject_cast<Akonadi::CollectionFetchJob*>( job );
- 
-   changeRecorder()->itemFetchScope().setAncestorRetrieval( Akonadi::ItemFetchScope::Parent );
-+  changeRecorder()->itemFetchScope().setCacheOnly(false);
-   mRequestedPart = m_filterManager->requiredPart();
-   if (mRequestedPart == MailCommon::SearchRule::CompleteMessage) {
-     changeRecorder()->itemFetchScope().fetchFullPayload();