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

[Pierre Schmitz]

    Date: Thursday, November 6, 2008 @ 08:23:32
  Author: pierre
Revision: 18504

Merged revisions 18502 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdepim/trunk

........
  r18502 | pierre | 2008-11-06 13:35:42 +0100 (Do, 06 Nov 2008) | 1 line
  
  fixing mail duplication
........

Added:
  kdepim/repos/extra-i686/mail-duplication.patch
    (from rev 18502, kdepim/trunk/mail-duplication.patch)
Modified:
  kdepim/repos/extra-i686/	(properties)
  kdepim/repos/extra-i686/PKGBUILD

------------------------+
 PKGBUILD               |   12 ++++++++----
 mail-duplication.patch |   10 ++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)


Property changes on: kdepim/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdepim/trunk:1-17647
   + /kdepim/trunk:1-18503

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-06 12:56:48 UTC (rev 18503)
+++ extra-i686/PKGBUILD	2008-11-06 13:23:32 UTC (rev 18504)
@@ -3,7 +3,7 @@
 
 pkgname=kdepim
 pkgver=4.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Personal Information Management suite"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -13,11 +13,15 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 options=('docs')
 install='kdepim.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('655ff3c21c36a3378723bc2afb8cb434')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'mail-duplication.patch')
+md5sums=('655ff3c21c36a3378723bc2afb8cb434'
+         '1ebbc06914f79d00f6446a3eb0b17d18')
 
 build() {
-	cd $srcdir
+	cd $srcdir/${pkgname}-${pkgver}
+	patch -p4 -i $srcdir/mail-duplication.patch || return 1
+	cd ../
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Copied: kdepim/repos/extra-i686/mail-duplication.patch (from rev 18502, kdepim/trunk/mail-duplication.patch)
===================================================================
--- extra-i686/mail-duplication.patch	                        (rev 0)
+++ extra-i686/mail-duplication.patch	2008-11-06 13:23:32 UTC (rev 18504)
@@ -0,0 +1,10 @@
+--- branches/KDE/4.1/kdepim/kmail/kmfoldermaildir.cpp	2008/10/30 18:32:47	877937
++++ branches/KDE/4.1/kdepim/kmail/kmfoldermaildir.cpp	2008/10/30 18:33:09	877938
+@@ -717,6 +717,7 @@
+       dateStr = dateStr.trimmed();
+       if (!dateStr.isEmpty())
+         mi->setDate(dateStr.constData());
++      uidStr = uidStr.trimmed();
+       if ( !uidStr.isEmpty() )
+          mi->setUID( uidStr.toULong() );
+       mi->setDirty(false);