revise the patch slightly per bug #157049 (and the KDE bug referenced therein

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 3dd673878675133b0a9bebc85c0d302cff1c2b87..b4043565732481b87117fbdcaf322e30ac6d1804 100644 (file)
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.233 2006/12/03 19:38:34 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.234 2006/12/04 18:47:48 caleb Exp $
+
+  04 Dec 2006; Caleb Tennis <caleb@gentoo.org>
+  files/kmail-3.5.5-dimap-mail-loss.patch:
+  revise the patch slightly per bug #157049 (and the KDE bug referenced therein
 
   03 Dec 2006; Markus Rothe <corsair@gentoo.org> kdepim-3.5.5-r2.ebuild:
   Stable on ppc64

diff --git a/kde-base/kdepim/files/kmail-3.5.5-dimap-mail-loss.patch b/kde-base/kdepim/files/kmail-3.5.5-dimap-mail-loss.patch
index 3aad70855c3285b054e53c011e5c1c30553a49b9..e64b3d4ae1b7bb6bb09806d17e41bbed1d276dc7 100644 (file)
--- a/kde-base/kdepim/files/kmail-3.5.5-dimap-mail-loss.patch
+++ b/kde-base/kdepim/files/kmail-3.5.5-dimap-mail-loss.patch
@@ -2,14 +2,6 @@ Index: kmail/kmfoldercachedimap.cpp
 ===================================================================
 --- kmail/kmfoldercachedimap.cpp       (revision 597658)
 +++ kmail/kmfoldercachedimap.cpp       (revision 597659)
-@@ -75,6 +75,7 @@
- #include <globalsettings.h>
- 
- #define UIDCACHE_VERSION 1
-+#define MAIL_LOSS_DEBUGGING 0
- 
- static QString incidencesForToString( KMFolderCachedImap::IncidencesFor r ) {
-   switch (r) {
 @@ -150,10 +151,22 @@
      mFolderRemoved( false ),
      /*mHoldSyncs( false ),*/ mRecurse( true ),

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 3358eee00e3662d331866cdcbd7433f6e899317f..94e3837434cecedfa53a0037207299d9098184fd 100644 (file)
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.89 2006/11/30 09:00:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.90 2006/12/04 18:46:02 caleb Exp $
+
+  04 Dec 2006; Caleb Tennis <caleb@gentoo.org>
+  files/kmail-3.5.5-dimap-mail-loss.patch:
+  revise the patch slightly per bug #157049 (and the KDE bug referenced therein
 
   30 Nov 2006; Markus Rothe <corsair@gentoo.org> kmail-3.5.5-r1.ebuild:
   Stable on ppc64

diff --git a/kde-base/kmail/files/kmail-3.5.5-dimap-mail-loss.patch b/kde-base/kmail/files/kmail-3.5.5-dimap-mail-loss.patch
index 3aad70855c3285b054e53c011e5c1c30553a49b9..e64b3d4ae1b7bb6bb09806d17e41bbed1d276dc7 100644 (file)
--- a/kde-base/kmail/files/kmail-3.5.5-dimap-mail-loss.patch
+++ b/kde-base/kmail/files/kmail-3.5.5-dimap-mail-loss.patch
@@ -2,14 +2,6 @@ Index: kmail/kmfoldercachedimap.cpp
 ===================================================================
 --- kmail/kmfoldercachedimap.cpp       (revision 597658)
 +++ kmail/kmfoldercachedimap.cpp       (revision 597659)
-@@ -75,6 +75,7 @@
- #include <globalsettings.h>
- 
- #define UIDCACHE_VERSION 1
-+#define MAIL_LOSS_DEBUGGING 0
- 
- static QString incidencesForToString( KMFolderCachedImap::IncidencesFor r ) {
-   switch (r) {
 @@ -150,10 +151,22 @@
      mFolderRemoved( false ),
      /*mHoldSyncs( false ),*/ mRecurse( true ),