[arch-commits] Commit in claws-mail/trunk (PKGBUILD gnutls_buildfix.patch)

[andyrtr at archlinux.org]

    Date: Thursday, December 8, 2011 @ 16:05:30
  Author: andyrtr
Revision: 144877

upgpkg: claws-mail 3.7.10-2

fix build with latest gnutls, FS#27268

Added:
  claws-mail/trunk/gnutls_buildfix.patch
Modified:
  claws-mail/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   11 ++++++++---
 gnutls_buildfix.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-08 20:54:22 UTC (rev 144876)
+++ PKGBUILD	2011-12-08 21:05:30 UTC (rev 144877)
@@ -3,7 +3,7 @@
 
 pkgname=claws-mail
 pkgver=3.7.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -19,12 +19,17 @@
 provides=('claws')
 options=(!libtool)
 install=claws-mail.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('fcf58dcff52f0908ff3bc368d820408b')
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2
+	gnutls_buildfix.patch)
+md5sums=('fcf58dcff52f0908ff3bc368d820408b'
+         '372bf7a9da58ae49d9da50f79db69fb6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # fix build with latest gnutls
+  patch -Np1 -i ${srcdir}/gnutls_buildfix.patch
+  
   sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
 
   ./configure --prefix=/usr --disable-static \

Added: gnutls_buildfix.patch
===================================================================
--- gnutls_buildfix.patch	                        (rev 0)
+++ gnutls_buildfix.patch	2011-12-08 21:05:30 UTC (rev 144877)
@@ -0,0 +1,12 @@
+--- claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:08.682553870 +0100
++++ claws-mail-3.7.10/src/common/ssl.c	2011-12-07 14:55:43.808349602 +0100
+@@ -270,7 +270,9 @@ gboolean ssl_init_socket_with_method(Soc
+ 	if (session == NULL || r != 0)
+ 		return FALSE;
+   
++#if GNUTLS_VERSION_NUMBER < 0x020c00
+ 	gnutls_transport_set_lowat (session, 1); 
++#endif
+ 	gnutls_set_default_priority(session);
+ 	gnutls_protocol_set_priority (session, proto_prio);
+ 	gnutls_cipher_set_priority (session, cipher_prio);