Remove unused patch.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

2 files changed, 5 insertions, 58 deletions

diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index e21abdff4ab2..fd12801fda2e 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.157 2014/05/08 10:32:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.158 2014/05/08 20:50:18 johu Exp $
+
+  08 May 2014; Johannes Huber <johu@gentoo.org>
+  -files/kdepim-common-libs-4.11.2-gnupgattach.patch:
+  Remove unused patch.
 
   08 May 2014; Agostino Sarubbo <ago@gentoo.org>
   -kdepim-common-libs-4.11.5.ebuild:
diff --git a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch b/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch
deleted file mode 100644
index 3dce746a0d35..000000000000
--- a/kde-base/kdepim-common-libs/files/kdepim-common-libs-4.11.2-gnupgattach.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-commit bbbdbc2180036040cac2b66492e6f0fd01c2b28c
-Author: Sandro Knauß <mail@sandroknauss.de>
-Date:   Mon Oct 21 02:47:31 2013 +0200
-
-    Fix 286481 - Unable to open attachments in encrypted messages
-    
-    The node has to get a correct extra content and the filename must be
-    correctly point to the attachments inside the encrypted message.
-    
-    BUG: 286481
-    BUG: 300937
-    FIXED-IN: 4.11.3
-    REVIEW: 113361
-
-diff --git a/messageviewer/viewer/nodehelper.cpp b/messageviewer/viewer/nodehelper.cpp
-index 311f655..8c8ff79 100644
---- a/messageviewer/viewer/nodehelper.cpp
-+++ b/messageviewer/viewer/nodehelper.cpp
-@@ -223,7 +223,7 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node)
-     return existingFileName.toLocalFile();
-   }
- 
--  QString fname = createTempDir( node->index().toString() );
-+  QString fname = createTempDir( persistentIndex( node ) );
-   if ( fname.isEmpty() )
-     return QString();
- 
-@@ -237,7 +237,6 @@ QString NodeHelper::writeNodeToTempFile(KMime::Content* node)
-   fname += '/' + fileName;
- 
-   //kDebug() << "Create temp file: " << fname;
--
-   QByteArray data = node->decodedContent();
-   if ( node->contentType()->isText() && data.size() > 0 ) {
-     // convert CRLF to LF before writing text attachments to disk
-@@ -260,7 +259,7 @@ KUrl NodeHelper::tempFileUrlFromNode( const KMime::Content *node )
-   if (!node)
-     return KUrl();
- 
--  const QString index = node->index().toString();
-+  const QString index = persistentIndex( node );
- 
-   foreach ( const QString &path, mAttachmentFilesDir->temporaryFiles() ) {
-     int right = path.lastIndexOf( '/' );
-diff --git a/messageviewer/viewer/objecttreeparser.cpp b/messageviewer/viewer/objecttreeparser.cpp
-index cde17da..369ad95 100644
---- a/messageviewer/viewer/objecttreeparser.cpp
-+++ b/messageviewer/viewer/objecttreeparser.cpp
-@@ -803,7 +803,7 @@ bool ObjectTreeParser::writeOpaqueOrMultipartSignedData( KMime::Content* data,
-       bIsOpaqueSigned = true;
- 
-       CryptoProtocolSaver cpws( this, cryptProto );
--      createAndParseTempNode( data, doCheck ? cleartext.data() : cleartextData->data(),
-+      createAndParseTempNode( &sign, doCheck ? cleartext.data() : cleartextData->data(),
-                               "opaque signed data" );
- 
-       if ( htmlWriter() )