From 8f660d9a98eee1da829c0cf97dad2bbf3b9704cc Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 12:06:36 +0100 Subject: [PATCH 1/6] New package: loudmouth --- srcpkgs/loudmouth-devel | 1 + srcpkgs/loudmouth-libs | 1 + .../01_use_pkg-config_for_gnutls.patch | 23 ++++++++++ .../patches/02_glib_single_include.patch | 15 +++++++ srcpkgs/loudmouth/patches/series | 2 + srcpkgs/loudmouth/template | 42 +++++++++++++++++++ 6 files changed, 84 insertions(+) create mode 120000 srcpkgs/loudmouth-devel create mode 120000 srcpkgs/loudmouth-libs create mode 100644 srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch create mode 100644 srcpkgs/loudmouth/patches/02_glib_single_include.patch create mode 100644 srcpkgs/loudmouth/patches/series create mode 100644 srcpkgs/loudmouth/template diff --git a/srcpkgs/loudmouth-devel b/srcpkgs/loudmouth-devel new file mode 120000 index 00000000000..7f406e2c864 --- /dev/null +++ b/srcpkgs/loudmouth-devel @@ -0,0 +1 @@ +loudmouth \ No newline at end of file diff --git a/srcpkgs/loudmouth-libs b/srcpkgs/loudmouth-libs new file mode 120000 index 00000000000..7f406e2c864 --- /dev/null +++ b/srcpkgs/loudmouth-libs @@ -0,0 +1 @@ +loudmouth \ No newline at end of file diff --git a/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch b/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch new file mode 100644 index 00000000000..7a1e32a53aa --- /dev/null +++ b/srcpkgs/loudmouth/patches/01_use_pkg-config_for_gnutls.patch @@ -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# +--- 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 new file mode 100644 index 00000000000..d76275694ee --- /dev/null +++ b/srcpkgs/loudmouth/patches/02_glib_single_include.patch @@ -0,0 +1,15 @@ +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/patches/series b/srcpkgs/loudmouth/patches/series new file mode 100644 index 00000000000..3460cd86f46 --- /dev/null +++ b/srcpkgs/loudmouth/patches/series @@ -0,0 +1,2 @@ +01_use_pkg-config_for_gnutls.patch +02_glib_single_include.patch diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template new file mode 100644 index 00000000000..3f56863a7da --- /dev/null +++ b/srcpkgs/loudmouth/template @@ -0,0 +1,42 @@ +# template file for 'loudmouth' + +pkgname="loudmouth" +_majorver="1.4" +version="${_majorver}.3" +revision=1 +build_style=gnu-configure +short_desc="A lightweight Jabber client library written in C/Glib" +maintainer="Lukas Epple " +license="LGPL" +homepage="https://groups.google.com/forum/#!forum/loudmouth-dev" +distfiles="http://ftp.gnome.org/pub/gnome/sources/loudmouth/${_majorver}/loudmouth-${version}.tar.bz2" +checksum="95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" + +depends="glib gnutls libidn" +makedepends="gnutls-devel" +hostmakedepends="pkg-config autoconf automake libtool gnutls-tools glib-devel gtk-doc gnutls" + +pre_configure() { + libtoolize --force + aclocal + autoconf + automake --add-missing +} + +loudmouth-devel_package() { + depends+="loudmouth-libs>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/include" + vmove "usr/lib/*.a" + vmove "usr/lib/pkgconfig/" + vmove "usr/share/gtk-doc" + } +} + +loudmouth-libs_package() { + short_desc+=" - shared libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} From c3d6996d61f58d13dca5df9dac8f55b9c8a6a07c Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 12:28:23 +0100 Subject: [PATCH 2/6] loudmouth: renamed useless subpackage --- srcpkgs/loudmouth-libs | 1 - srcpkgs/loudmouth/template | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 120000 srcpkgs/loudmouth-libs diff --git a/srcpkgs/loudmouth-libs b/srcpkgs/loudmouth-libs deleted file mode 120000 index 7f406e2c864..00000000000 --- a/srcpkgs/loudmouth-libs +++ /dev/null @@ -1 +0,0 @@ -loudmouth \ No newline at end of file diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 3f56863a7da..b5352e7ff64 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -34,8 +34,7 @@ loudmouth-devel_package() { } } -loudmouth-libs_package() { - short_desc+=" - shared libraries" +loudmouth_package() { pkg_install() { vmove "usr/lib/*.so*" } From 19455f522f7f7101cfd13a625c46adec21ee86eb Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 12:28:49 +0100 Subject: [PATCH 3/6] loudmouth: cleanup and optimazations as suggested by @xtraeme --- srcpkgs/loudmouth/template | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index b5352e7ff64..cf651d46088 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -1,30 +1,25 @@ # template file for 'loudmouth' pkgname="loudmouth" -_majorver="1.4" -version="${_majorver}.3" +version="1.4.3" revision=1 build_style=gnu-configure short_desc="A lightweight Jabber client library written in C/Glib" maintainer="Lukas Epple " -license="LGPL" +license="LGPL-2" homepage="https://groups.google.com/forum/#!forum/loudmouth-dev" -distfiles="http://ftp.gnome.org/pub/gnome/sources/loudmouth/${_majorver}/loudmouth-${version}.tar.bz2" +distfiles="$GNOME_SITE/loudmouth/${version%.*}/loudmouth-${version}.tar.bz2" checksum="95a93f5d009b71ea8193d994aa11f311bc330a3efe1b7cd74dc48f11c7f929e3" -depends="glib gnutls libidn" makedepends="gnutls-devel" -hostmakedepends="pkg-config autoconf automake libtool gnutls-tools glib-devel gtk-doc gnutls" +hostmakedepends="pkg-config automake libtool gnutls-tools glib-devel gtk-doc" pre_configure() { - libtoolize --force - aclocal - autoconf - automake --add-missing + autoreconf -fi } loudmouth-devel_package() { - depends+="loudmouth-libs>=${version}_${revision}" + depends+="loudmouth>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/include" From 407441180a49639fac81eb5a993987cb91a860b6 Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 12:40:14 +0100 Subject: [PATCH 4/6] loudmouth: removed unnecessary subpackage --- srcpkgs/loudmouth/template | 6 ------ 1 file changed, 6 deletions(-) diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index cf651d46088..8d6d1817cc0 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -28,9 +28,3 @@ loudmouth-devel_package() { vmove "usr/share/gtk-doc" } } - -loudmouth_package() { - pkg_install() { - vmove "usr/lib/*.so*" - } -} From 9bca92c866b053ed9259cc427b14828733c7c69a Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 13:02:37 +0100 Subject: [PATCH 5/6] loudmouth: cleanup --- srcpkgs/loudmouth/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 8d6d1817cc0..ca3bc9f45d2 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -22,9 +22,10 @@ loudmouth-devel_package() { depends+="loudmouth>=${version}_${revision}" short_desc+=" - development files" pkg_install() { - vmove "usr/include" - vmove "usr/lib/*.a" - vmove "usr/lib/pkgconfig/" - vmove "usr/share/gtk-doc" + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.so + vmove usr/lib/pkgconfig/ + vmove usr/share/gtk-doc } } From 27fb0253b06fe75ba283d2e19984ae1a4d593a06 Mon Sep 17 00:00:00 2001 From: lukasepple Date: Sat, 6 Dec 2014 13:03:09 +0100 Subject: [PATCH 6/6] loudmouth: unneeded series removed --- srcpkgs/loudmouth/patches/series | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 srcpkgs/loudmouth/patches/series diff --git a/srcpkgs/loudmouth/patches/series b/srcpkgs/loudmouth/patches/series deleted file mode 100644 index 3460cd86f46..00000000000 --- a/srcpkgs/loudmouth/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -01_use_pkg-config_for_gnutls.patch -02_glib_single_include.patch