From c1d00d62d58a884ce5be1d030803cae4de4e7b83 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 3 Mar 2016 18:25:32 +0100 Subject: [PATCH] loudmouth: update to 1.5.3. Upstream dead, move to version maintained by only using project: mcabber. --- .../01_use_pkg-config_for_gnutls.patch | 23 ------------------- .../patches/02_glib_single_include.patch | 15 ------------ srcpkgs/loudmouth/template | 22 ++++++++---------- 3 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch delete mode 100644 srcpkgs/loudmouth/patches/02_glib_single_include.patch diff --git a/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch b/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch deleted file mode 100644 index 7a1e32a53aa..00000000000 --- a/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch +++ /dev/null @@ -1,23 +0,0 @@ -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# ---- configure.ac 2009-08-16 20:29:36.000000000 +0200 -+++ 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 - diff --git a/srcpkgs/loudmouth/patches/02_glib_single_include.patch b/srcpkgs/loudmouth/patches/02_glib_single_include.patch deleted file mode 100644 index d76275694ee..00000000000 --- a/srcpkgs/loudmouth/patches/02_glib_single_include.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix build failure with glib 2.32 where including individual glib headers is no longer allowed. -Author: Michael Biebl -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576 ---- loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 -+++ loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200 -@@ -19,7 +19,7 @@ - */ - - #include --#include -+#include - #include "lm-error.h" - - /** - diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index c90ffb482f1..6755981fbc5 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -1,23 +1,22 @@ -# template file for 'loudmouth' - +# Template file for 'loudmouth' pkgname="loudmouth" -version="1.4.3" -revision=9 +version="1.5.3" +revision=1 build_style=gnu-configure configure_args="--with-ssl=openssl --with-asyncns" short_desc="A lightweight Jabber client library written in C/Glib" +hostmakedepends="pkg-config automake libtool glib-devel gtk-doc" +makedepends="libglib-devel libidn-devel libressl-devel" maintainer="Lukas Epple " license="LGPL-2" -homepage="https://groups.google.com/forum/#!forum/loudmouth-dev" -distfiles="$GNOME_SITE/loudmouth/${version%.*}/loudmouth-${version}.tar.bz2" -checksum="95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" - -makedepends="libglib-devel libidn-devel libressl-devel" -hostmakedepends="pkg-config automake libtool glib-devel gtk-doc" +homepage="https://github.com/mcabber/loudmouth" +distfiles="https://github.com/mcabber/${pkgname}/archive/${version}.tar.gz" +checksum=12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 pre_configure() { # Disable tests sed -i '/SUBDIRS/s,tests,,g' Makefile.am + gtkdocize autoreconf -fi } @@ -28,7 +27,6 @@ loudmouth-devel_package() { vmove usr/include vmove usr/lib/*.a vmove usr/lib/*.so - vmove usr/lib/pkgconfig/ - vmove usr/share/gtk-doc + vmove usr/lib/pkgconfig } }