[arch-commits] Commit in kdepim/repos (3 files)

[Pierre Schmitz]

    Date: Sunday, September 13, 2009 @ 17:40:22
  Author: pierre
Revision: 51925

Merged revisions 51920-51921 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdepim/trunk

........
  r51920 | andrea | 2009-09-13 21:04:39 +0200 (So, 13 Sep 2009) | 1 line
  
  important kmail patch
........
  r51921 | pierre | 2009-09-13 22:55:40 +0200 (So, 13 Sep 2009) | 1 line
  
  add comment to remove the patch with next release
........

Added:
  kdepim/repos/extra-x86_64/kmail-delete-mails-from-server.patch
    (from rev 51921, kdepim/trunk/kmail-delete-mails-from-server.patch)
Modified:
  kdepim/repos/extra-x86_64/	(properties)
  kdepim/repos/extra-x86_64/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   15 ++++--
 kmail-delete-mails-from-server.patch |   75 +++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 4 deletions(-)


Property changes on: kdepim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdepim/trunk:1-50711
   + /kdepim/trunk:1-51924

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-13 21:14:27 UTC (rev 51924)
+++ extra-x86_64/PKGBUILD	2009-09-13 21:40:22 UTC (rev 51925)
@@ -19,17 +19,24 @@
          'kdepim-libkdepim'
          'kdepim-wizards')
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdelibs-experimental' 'kdepimlibs' 'kdepim-runtime' 'gnokii' 'libxss' 'kdebase-runtime' 'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('1029bc586f29c262f5f60eb079623e62')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+	kmail-delete-mails-from-server.patch)
+md5sums=('1029bc586f29c262f5f60eb079623e62'
+         'a3c32cf5d25195c73c6a278861a3629f')
 
 build() {
-	cd $srcdir
+	cd ${srcdir}/${pkgbase}-${pkgver}
+	# Fix important KMail bug
+	# fixed in 4.3.2
+	patch -p4 -i ../kmail-delete-mails-from-server.patch || return 1
+
+        cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Copied: kdepim/repos/extra-x86_64/kmail-delete-mails-from-server.patch (from rev 51921, kdepim/trunk/kmail-delete-mails-from-server.patch)
===================================================================
--- extra-x86_64/kmail-delete-mails-from-server.patch	                        (rev 0)
+++ extra-x86_64/kmail-delete-mails-from-server.patch	2009-09-13 21:40:22 UTC (rev 51925)
@@ -0,0 +1,75 @@
+Index: branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp
+===================================================================
+--- branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022962)
++++ branches/KDE/4.3/kdepim/kmail/cachedimapjob.cpp	(revision 1022963)
+@@ -510,7 +510,7 @@
+         bool b = kmkernel->iCalIface().isResourceQuiet();
+         kmkernel->iCalIface().setResourceQuiet( true );
+ 
+-        mFolder->take( i );
++        mFolder->takeTemporarily( i );
+         mFolder->addMsgKeepUID( mMsg );
+         mMsg->setTransferInProgress( false );
+ 
+Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
+===================================================================
+--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022962)
++++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
+@@ -527,6 +527,11 @@
+   return KMFolderMaildir::take( idx );
+ }
+ 
++void KMFolderCachedImap::takeTemporarily( int idx )
++{
++  KMFolderMaildir::take( idx );
++}
++
+ int KMFolderCachedImap::addMsgInternal( KMMessage *msg, bool newMail, int *index_return )
+ {
+   // Possible optimization: Only dirty if not filtered below
+Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h
+===================================================================
+--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022962)
++++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.h	(revision 1022963)
+@@ -228,10 +228,23 @@
+     /** Reimplemented from KMFolder. Moving is not supported, so aParent must be 0. */
+     virtual int rename( const QString &aName, KMFolderDir *aParent = 0 );
+ 
+-    /** Reimplemented from KMFolderMaildir */
+-    virtual KMMessage *take( int idx );
+     bool canDeleteMessages() const;
+ 
++    /**
++     * Reimplemented from KMFolderMaildir
++     * This deletes the message permanently, also from the server. For this,
++     * rememberDeletion() is called, so that the message can be deleted from
++     * the server on the next sync.
++     */
++    virtual KMMessage* take( int idx );
++
++    /**
++     * Like take(), only that the deletion is not remembered, i.e. the
++     * message will not be deleted from the server. Calling this can cause
++     * inconsistencies, so make sure you re-add the message later!
++     */
++    void takeTemporarily( int idx );
++
+     /** Reimplemented from KMFolderMaildir */
+     virtual int addMsg( KMMessage *msg, int *index_return = 0 );
+ 
+Index: branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp
+===================================================================
+--- branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022963)
++++ branches/KDE/4.3/kdepim/kmail/kmfoldercachedimap.cpp	(revision 1022964)
+@@ -1678,6 +1678,11 @@
+     job->start();
+     return true;
+   } else {
++
++    // Nothing to delete on the server, make sure the map is clear again.
++    // Normally this wouldn't be necessary, but there can be stale maps because of
++    // https://issues.kolab.org/issue3833.
++    mDeletedUIDsSinceLastSync.clear();
+     return false;
+   }
+ }