[arch-commits] Commit in evolution-data-server/trunk (2 files)

[Jan de Groot]

    Date: Friday, February 12, 2010 @ 19:39:40
  Author: jgc
Revision: 68478

upgpkg: evolution-data-server 2.29.90-1
    Update to 2.29.90 - use patch from FreeBSD to compile with Heimdal

Added:
  evolution-data-server/trunk/patch-camel_camel-sasl-gssapi.c
Modified:
  evolution-data-server/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 +++++++----
 patch-camel_camel-sasl-gssapi.c |   11 +++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-13 00:15:19 UTC (rev 68477)
+++ PKGBUILD	2010-02-13 00:39:40 UTC (rev 68478)
@@ -2,20 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=2.28.2
+pkgver=2.29.90
 pkgrel=1
 pkgdesc="Evolution Data Server provides a central location for addressbook and calendar in the GNOME Desktop"
 arch=(i686 x86_64)
-depends=('libsoup>=2.28.0' 'nss>=3.12.4' 'libglade>=2.6.4' 'gnome-keyring>=2.28.1' 'heimdal>=1.3.1' 'libgweather>=2.28.0' 'libical>=0.43' 'libbonobo>=2.24.2' 'db>=4.8.24')
+depends=('libsoup>=2.29.90' 'nss>=3.12.4' 'libgnome-keyring>=2.29.4' 'heimdal>=1.3.1' 'libgweather>=2.29.90' 'libical>=0.44' 'db>=4.8.26')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc')
 options=('!libtool')
 url="http://www.gnome.org"
 license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('12e3ba23e4021a70be9cb6d418d1966883ee940bfa1a298294b036bde90faf2c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.29/${pkgname}-${pkgver}.tar.bz2
+        patch-camel_camel-sasl-gssapi.c)
+sha256sums=('e3dd5b118064ed42acb51eac85dc552a5044c8ecdac47e56bea200244577e90d'
+            '7a16a8e040a9623a56d05754b5a23d969d12e1c2098eb7baec48e935a43832b4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i "${srcdir}/patch-camel_camel-sasl-gssapi.c" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-openldap=yes \
       --libexecdir=/usr/lib/evolution-data-server-1.2 \

Added: patch-camel_camel-sasl-gssapi.c
===================================================================
--- patch-camel_camel-sasl-gssapi.c	                        (rev 0)
+++ patch-camel_camel-sasl-gssapi.c	2010-02-13 00:39:40 UTC (rev 68478)
@@ -0,0 +1,11 @@
+--- camel/camel-sasl-gssapi.c.orig	2010-01-28 23:26:56.000000000 +0000
++++ camel/camel-sasl-gssapi.c	2010-01-28 23:32:28.000000000 +0000
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+-#include <krb5/krb5.h>
++#include <krb5.h>
+ #ifdef HAVE_ET_COM_ERR_H
+ #include <et/com_err.h>
+ #else