[arch-commits] Commit in kdepimlibs/trunk (PKGBUILD fix-invitations.diff)

[Pierre Schmitz]

    Date: Wednesday, September 24, 2008 @ 07:36:07
  Author: pierre
Revision: 12898

remove patch; prepare for 4.1.2 release

Modified:
  kdepimlibs/trunk/PKGBUILD
Deleted:
  kdepimlibs/trunk/fix-invitations.diff

----------------------+
 PKGBUILD             |    9 +++------
 fix-invitations.diff |   12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-23 17:26:14 UTC (rev 12897)
+++ PKGBUILD	2008-09-24 11:36:07 UTC (rev 12898)
@@ -11,14 +11,11 @@
 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"
-        'fix-invitations.diff')
-md5sums=('36316f5fc5b2e0ec123a8e00a522dd80' '9e9ac55a992a3d9eb715ccadc8f1bac6')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('36316f5fc5b2e0ec123a8e00a522dd80')
 
 build() {
-	cd $srcdir/${pkgname}-${pkgver}
-	patch -p4 -i $srcdir/fix-invitations.diff || return 1
-	cd ..
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \

Deleted: fix-invitations.diff
===================================================================
--- fix-invitations.diff	2008-09-23 17:26:14 UTC (rev 12897)
+++ fix-invitations.diff	2008-09-24 11:36:07 UTC (rev 12898)
@@ -1,12 +0,0 @@
---- 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;