[arch-commits] Commit in loudmouth/trunk (04-use-pkg-config-for-gnutls.patch PKGBUILD)
Jan de Groot
jgc at archlinux.org
Tue Jul 20 13:06:39 UTC 2010
Date: Tuesday, July 20, 2010 @ 09:06:39
Author: jgc
Revision: 85820
Change URL. Leave debug options as default (FS#10153), fix build with new GNUTLS
Added:
loudmouth/trunk/04-use-pkg-config-for-gnutls.patch
Modified:
loudmouth/trunk/PKGBUILD
------------------------------------+
04-use-pkg-config-for-gnutls.patch | 23 +++++++++++++++++++++++
PKGBUILD | 30 +++++++++++++++++-------------
2 files changed, 40 insertions(+), 13 deletions(-)
Added: 04-use-pkg-config-for-gnutls.patch
===================================================================
--- 04-use-pkg-config-for-gnutls.patch (rev 0)
+++ 04-use-pkg-config-for-gnutls.patch 2010-07-20 13:06:39 UTC (rev 85820)
@@ -0,0 +1,23 @@
+Description: use pkg-config to detect gnutls
+Debian: http://bugs.debian.org/529835
+Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
+
+--- a/configure.ac.orig 2009-08-16 20:29:36.000000000 +0200
++++ b/configure.ac 2009-08-16 20:30:43.000000000 +0200
+@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+ dnl Look for GnuTLS
+- AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+- if test "x$have_libgnutls" = "xyes"; then
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
++ PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
++ if test "x$have_gnutls" = "xyes"; then
++ AC_SUBST(ASYNCNS_CFLAGS)
++ AC_SUBST(ASYNCNS_LIBS)
++ CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
++ LIBS="$LIBS $GNUTLS_LIBS"
+ AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+ enable_ssl=GnuTLS
+ else
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-07-20 10:29:40 UTC (rev 85819)
+++ PKGBUILD 2010-07-20 13:06:39 UTC (rev 85820)
@@ -1,25 +1,29 @@
# $Id: PKGBUILD,v 1.3 2003/11/06 08:27:17 dorphell Exp
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
# Contributor: Brice Carpentier <brice.carpentier at orange.fr>
pkgname=loudmouth
pkgver=1.4.3
-pkgrel=1
+pkgrel=2
pkgdesc="A lightweight Jabber client library written in C/Glib"
arch=('i686' 'x86_64')
license=('LGPL')
-url="http://developer.imendio.com/wiki/Loudmouth"
-depends=('glib2>=2.18.3' 'gnutls>=2.6.3' 'libidn')
+url="http://groups.google.com/group/loudmouth-dev"
+depends=('glib2>=2.24.1' 'gnutls>=2.8.6' 'libidn>=1.16')
options=('!libtool')
-makedepends=('perlxml' 'pkgconfig')
-source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('55339ca42494690c3942ee1465a96937')
+makedepends=('intltool' 'pkgconfig')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+ 04-use-pkg-config-for-gnutls.patch)
+md5sums=('55339ca42494690c3942ee1465a96937'
+ 'bffb25b9551df43255fe1706588582f3')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --disable-debug \
- --disable-static || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
+ libtoolize --force
+ autoreconf
+ ./configure --prefix=/usr --disable-static
+ make
+ make DESTDIR="${pkgdir}" install
}
More information about the arch-commits
mailing list