[arch-commits] Commit in kdepim/repos (4 files)
Pierre Schmitz
pierre at archlinux.org
Tue Oct 6 11:02:33 UTC 2009
Date: Tuesday, October 6, 2009 @ 07:02:32
Author: pierre
Revision: 54092
Merged revisions 53551,53569,53581,53583,53982 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdepim/trunk
........
r53551 | pierre | 2009-10-02 17:08:42 +0200 (Fr, 02 Okt 2009) | 1 line
remove old patches
........
r53569 | pierre | 2009-10-02 17:15:26 +0200 (Fr, 02 Okt 2009) | 1 line
KDE 4.3.2 (try #1)
........
r53581 | pierre | 2009-10-02 21:50:26 +0200 (Fr, 02 Okt 2009) | 1 line
workaround until this file conflict is fixed upstream
........
r53583 | pierre | 2009-10-02 22:09:11 +0200 (Fr, 02 Okt 2009) | 1 line
revert this
........
r53982 | andrea | 2009-10-04 22:41:27 +0200 (So, 04 Okt 2009) | 1 line
new tarball who fix oxygen-icons conflicts
........
Modified:
kdepim/repos/extra-x86_64/ (properties)
kdepim/repos/extra-x86_64/PKGBUILD
Deleted:
kdepim/repos/extra-x86_64/fix-ldap-crash.path
kdepim/repos/extra-x86_64/kmail-delete-mails-from-server.patch
--------------------------------------+
PKGBUILD | 21 ++-------
fix-ldap-crash.path | 22 ---------
kmail-delete-mails-from-server.patch | 75 ---------------------------------
3 files changed, 5 insertions(+), 113 deletions(-)
Property changes on: kdepim/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /kdepim/trunk:1-52959
+ /kdepim/trunk:1-54091
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-10-06 11:01:46 UTC (rev 54091)
+++ extra-x86_64/PKGBUILD 2009-10-06 11:02:32 UTC (rev 54092)
@@ -18,29 +18,18 @@
'kdepim-ktimetracker'
'kdepim-libkdepim'
'kdepim-wizards')
-pkgver=4.3.1
-pkgrel=4
+pkgver=4.3.2
+pkgrel=1
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"
- '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=('7e6a672bd681b2f19502798d7ed73fe8')
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: extra-x86_64/fix-ldap-crash.path
===================================================================
--- extra-x86_64/fix-ldap-crash.path 2009-10-06 11:01:46 UTC (rev 54091)
+++ extra-x86_64/fix-ldap-crash.path 2009-10-06 11:02:32 UTC (rev 54092)
@@ -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: extra-x86_64/kmail-delete-mails-from-server.patch
===================================================================
--- extra-x86_64/kmail-delete-mails-from-server.patch 2009-10-06 11:01:46 UTC (rev 54091)
+++ extra-x86_64/kmail-delete-mails-from-server.patch 2009-10-06 11:02:32 UTC (rev 54092)
@@ -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;
- }
- }
More information about the arch-commits
mailing list