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

[Pierre Schmitz]

    Date: Friday, September 5, 2008 @ 14:01:19
  Author: pierre
Revision: 11859

Merged revisions 10607-11858 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdepimlibs/trunk

........
  r11857 | pierre | 2008-09-05 17:54:25 +0000 (Fr, 05 Sep 2008) | 2 lines
  
  upgpkg: kdepimlibs 4.1.1-2
      Fix crash (while displaying a mail which has a calendar entry in it)
........

Added:
  kdepimlibs/repos/extra-i686/fix-invitations.diff
    (from rev 11857, kdepimlibs/trunk/fix-invitations.diff)
Modified:
  kdepimlibs/repos/extra-i686/	(properties)
  kdepimlibs/repos/extra-i686/PKGBUILD

----------------------+
 PKGBUILD             |   13 ++++++++-----
 fix-invitations.diff |   12 ++++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)


Property changes on: kdepimlibs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdepimlibs/trunk:1-10606
   + /kdepimlibs/trunk:1-11858

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-05 17:54:53 UTC (rev 11858)
+++ extra-i686/PKGBUILD	2008-09-05 18:01:19 UTC (rev 11859)
@@ -3,7 +3,7 @@
 
 pkgname=kdepimlibs
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -11,16 +11,19 @@
 groups=('kde')
 depends=('kdelibs' 'akonadi' 'gpgme')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('36316f5fc5b2e0ec123a8e00a522dd80')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'fix-invitations.diff')
+md5sums=('36316f5fc5b2e0ec123a8e00a522dd80' '9e9ac55a992a3d9eb715ccadc8f1bac6')
 
 build() {
-	cd $srcdir
+	cd $srcdir/${pkgname}-${pkgver}
+	patch -p4 -i $srcdir/fix-invitations.diff || return 1
+	cd ..
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
-	make DESTDIR=$startdir/pkg install
+	make DESTDIR=$pkgdir install
 }

Copied: kdepimlibs/repos/extra-i686/fix-invitations.diff (from rev 11857, kdepimlibs/trunk/fix-invitations.diff)
===================================================================
--- extra-i686/fix-invitations.diff	                        (rev 0)
+++ extra-i686/fix-invitations.diff	2008-09-05 18:01:19 UTC (rev 11859)
@@ -0,0 +1,12 @@
+--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:28:53	856767
++++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:33:54	856768
+@@ -1132,6 +1132,9 @@
+     IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
+     bool act( IncidenceBase *incidence, Incidence *existingIncidence )
+     {
++      if (!existingIncidence) {
++        return false;
++      }
+       Incidence *inc = dynamic_cast<Incidence *>( incidence );
+       if ( inc && inc->revision() <= existingIncidence->revision() ) {
+         return false;