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

Pierre Schmitz pierre at archlinux.org
Thu Sep 25 20:53:00 EDT 2008


    Date: Thursday, September 25, 2008 @ 20:52:59
  Author: pierre
Revision: 13172

Merged revisions 12898,13105 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdepimlibs/trunk

........
  r12898 | pierre | 2008-09-24 13:36:07 +0200 (Mi, 24 Sep 2008) | 1 line
  
  remove patch; prepare for 4.1.2 release
........
  r13105 | pierre | 2008-09-26 02:39:46 +0200 (Fr, 26 Sep 2008) | 1 line
  
  prepare for KDE-4.1.2 update
........

Modified:
  kdepimlibs/repos/extra-x86_64/	(properties)
  kdepimlibs/repos/extra-x86_64/PKGBUILD
Deleted:
  kdepimlibs/repos/extra-x86_64/fix-invitations.diff

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


Property changes on: kdepimlibs/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kdepimlibs/trunk:1-11857
   + /kdepimlibs/trunk:1-13171

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-26 00:51:34 UTC (rev 13171)
+++ extra-x86_64/PKGBUILD	2008-09-26 00:52:59 UTC (rev 13172)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -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=('c5896119ce4aef2dd9d11495dd0dea6e')
 
 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: extra-x86_64/fix-invitations.diff
===================================================================
--- extra-x86_64/fix-invitations.diff	2008-09-26 00:51:34 UTC (rev 13171)
+++ extra-x86_64/fix-invitations.diff	2008-09-26 00:52:59 UTC (rev 13172)
@@ -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;




More information about the arch-commits mailing list