From 8d1a7dacfe7827f05e37112a2221452c42a824af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 27 Jan 2007 18:12:25 +0000 Subject: [PATCH] Add two patches to fix serious issues coming from upstream. Remove stale patches. Package-Manager: portage-2.1.2-r4 --- kde-base/kmail/ChangeLog | 12 +- kde-base/kmail/Manifest | 45 ++- kde-base/kmail/files/digest-kmail-3.5.6-r1 | 3 + .../kmail/files/kdepim-3.4.2-partnode.patch | 20 -- .../files/kmail-3.4.1-shift+click-crash.diff | 10 - .../kmail/files/kmail-3.5.2-imap-fixes.diff | 291 ------------------ .../files/kmail-3.5.6-kde-bug-140660.patch | 19 ++ .../kmail/files/kmail-3.5.6-templates.patch | 20 ++ kde-base/kmail/kmail-3.5.6-r1.ebuild | 62 ++++ 9 files changed, 144 insertions(+), 338 deletions(-) create mode 100644 kde-base/kmail/files/digest-kmail-3.5.6-r1 delete mode 100644 kde-base/kmail/files/kdepim-3.4.2-partnode.patch delete mode 100644 kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff delete mode 100644 kde-base/kmail/files/kmail-3.5.2-imap-fixes.diff create mode 100644 kde-base/kmail/files/kmail-3.5.6-kde-bug-140660.patch create mode 100644 kde-base/kmail/files/kmail-3.5.6-templates.patch create mode 100644 kde-base/kmail/kmail-3.5.6-r1.ebuild diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 4a1ee9c877e3..b5581599b1e9 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.96 2007/01/18 00:09:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.97 2007/01/27 18:12:25 flameeyes Exp $ + +*kmail-3.5.6-r1 (27 Jan 2007) + + 27 Jan 2007; Diego Pettenò + -files/kmail-3.4.1-shift+click-crash.diff, + -files/kdepim-3.4.2-partnode.patch, -files/kmail-3.5.2-imap-fixes.diff, + +files/kmail-3.5.6-kde-bug-140660.patch, + +files/kmail-3.5.6-templates.patch, +kmail-3.5.6-r1.ebuild: + Add two patches to fix serious issues coming from upstream. Remove stale + patches. 18 Jan 2007; Carsten Lohrke kmail-3.5.6.ebuild: Update minimal needed versions. diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest index af86b0151521..dace1e3ec1a6 100644 --- a/kde-base/kmail/Manifest +++ b/kde-base/kmail/Manifest @@ -1,11 +1,6 @@ -AUX kdepim-3.4.2-partnode.patch 756 RMD160 c935bb7e350b7e52287c069724b84969a15a1af1 SHA1 ff7cdbc224b215061934477b1da00e39b2532fb6 SHA256 e3681f4ff94ae2b0f82e953c73f82ed09de684a35a49a622bc1848e3e979c888 -MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756 -RMD160 c935bb7e350b7e52287c069724b84969a15a1af1 files/kdepim-3.4.2-partnode.patch 756 -SHA256 e3681f4ff94ae2b0f82e953c73f82ed09de684a35a49a622bc1848e3e979c888 files/kdepim-3.4.2-partnode.patch 756 -AUX kmail-3.4.1-shift+click-crash.diff 516 RMD160 408c39b32458061c0634ea577538e708d5db6282 SHA1 0328b0727ff71c2814d410dc3c477290990470d1 SHA256 a3edde6599f93c2f018ffec1747d43f2a096edb11ad67702e3cdf69c9d32cac7 -MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516 -RMD160 408c39b32458061c0634ea577538e708d5db6282 files/kmail-3.4.1-shift+click-crash.diff 516 -SHA256 a3edde6599f93c2f018ffec1747d43f2a096edb11ad67702e3cdf69c9d32cac7 files/kmail-3.4.1-shift+click-crash.diff 516 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kmail-3.5-ham_spam_icons.diff 2557 RMD160 dbed63abe0ffe64771362913e7f3d05182d6ae6c SHA1 803f3662dd8436410b6f4bc6fb206e057ca6a9ba SHA256 500a231a1d4b6ac2a4284a067842c44a586435a4edcadec85099d1b1cf0442d1 MD5 eba73836fe71e337b9f5626f7cd85952 files/kmail-3.5-ham_spam_icons.diff 2557 RMD160 dbed63abe0ffe64771362913e7f3d05182d6ae6c files/kmail-3.5-ham_spam_icons.diff 2557 @@ -14,10 +9,6 @@ AUX kmail-3.5.2-imap-fixes-2.diff 16328 RMD160 566fc5fe60ac2bb2214a648537a01f496 MD5 58c96168ba8c9698166ff2e425ab41b2 files/kmail-3.5.2-imap-fixes-2.diff 16328 RMD160 566fc5fe60ac2bb2214a648537a01f496c2f8e5a files/kmail-3.5.2-imap-fixes-2.diff 16328 SHA256 bfdf27d9aae396a4d2fc5b73964cc322e6c7f0a851f132902929d0faf925041b files/kmail-3.5.2-imap-fixes-2.diff 16328 -AUX kmail-3.5.2-imap-fixes.diff 10354 RMD160 0a7afc059fb2b9c8ac77d4037816fb71a6811c62 SHA1 48203695f19104dd88d91e8f7ff6f6ef2f4d834d SHA256 25b68fcdf92004d122ebd184e9e7f19b2f70bd520a57aba82474e283adc4edef -MD5 483c5af80c9c3a1588203a44e55e9570 files/kmail-3.5.2-imap-fixes.diff 10354 -RMD160 0a7afc059fb2b9c8ac77d4037816fb71a6811c62 files/kmail-3.5.2-imap-fixes.diff 10354 -SHA256 25b68fcdf92004d122ebd184e9e7f19b2f70bd520a57aba82474e283adc4edef files/kmail-3.5.2-imap-fixes.diff 10354 AUX kmail-3.5.2-misc-fixes-2.diff 13036 RMD160 8b193b7892b6ba4f30e35e16ff783600c5feeae0 SHA1 b44a32bd39ab74c0716a2fe777b67d4a099da8ec SHA256 69f4fbff3eee6a2a8f7028b782430b6863c5cbd7ca5087460bd98d80c45e7ab2 MD5 e752e166fd636a23e5e89559f2f99d57 files/kmail-3.5.2-misc-fixes-2.diff 13036 RMD160 8b193b7892b6ba4f30e35e16ff783600c5feeae0 files/kmail-3.5.2-misc-fixes-2.diff 13036 @@ -30,6 +21,14 @@ AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414 MD5 970d8db800a3bb39be0c7f4a41c35e06 files/kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da files/kmail-3.5.5-dimap-mail-loss.patch 9870 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636 files/kmail-3.5.5-dimap-mail-loss.patch 9870 +AUX kmail-3.5.6-kde-bug-140660.patch 577 RMD160 ffc625a1561d5e2134cc4130887cbb7455e9d076 SHA1 e97ad7fdd1f521de3c59f722bdb2496ed533cc89 SHA256 f0c57fe9ab07ed0cbeffa1a83ede5f2defa99c8299265eb43f66c97a6daa7311 +MD5 3219e7c98742a8c7a36f1194d501b022 files/kmail-3.5.6-kde-bug-140660.patch 577 +RMD160 ffc625a1561d5e2134cc4130887cbb7455e9d076 files/kmail-3.5.6-kde-bug-140660.patch 577 +SHA256 f0c57fe9ab07ed0cbeffa1a83ede5f2defa99c8299265eb43f66c97a6daa7311 files/kmail-3.5.6-kde-bug-140660.patch 577 +AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 SHA1 596bfe6028db4d0f54d7f88d31f461a28c64a778 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe +MD5 2921dd25ca635bd565a8e2e9ae8745d4 files/kmail-3.5.6-templates.patch 875 +RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 files/kmail-3.5.6-templates.patch 875 +SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe files/kmail-3.5.6-templates.patch 875 DIST kdepim-3.5.2.tar.bz2 12887336 RMD160 8e6571d14bbf6b3370c4fdb108a1a79625e87365 SHA1 1907bc219d2dd51a376a99d0f7e6b9af97d5adf7 SHA256 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539 DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 DIST kdepim-3.5.6.tar.bz2 13643798 RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb SHA1 a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 @@ -41,14 +40,18 @@ EBUILD kmail-3.5.5-r1.ebuild 2003 RMD160 a4daaa3fad9f4cf5650f23bf44d3da1bb7f6e4c MD5 66731ffaf5ebe0eaee64afffec1c1d2c kmail-3.5.5-r1.ebuild 2003 RMD160 a4daaa3fad9f4cf5650f23bf44d3da1bb7f6e4ca kmail-3.5.5-r1.ebuild 2003 SHA256 e4648984921799ef51d480ee908d1ae20ef40f90a4ab1e009d8745cd19a56d3d kmail-3.5.5-r1.ebuild 2003 +EBUILD kmail-3.5.6-r1.ebuild 2056 RMD160 a1be27d4b93d3b9759678d25c79facac49310406 SHA1 6913cd47a1d00113facd34f4fff737ce5bd78d53 SHA256 55d47282a649316c34b54b2063201f9c37a816285744576da3c7188bcbafae5d +MD5 cdc3b46b8e09e32d9d5c3190616459f8 kmail-3.5.6-r1.ebuild 2056 +RMD160 a1be27d4b93d3b9759678d25c79facac49310406 kmail-3.5.6-r1.ebuild 2056 +SHA256 55d47282a649316c34b54b2063201f9c37a816285744576da3c7188bcbafae5d kmail-3.5.6-r1.ebuild 2056 EBUILD kmail-3.5.6.ebuild 1952 RMD160 fff2b69c166462112a7771543ddaf15327ec8155 SHA1 32d22a34bae87d4ef9943016bbe3e3a33d1e5e52 SHA256 2571ac6e7e3fabcb85a1c623ba4e3328727b54cd12d28c30b2802e0002c99103 MD5 86a70734881b7626be5402ea44991dfe kmail-3.5.6.ebuild 1952 RMD160 fff2b69c166462112a7771543ddaf15327ec8155 kmail-3.5.6.ebuild 1952 SHA256 2571ac6e7e3fabcb85a1c623ba4e3328727b54cd12d28c30b2802e0002c99103 kmail-3.5.6.ebuild 1952 -MISC ChangeLog 12868 RMD160 8b8773d565f4e8bbf2bbe3028ab3cbd1dc6fa2c4 SHA1 25f1d7c301b7a7218b9adc92ebe49825fce58b49 SHA256 c94080f6c8ad6daf079bcb43e8aa9fca1e33391e75b6af80c5ea7f75f6eecd4f -MD5 602389cdc28f71b5485249d27865eba2 ChangeLog 12868 -RMD160 8b8773d565f4e8bbf2bbe3028ab3cbd1dc6fa2c4 ChangeLog 12868 -SHA256 c94080f6c8ad6daf079bcb43e8aa9fca1e33391e75b6af80c5ea7f75f6eecd4f ChangeLog 12868 +MISC ChangeLog 13267 RMD160 c3cc9141c76200d0488213970d35a12bc0c33af9 SHA1 8636649c2afc32ca9b4bbdc55278f516b08cac71 SHA256 d4dbd41fcebcc9d6c756619e2a576401e30a82df30f02e54ee544124da2e1075 +MD5 5fed9fd006d89d0b185ea42fb8f34892 ChangeLog 13267 +RMD160 c3cc9141c76200d0488213970d35a12bc0c33af9 ChangeLog 13267 +SHA256 d4dbd41fcebcc9d6c756619e2a576401e30a82df30f02e54ee544124da2e1075 ChangeLog 13267 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -62,3 +65,13 @@ SHA256 79f3b37a9c00197e5c3d06173ef9526420d44109e12c7b0e69e1b3e5efce6daf files/di MD5 6ac4692a541313065650af3440af9b13 files/digest-kmail-3.5.6 247 RMD160 49c4a076540b9741e20b46db58bae9e823591569 files/digest-kmail-3.5.6 247 SHA256 b49ff16e93bead7c5c584b17baa06f51b5bd735636b3ca58e3ed733104c15227 files/digest-kmail-3.5.6 247 +MD5 6ac4692a541313065650af3440af9b13 files/digest-kmail-3.5.6-r1 247 +RMD160 49c4a076540b9741e20b46db58bae9e823591569 files/digest-kmail-3.5.6-r1 247 +SHA256 b49ff16e93bead7c5c584b17baa06f51b5bd735636b3ca58e3ed733104c15227 files/digest-kmail-3.5.6-r1 247 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.1 (GNU/Linux) + +iD8DBQFFu5YRAiZjviIA2XgRAqLmAJ4mswzrTl/bXSq1z8aqqUiW4U8h7QCeLsn+ +8XPggul6CzlTdHXzRUqo27Q= +=Pits +-----END PGP SIGNATURE----- diff --git a/kde-base/kmail/files/digest-kmail-3.5.6-r1 b/kde-base/kmail/files/digest-kmail-3.5.6-r1 new file mode 100644 index 000000000000..e3fe7ffb0da4 --- /dev/null +++ b/kde-base/kmail/files/digest-kmail-3.5.6-r1 @@ -0,0 +1,3 @@ +MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798 +RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798 +SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798 diff --git a/kde-base/kmail/files/kdepim-3.4.2-partnode.patch b/kde-base/kmail/files/kdepim-3.4.2-partnode.patch deleted file mode 100644 index 98e55197db06..000000000000 --- a/kde-base/kmail/files/kdepim-3.4.2-partnode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur kdepim-3.4.2.orig/kmail/partNode.cpp kdepim-3.4.2/kmail/partNode.cpp ---- kdepim-3.4.2.orig/kmail/partNode.cpp 2005-05-23 14:11:54.000000000 +0200 -+++ kdepim-3.4.2/kmail/partNode.cpp 2005-08-02 12:05:32.000000000 +0200 -@@ -36,6 +36,7 @@ - #include "kmmimeparttree.h" - #include - #include -+#include - - /* - =========================================================================== -@@ -414,7 +415,7 @@ - partNode* partNode::findNodeForDwPart( DwBodyPart* part ) - { - partNode* found = 0; -- if( dwPart()->partId() == part->partId() ) -+ if( kasciistricmp( dwPart()->partId(), part->partId() ) == 0 ) - return this; - if( mChild ) - found = mChild->findNodeForDwPart( part ); diff --git a/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff b/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff deleted file mode 100644 index caae8a4e5fa5..000000000000 --- a/kde-base/kmail/files/kmail-3.4.1-shift+click-crash.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- kmail/kmreaderwin.cpp.orig 2005-07-01 01:26:44.000000000 +0200 -+++ kmail/kmreaderwin.cpp 2005-07-01 01:28:17.000000000 +0200 -@@ -2378,6 +2378,7 @@ - if ( me->button() == LeftButton && ( me->state() & ShiftButton ) ) { - // special processing for shift+click - mAtmCurrent = msgPartFromUrl( mUrlClicked ); -+ if ( mAtmCurrent < 0 ) return false; - mAtmCurrentName = mUrlClicked.path(); - slotHandleAttachment( KMHandleAttachmentCommand::Save ); // save - return true; // eat event diff --git a/kde-base/kmail/files/kmail-3.5.2-imap-fixes.diff b/kde-base/kmail/files/kmail-3.5.2-imap-fixes.diff deleted file mode 100644 index 0987d2692626..000000000000 --- a/kde-base/kmail/files/kmail-3.5.2-imap-fixes.diff +++ /dev/null @@ -1,291 +0,0 @@ ---- kdepim/kmail/kmheaders.cpp 2006/03/02 12:26:51 515022 -+++ kdepim/kmail/kmheaders.cpp 2006/04/22 08:13:05 532593 -@@ -1841,7 +1841,7 @@ - bool foundUnreadMessage = false; - - if (!mFolder) return -1; -- if (!(mFolder->count()) > 0) return -1; -+ if (mFolder->count() <= 0) return -1; - - if ((aStartAt >= 0) && (aStartAt < (int)mItems.size())) - item = mItems[aStartAt]; -@@ -2041,7 +2041,7 @@ - - int idx = item->msgId(); - KMMessage *msg = mFolder->getMsg(idx); -- if (!msg->transferInProgress()) -+ if (msg && !msg->transferInProgress()) - { - emit activated(mFolder->getMsg(idx)); - } -@@ -3280,7 +3280,8 @@ - unlink(QFile::encodeName(sortFile)); - kdWarning(5006) << "Error: Failure modifying " << sortFile << " (No space left on device?)" << endl; - kdWarning(5006) << __FILE__ << ":" << __LINE__ << endl; -- //kmkernel->emergencyExit( i18n("Failure modifying %1\n(No space left on device?)").arg( sortFile )); -+ -+ return true; - } - if(sortStream) - fclose(sortStream); ---- kdepim/kmail/imapaccountbase.cpp 2006/02/23 14:32:38 512746 -+++ kdepim/kmail/imapaccountbase.cpp 2006/04/15 13:05:11 530119 -@@ -1098,10 +1098,10 @@ - { - DwBodyPart* newparent = dwpart; - const DwMessage* newmsg = dwmsg; -- if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && -+ if ( part->originalContentTypeStr() == "MESSAGE/RFC822" && dwpart && - dwpart->Body().Message() ) - { -- // set the encapsulated message as new parent message -+ // set the encapsulated message as the new message - newparent = 0; - newmsg = dwpart->Body().Message(); - } -@@ -1281,7 +1281,8 @@ - if ( delim.isEmpty() ) { - delim = "/"; - } -- if ( !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) { -+ if ( !newName.isEmpty() && -+ !newName.endsWith( delim ) && !folderName.startsWith( delim ) ) { - newName = newName + delim; - } - newName = newName + folderName; ---- kdepim/kmail/imapjob.cpp 2005/08/12 17:17:32 446148 -+++ kdepim/kmail/imapjob.cpp 2006/04/15 09:06:10 530060 -@@ -97,11 +97,12 @@ - // imap folder, use its account for keeping track of the job. Otherwise, - // this is a get job and the src folder is an imap one. Use its account - // then. -- KMAcctImap *account; -+ KMAcctImap *account = 0; - if (folder) { - account = folder->account(); - } else { -- account = static_cast(msg_parent->storage())->account(); -+ if ( msg_parent && msg_parent->storage() ) -+ account = static_cast(msg_parent->storage())->account(); - } - if ( !account || - account->makeConnection() == ImapAccountBase::Error ) { -@@ -223,21 +224,23 @@ - if ( mDestFolder ) - { - KMAcctImap *account = static_cast(mDestFolder->storage())->account(); -- if ( account && mJob ) { -- ImapAccountBase::JobIterator it = account->findJob( mJob ); -- if ( it != account->jobsEnd() ) { -- if( (*it).progressItem ) { -- (*it).progressItem->setComplete(); -- (*it).progressItem = 0; -- } -- if ( !(*it).msgList.isEmpty() ) { -- for ( QPtrListIterator mit( (*it).msgList ); mit.current(); ++mit ) -- mit.current()->setTransferInProgress( false ); -+ if ( account ) { -+ if ( mJob ) { -+ ImapAccountBase::JobIterator it = account->findJob( mJob ); -+ if ( it != account->jobsEnd() ) { -+ if( (*it).progressItem ) { -+ (*it).progressItem->setComplete(); -+ (*it).progressItem = 0; -+ } -+ if ( !(*it).msgList.isEmpty() ) { -+ for ( QPtrListIterator mit( (*it).msgList ); mit.current(); ++mit ) -+ mit.current()->setTransferInProgress( false ); -+ } - } -+ account->removeJob( mJob ); - } -- account->removeJob( mJob ); -+ account->mJobList.remove( this ); - } -- account->mJobList.remove( this ); - mDestFolder->close(); - } - -@@ -245,21 +248,23 @@ - if (!mDestFolder || mDestFolder != mSrcFolder) { - if (! (mSrcFolder->folderType() == KMFolderTypeImap) ) return; - KMAcctImap *account = static_cast(mSrcFolder->storage())->account(); -- if ( account && mJob ) { -- ImapAccountBase::JobIterator it = account->findJob( mJob ); -- if ( it != account->jobsEnd() ) { -- if( (*it).progressItem ) { -- (*it).progressItem->setComplete(); -- (*it).progressItem = 0; -- } -- if ( !(*it).msgList.isEmpty() ) { -- for ( QPtrListIterator mit( (*it).msgList ); mit.current(); ++mit ) -- mit.current()->setTransferInProgress( false ); -+ if ( account ) { -+ if ( mJob ) { -+ ImapAccountBase::JobIterator it = account->findJob( mJob ); -+ if ( it != account->jobsEnd() ) { -+ if( (*it).progressItem ) { -+ (*it).progressItem->setComplete(); -+ (*it).progressItem = 0; -+ } -+ if ( !(*it).msgList.isEmpty() ) { -+ for ( QPtrListIterator mit( (*it).msgList ); mit.current(); ++mit ) -+ mit.current()->setTransferInProgress( false ); -+ } - } -+ account->removeJob( mJob ); // remove the associated kio job - } -- account->removeJob( mJob ); // remove the associated kio job -+ account->mJobList.remove( this ); // remove the folderjob - } -- account->mJobList.remove( this ); // remove the folderjob - } - mSrcFolder->close(); - } ---- kdepim/kmail/kmfoldercachedimap.cpp 2006/02/11 22:39:04 508499 -+++ kdepim/kmail/kmfoldercachedimap.cpp 2006/04/15 10:05:41 530074 -@@ -539,8 +539,11 @@ - mRecurse = recurse; - assert( account() ); - -- mAccount->mailCheckProgressItem()->reset(); -- mAccount->mailCheckProgressItem()->setTotalItems( 100 ); -+ ProgressItem *progressItem = mAccount->mailCheckProgressItem(); -+ if ( progressItem ) { -+ progressItem->reset(); -+ progressItem->setTotalItems( 100 ); -+ } - mProgress = 0; - - #if 0 -@@ -1746,11 +1749,14 @@ - f = static_cast(newFolder->storage()); - } - } -- f->setAccount( mAccount ); -- f->setImapPath( "/INBOX/" ); -- f->folder()->setLabel( i18n("inbox") ); -+ if ( f ) { -+ f->setAccount( mAccount ); -+ f->setImapPath( "/INBOX/" ); -+ f->folder()->setLabel( i18n("inbox") ); -+ } - if (!node) { -- f->close(); -+ if ( f ) -+ f->close(); - kmkernel->dimapFolderMgr()->contentsChanged(); - } - // so we have an INBOX ---- kdepim/kmail/kmfolderimap.cpp 2006/03/15 14:19:26 518857 -+++ kdepim/kmail/kmfolderimap.cpp 2006/04/15 13:05:11 530119 -@@ -110,6 +110,11 @@ - if (mOpenCount <= 0 ) return; - if (mOpenCount > 0) mOpenCount--; - if (mOpenCount > 0 && !aForced) return; -+ if (isSelected() && !aForced) { -+ kdWarning(5006) << "Trying to close the selected folder " << label() << -+ " - ignoring!" << endl; -+ return; -+ } - // FIXME is this still needed? - if (mAccount) - mAccount->ignoreJobsForFolder( folder() ); -@@ -873,8 +878,10 @@ - } - kmkernel->imapFolderMgr()->contentsChanged(); - } -- f->initializeFrom( this, "/INBOX/", "message/directory" ); -- f->setChildrenState( QString::null ); -+ if ( f ) { -+ f->initializeFrom( this, "/INBOX/", "message/directory" ); -+ f->setChildrenState( QString::null ); -+ } - // so we have an INBOX - mAccount->setHasInbox( true ); - } -@@ -1086,17 +1093,20 @@ - int a = cstr.find("X-uidValidity: "); - int b = cstr.find("\r\n", a); - QString uidv; -- if ( (b - a - 15) >= 0 ) uidv = cstr.mid(a + 15, b - a - 15); -+ if ( (b - a - 15) >= 0 ) -+ uidv = cstr.mid(a + 15, b - a - 15); - a = cstr.find("X-Access: "); - b = cstr.find("\r\n", a); - QString access; -- if ( (b - a - 10) >= 0 ) access = cstr.mid(a + 10, b - a - 10); -+ if ( (b - a - 10) >= 0 ) -+ access = cstr.mid(a + 10, b - a - 10); - mReadOnly = access == "Read only"; - a = cstr.find("X-Count: "); - b = cstr.find("\r\n", a); - int exists = -1; -- bool ok; -- if ( (b - a - 9) >= 0 ) exists = cstr.mid(a + 9, b - a - 9).toInt(&ok); -+ bool ok = false; -+ if ( (b - a - 9) >= 0 ) -+ exists = cstr.mid(a + 9, b - a - 9).toInt(&ok); - if ( !ok ) exists = -1; - QString startUid; - if (uidValidity() != uidv) ---- kdepim/kmail/kmfoldertree.cpp 2006/02/13 20:29:00 509156 -+++ kdepim/kmail/kmfoldertree.cpp 2006/04/15 10:05:41 530074 -@@ -139,7 +139,7 @@ - KIconLoader * il = KGlobal::instance()->iconLoader(); - QPixmap pm = il->loadIcon( icon, KIcon::Small, size, - KIcon::DefaultState, 0, true ); -- if ( pm.isNull() ) { -+ if ( mFolder && pm.isNull() ) { - pm = il->loadIcon( mFolder->normalIconPath(), KIcon::Small, size, - KIcon::DefaultState, 0, true ); - } -@@ -157,7 +157,7 @@ - pm = normalIcon( size ); - - KIconLoader * il = KGlobal::instance()->iconLoader(); -- if ( mFolder->useCustomIcons() ) { -+ if ( mFolder && mFolder->useCustomIcons() ) { - pm = il->loadIcon( mFolder->unreadIconPath(), KIcon::Small, size, - KIcon::DefaultState, 0, true ); - if ( pm.isNull() ) -@@ -1020,10 +1020,10 @@ - mMainWidget->action("compact")->plug(folderMenu); - - folderMenu->insertSeparator(); -- if ( !fti->folder()->isSystemFolder() ) -+ if ( !fti->folder()->isSystemFolder() ) { - mMainWidget->action("delete_folder")->plug(folderMenu); -- -- folderMenu->insertSeparator(); -+ folderMenu->insertSeparator(); -+ } - mMainWidget->action("empty")->plug(folderMenu); - folderMenu->insertSeparator(); - } -@@ -1477,7 +1477,8 @@ - - QString fldName, oldFldName; - -- oldFldName = fti->name(0); -+ if ( fti ) -+ oldFldName = fti->name(0); - - if (!text.isEmpty()) - fldName = text; -@@ -1546,10 +1547,12 @@ - - // get the unread count - int count = 0; -- if (folder->noContent()) // always empty -+ if (folder && folder->noContent()) // always empty - count = -1; -- else -- count = fti->folder()->countUnread(); -+ else { -+ if ( fti->folder() ) -+ count = fti->folder()->countUnread(); -+ } - - // set it - bool repaint = false; \ No newline at end of file diff --git a/kde-base/kmail/files/kmail-3.5.6-kde-bug-140660.patch b/kde-base/kmail/files/kmail-3.5.6-kde-bug-140660.patch new file mode 100644 index 000000000000..323e349267b1 --- /dev/null +++ b/kde-base/kmail/files/kmail-3.5.6-kde-bug-140660.patch @@ -0,0 +1,19 @@ +Index: kmfolder.cpp +=================================================================== +--- kdepim-3.5.6/kmail/kmfolder.cpp (revision 627528) ++++ kdepim-3.5.6/kmail/kmfolder.cpp (working copy) +@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrListfind( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::find( const KMMessage* msg ) const + { +- return mStorage->find( msg ); ++ return mStorage ? mStorage->find( msg ) : 0; + } + + int KMFolder::count( bool cache ) const diff --git a/kde-base/kmail/files/kmail-3.5.6-templates.patch b/kde-base/kmail/files/kmail-3.5.6-templates.patch new file mode 100644 index 000000000000..262c9821a1f9 --- /dev/null +++ b/kde-base/kmail/files/kmail-3.5.6-templates.patch @@ -0,0 +1,20 @@ +--- branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2006/10/28 17:04:18 599816 ++++ branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2007/01/27 00:32:53 627548 +@@ -631,11 +631,13 @@ + mWhoField = "From"; + if ( this == kmkernel->outboxFolder() || + this == kmkernel->sentFolder() || +- this == kmkernel->draftsFolder() ) ++ this == kmkernel->draftsFolder() || ++ this == kmkernel->templatesFolder() ) + mWhoField = "To"; +- } else if ( identity.drafts() == idString() +- || identity.fcc() == idString() ) +- // drafts or sent of the identity ++ } else if ( identity.drafts() == idString() || ++ identity.templates() == idString() || ++ identity.fcc() == idString() ) ++ // drafts, templates or sent of the identity + mWhoField = "To"; + else + mWhoField = "From"; diff --git a/kde-base/kmail/kmail-3.5.6-r1.ebuild b/kde-base/kmail/kmail-3.5.6-r1.ebuild new file mode 100644 index 000000000000..34c4f59bda4e --- /dev/null +++ b/kde-base/kmail/kmail-3.5.6-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.6-r1.ebuild,v 1.1 2007/01/27 18:12:25 flameeyes Exp $ + +KMNAME=kdepim +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_DIR="${SRC_DIR} + mirror://gentoo/kdepim-3.5-patchset-02.tar.bz2" + +DESCRIPTION="KDE mail client" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="crypt" +DEPEND="$(deprange 3.5.4 $MAXKDEVER kde-base/libkdenetwork) + $(deprange $PV $MAXKDEVER kde-base/libkdepim) + $(deprange $PV $MAXKDEVER kde-base/libkpimidentities) + $(deprange $PV $MAXKDEVER kde-base/mimelib) + $(deprange $PV $MAXKDEVER kde-base/libksieve) + $(deprange $PV $MAXKDEVER kde-base/certmanager) + $(deprange $PV $MAXKDEVER kde-base/libkcal) + $(deprange $PV $MAXKDEVER kde-base/kontact) + $(deprange 3.5.4 $MAXKDEVER kde-base/libkpgp) + $(deprange $PV $MAXKDEVER kde-base/libkmime)" +RDEPEND="${DEPEND} + crypt? ( app-crypt/pinentry ) + $(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves) + $(deprange 3.5.5 $MAXKDEVER kde-base/kmailcvt) + $(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves) + $(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)" # for the "looknfeel" icon, and probably others. + +KMCOPYLIB=" + libkdepim libkdepim/ + libkpimidentities libkpimidentities/ + libmimelib mimelib/ + libksieve libksieve/ + libkleopatra certmanager/lib/ + libkcal libkcal + libkpinterfaces kontact/interfaces/ + libkmime libkmime + libkpgp libkpgp" +KMEXTRACTONLY=" + libkdenetwork/ + libkdepim/ + libkpimidentities/ + libksieve/ + libkcal/ + mimelib/ + certmanager/ + korganizer/korganizeriface.h + kontact/interfaces/ + libkmime/ + libkpgp + dcopidlng" +KMCOMPILEONLY="libemailfunctions" +# the kmail plugins are installed with kmail +KMEXTRA="plugins/kmail/ + kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps. + +PATCHES="${FILESDIR}/kmail-3.5.6-kde-bug-140660.patch + ${FILESDIR}/kmail-3.5.6-templates.patch" -- 2.26.2