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

[Pierre Schmitz]

    Date: Friday, October 2, 2009 @ 11:08:42
  Author: pierre
Revision: 53551

remove old patches

Modified:
  kdepim/trunk/PKGBUILD
Deleted:
  kdepim/trunk/fix-ldap-crash.path
  kdepim/trunk/kmail-delete-mails-from-server.patch

--------------------------------------+
 PKGBUILD                             |   17 +------
 fix-ldap-crash.path                  |   22 ---------
 kmail-delete-mails-from-server.patch |   75 ---------------------------------
 3 files changed, 3 insertions(+), 111 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-02 15:07:12 UTC (rev 53550)
+++ PKGBUILD	2009-10-02 15:08:42 UTC (rev 53551)
@@ -25,22 +25,11 @@
 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"
-	'kmail-delete-mails-from-server.patch' 'fix-ldap-crash.path')
-md5sums=('1029bc586f29c262f5f60eb079623e62'
-         'a3c32cf5d25195c73c6a278861a3629f'
-         '0fbb85217984859097e4f8213759f221')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('1029bc586f29c262f5f60eb079623e62')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	# Fix important KMail bug
-	# fixed in 4.3.2
-	patch -p4 -i $srcdir/kmail-delete-mails-from-server.patch || return 1
-	# fixed in 4.3.2
-	# see https://bugs.kde.org/show_bug.cgi?id=206024
-	patch -p0 -i $srcdir/fix-ldap-crash.path || return 1
-
-        cd ${srcdir}
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Deleted: fix-ldap-crash.path
===================================================================
--- fix-ldap-crash.path	2009-10-02 15:07:12 UTC (rev 53550)
+++ fix-ldap-crash.path	2009-10-02 15:08:42 UTC (rev 53551)
@@ -1,22 +0,0 @@
-diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
---- libkdepim/addresseelineedit.cpp	(revision 1019119)
-+++ libkdepim/addresseelineedit.cpp	(revision 1019358)
-@@ -800,7 +800,7 @@
- 
- void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
- {
--  if ( s_LDAPLineEdit != this ) {
-+  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
-     return;
-   }
- 
-@@ -817,7 +817,8 @@
-     setText( m_previousAddresses + m_searchString );
-     // only complete again if the user didn't change the selection while
-     // we were waiting; otherwise the completion box will be closed
--    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
-+    QListWidgetItem *current = completionBox()->currentItem();
-+    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
-       doCompletion( m_lastSearchMode );
-     }
-   }

Deleted: kmail-delete-mails-from-server.patch
===================================================================
--- kmail-delete-mails-from-server.patch	2009-10-02 15:07:12 UTC (rev 53550)
+++ kmail-delete-mails-from-server.patch	2009-10-02 15:08:42 UTC (rev 53551)
@@ -1,75 +0,0 @@
-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;
-   }
- }