diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-16 12:30:02 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-16 12:30:02 +0200 |
| commit | fb62b6371fdc9ffe50d30c698f13ea1fb39c215b (patch) | |
| tree | b65df8847849e9c0e61f6dbec966948b102e14fa /extra/claws-mail | |
| parent | 17816ffb0849295b8a1ee5fecb008f3a26bf0545 (diff) | |
| parent | f186b4cb8562b60dd4e1f5331f248caf547c8839 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-params-util/PKGBUILD
extra/xfce4-mixer/PKGBUILD
kde-unstable/libkcddb/PKGBUILD
staging/xine-lib/PKGBUILD
Diffstat (limited to 'extra/claws-mail')
| -rw-r--r-- | extra/claws-mail/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/claws-mail/buildfix_gnutls3.diff | 18 |
2 files changed, 25 insertions, 4 deletions
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD index 464249d4b..a751fdf49 100644 --- a/extra/claws-mail/PKGBUILD +++ b/extra/claws-mail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146461 2012-01-11 15:21:50Z stephane $ +# $Id: PKGBUILD 161800 2012-06-14 15:33:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=claws-mail pkgver=3.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="A GTK+ based e-mail client." arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -19,11 +19,14 @@ replaces=('sylpheed-claws') provides=('claws') options=(!libtool) install=claws-mail.install -source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2) -md5sums=('df9f1657d7f34959a2205344d952c2e3') +source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2 + buildfix_gnutls3.diff) +md5sums=('df9f1657d7f34959a2205344d952c2e3' + '0c0956755ddcec939d916af35310ee3f') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -Np0 -i ${srcdir}/buildfix_gnutls3.diff sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py diff --git a/extra/claws-mail/buildfix_gnutls3.diff b/extra/claws-mail/buildfix_gnutls3.diff new file mode 100644 index 000000000..1a71ff43a --- /dev/null +++ b/extra/claws-mail/buildfix_gnutls3.diff @@ -0,0 +1,18 @@ +Index: src/common/ssl_certificate.c +=================================================================== +RCS file: //claws/src/common/ssl_certificate.c,v +retrieving revision 1.4.2.40 +retrieving revision 1.4.2.41 +diff -u -r1.4.2.40 -r1.4.2.41 +--- src/common/ssl_certificate.c 30 Aug 2011 06:18:09 -0000 1.4.2.40 ++++ src/common/ssl_certificate.c 16 May 2012 05:43:14 -0000 1.4.2.41 +@@ -686,7 +686,7 @@ + gnutls_x509_privkey * key, + gnutls_x509_crt_t * cert) + { +- gnutls_pkcs12_bag bag = NULL; ++ gnutls_pkcs12_bag_t bag = NULL; + int index = 0; + int ret; + + |