[arch-commits] Commit in claws-mail/trunk (PKGBUILD buildfix_gnutls3.diff)

[andyrtr at archlinux.org]

    Date: Thursday, June 14, 2012 @ 11:33:01
  Author: andyrtr
Revision: 161799

upgpkg: claws-mail 3.8.0-3

fix build with recent gnutls; FS#30292

Added:
  claws-mail/trunk/buildfix_gnutls3.diff
Modified:
  claws-mail/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    9 ++++++---
 buildfix_gnutls3.diff |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-14 14:46:00 UTC (rev 161798)
+++ PKGBUILD	2012-06-14 15:33:01 UTC (rev 161799)
@@ -3,7 +3,7 @@
 
 pkgname=claws-mail
 pkgver=3.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -19,11 +19,14 @@
 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
 

Added: buildfix_gnutls3.diff
===================================================================
--- buildfix_gnutls3.diff	                        (rev 0)
+++ buildfix_gnutls3.diff	2012-06-14 15:33:01 UTC (rev 161799)
@@ -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;
+ 
+