[paketler-commits] r32562 - in devel/desktop/kde/base/kdepim: . files

[paketler-commits at pardus.org.tr]

Author: cartman
Date: Mon Sep  3 15:54:44 2007
New Revision: 32562

Added:
   devel/desktop/kde/base/kdepim/files/bug-85539.patch
   devel/desktop/kde/base/kdepim/files/imap-doublequote-in-foldername.patch
   devel/desktop/kde/base/kdepim/files/kmail-networkstatus-support.diff
   devel/desktop/kde/base/kdepim/files/kmail-powersave.patch
Removed:
   devel/desktop/kde/base/kdepim/files/3.5-branch.patch.bz2
Modified:
   devel/desktop/kde/base/kdepim/files/kdepim-3.5.0-kmail-imapfetchmaxsize.patch
   devel/desktop/kde/base/kdepim/files/kdepim_networkstatus_branch.diff
   devel/desktop/kde/base/kdepim/pspec.xml
Log:
sync



Modified: devel/desktop/kde/base/kdepim/files/kdepim-3.5.0-kmail-imapfetchmaxsize.patch
=================================================================
--- devel/desktop/kde/base/kdepim/files/kdepim-3.5.0-kmail-imapfetchmaxsize.patch	(original)
+++ devel/desktop/kde/base/kdepim/files/kdepim-3.5.0-kmail-imapfetchmaxsize.patch	Mon Sep  3 15:54:44 2007
@@ -17,14 +17,14 @@
  KMFolderImap::~KMFolderImap()
 --- kdepim-3.4.0.orig/kmail/kmfolderimap.h	2005-02-04 01:12:07.000000000 +0200
 +++ kdepim-3.4.0/kmail/kmfolderimap.h	2005-03-22 21:10:50.000000000 +0200
-@@ -530,6 +530,7 @@
+@@ -462,6 +462,7 @@
+   ProgressItem *mListDirProgressItem;
    ProgressItem *mAddMessageProgressItem;
-   // to-be-added folders
    QStringList mFoldersPendingCreation;
 +  int fetchMaxSize;
-
-   // push all flags to the server instead of just the changed once
-   // when doing a flag change the next time
+ };
+ 
+ #endif // kmfolderimap_h
 --- kdepim-3.5.6/kmail/kmfolderimap.cpp	2007-04-15 23:14:02.000000000 +0300
 +++ kdepim-3.5.6/kmail/kmfolderimap.cpp	2007-04-15 23:18:03.000000000 +0300
 @@ -1635,7 +1635,7 @@

Modified: devel/desktop/kde/base/kdepim/files/kdepim_networkstatus_branch.diff
=================================================================
--- devel/desktop/kde/base/kdepim/files/kdepim_networkstatus_branch.diff	(original)
+++ devel/desktop/kde/base/kdepim/files/kdepim_networkstatus_branch.diff	Mon Sep  3 15:54:44 2007
@@ -302,7 +302,7 @@
 @@ -1015,7 +1015,9 @@
    }
  
-   if (interactive && kmkernel) {
+   if (interactive) {
 -    KMessageBox::error(kmkernel->mainWin(), KIO::buildErrorString(error, errorMsg));
 +    if ( ! ( ( error == KIO::ERR_CONNECTION_BROKEN || error == KIO::ERR_SERVER_TIMEOUT ) &&
 +            GlobalSettings::self()->networkState() != GlobalSettings::EnumNetworkState::Offline ) )

Modified: devel/desktop/kde/base/kdepim/pspec.xml
=================================================================
--- devel/desktop/kde/base/kdepim/pspec.xml	(original)
+++ devel/desktop/kde/base/kdepim/pspec.xml	Mon Sep  3 15:54:44 2007
@@ -43,6 +43,11 @@
 
             <!-- http://websvn.kde.org/branches/work/~wstephens/ -->
             <Patch level="1">kdepim_networkstatus_branch.diff</Patch>
+
+            <!-- Already fixed in KDE 3.5.8 -->
+            <Patch>imap-doublequote-in-foldername.patch</Patch>
+            <Patch>kmail-powersave.patch</Patch>
+            <Patch>bug-85539.patch</Patch>
         </Patches>
     </Source>
 
@@ -69,6 +74,13 @@
     </Package>
 
     <History>
+        <Update release="43">
+            <Date>2007-09-03</Date>
+            <Version>3.5.7</Version>
+            <Comment>Revert enterprise branch merge</Comment>
+            <Name>İsmail Dönmez</Name>
+            <Email>ismail at pardus.org.tr</Email>
+        </Update>
         <Update release="42">
             <Date>2007-08-31</Date>
             <Version>3.5.7</Version>