[arch-commits] Commit in kdepimlibs/trunk (PKGBUILD fix-invitations.diff)
Pierre Schmitz
pierre at archlinux.org
Fri Sep 5 17:54:25 UTC 2008
Date: Friday, September 5, 2008 @ 13:54:25
Author: pierre
Revision: 11857
upgpkg: kdepimlibs 4.1.1-2
Fix crash (while displaying a mail which has a calendar entry in it)
Added:
kdepimlibs/trunk/fix-invitations.diff
Modified:
kdepimlibs/trunk/PKGBUILD
----------------------+
PKGBUILD | 13 ++++++++-----
fix-invitations.diff | 12 ++++++++++++
2 files changed, 20 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-09-05 12:29:17 UTC (rev 11856)
+++ PKGBUILD 2008-09-05 17:54:25 UTC (rev 11857)
@@ -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
}
Added: fix-invitations.diff
===================================================================
--- fix-invitations.diff (rev 0)
+++ fix-invitations.diff 2008-09-05 17:54:25 UTC (rev 11857)
@@ -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;
More information about the arch-commits
mailing list