diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-10 10:00:34 +0100 |
| commit | fbe815aa83090984779a8b380cbfc1247353d98b (patch) | |
| tree | 2eb92ffe4f5cb6c6c13f065f3122d9f18264b6c6 /extra/claws-mail | |
| parent | d638a96c43b3c4fb9b517e8a66a4e8b1fa999833 (diff) | |
| parent | d22b68a6758c4f29a8e50a7be467374a53c68415 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/qtfm/PKGBUILD
core/binutils/PKGBUILD
core/fakeroot/PKGBUILD
core/gcc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/audacious/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/sbcl/PKGBUILD
extra/vigra/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-libgcrypt/PKGBUILD
multilib/lib32-libgpg-error/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-tdb/PKGBUILD
multilib/lib32-xcb-util/PKGBUILD
Diffstat (limited to 'extra/claws-mail')
| -rw-r--r-- | extra/claws-mail/PKGBUILD | 13 | ||||
| -rw-r--r-- | extra/claws-mail/gnutls_buildfix.patch | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index e298d0cb4..20396ee35 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136387 2011-08-28 17:30:31Z andyrtr $ +# $Id: PKGBUILD 144878 2011-12-08 21:06:16Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.7.10 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,12 +19,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); |