From 82c9252b1b998bce4fd4cf62378ae336eebb8cdb Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 9 Dec 2011 10:53:24 -0500 Subject: [PATCH] extra/claws-mail to 3.7.10-2 --- extra/claws-mail/PKGBUILD | 15 ++++++++++----- extra/claws-mail/gnutls_buildfix.patch | 12 ++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 extra/claws-mail/gnutls_buildfix.patch diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index c46fede13..92d77ad47 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 136386 2011-08-28 17:30:30Z andyrtr $ +# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ # Maintainer: Andreas Radke -# ALARM: Kevin Mihelich +# ALARM: Kevin Mihelich # - removed valgrind from makedepends plugrel=1 pkgname=claws-mail pkgver=3.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64') license=('GPL3') @@ -24,12 +24,17 @@ replaces=('sylpheed-claws') 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 \ diff --git a/extra/claws-mail/gnutls_buildfix.patch b/extra/claws-mail/gnutls_buildfix.patch new file mode 100644 index 000000000..31de8eb8b --- /dev/null +++ b/extra/claws-mail/gnutls_buildfix.patch @@ -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);