From 33da89c808850d15632d45ab241117b6018537bc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 16 Feb 2013 16:20:49 +0100 Subject: [PATCH] avahi: rebuild for -dbg pkgs; disable linking to libssp; cross build support. --- srcpkgs/avahi/avahi-autoipd.template | 7 ----- .../avahi/avahi-compat-libs-devel.template | 7 +---- srcpkgs/avahi/avahi-compat-libs.template | 4 --- srcpkgs/avahi/avahi-discover.template | 4 --- srcpkgs/avahi/avahi-glib-libs-devel.template | 8 ++--- srcpkgs/avahi/avahi-glib-libs.template | 3 -- srcpkgs/avahi/avahi-libs-devel.template | 8 +---- srcpkgs/avahi/avahi-libs.template | 3 -- srcpkgs/avahi/avahi-python-utils.template | 5 +-- srcpkgs/avahi/avahi-python.template | 4 --- srcpkgs/avahi/avahi-ui-libs-devel.template | 7 +---- srcpkgs/avahi/avahi-ui-libs-gtk3.template | 3 -- srcpkgs/avahi/avahi-ui-libs.template | 3 -- srcpkgs/avahi/avahi-ui-utils.template | 3 -- srcpkgs/avahi/template | 31 ++++++++++++------- 15 files changed, 26 insertions(+), 74 deletions(-) diff --git a/srcpkgs/avahi/avahi-autoipd.template b/srcpkgs/avahi/avahi-autoipd.template index 7650ee9325..e44c1bbe97 100644 --- a/srcpkgs/avahi/avahi-autoipd.template +++ b/srcpkgs/avahi/avahi-autoipd.template @@ -2,13 +2,6 @@ # depends="net-tools" short_desc="Avahi IPv4LL network address configuration daemon" -long_desc="${long_desc} - - This tool implements IPv4LL, Dynamic Configuration of IPv4 Link-Local - Addresses (IETF RFC3927), a protocol for automatic IP address configuration - from the link-local 169.254.0.0/16 range without the need for a central - server. It is primarily intended to be used in ad-hoc networks which lack a - DHCP server." do_install() { vmove usr/sbin/avahi-autoipd usr/sbin diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template index b414ccd146..88b3f5cdf9 100644 --- a/srcpkgs/avahi/avahi-compat-libs-devel.template +++ b/srcpkgs/avahi/avahi-compat-libs-devel.template @@ -1,12 +1,7 @@ # Template file for 'avahi-compat-libs-devel'. # depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" -short_desc="Avahi compat libraries (development files)" -long_desc="${long_desc} - - This package contains development files for the HOWL compatibility - libraries provided by Avahi." - +short_desc="Avahi compat libraries -- development files" noarch=yes do_install() { diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template index ddfa5a7bf1..b734e5fdf0 100644 --- a/srcpkgs/avahi/avahi-compat-libs.template +++ b/srcpkgs/avahi/avahi-compat-libs.template @@ -1,10 +1,6 @@ # Template file for 'avahi-compat-libs'. # short_desc="Avahi compatiblity shared libraries" -long_desc="${long_desc} - - This package contains howl/mDNSResponder compatibility shared - libraries provided by Avahi." do_install() { vmove "usr/lib/libhowl.so*" usr/lib diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template index a10ff3a39e..c4433162ec 100644 --- a/srcpkgs/avahi/avahi-discover.template +++ b/srcpkgs/avahi/avahi-discover.template @@ -2,10 +2,6 @@ # depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" short_desc="Service discover user interface for avahi" -long_desc="${long_desc} - - This package contains a user interface for discovering services." - noarch=yes pycompile_module="avahi_discover" diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template index 7d5fb0037e..228658e590 100644 --- a/srcpkgs/avahi/avahi-glib-libs-devel.template +++ b/srcpkgs/avahi/avahi-glib-libs-devel.template @@ -1,15 +1,11 @@ # Template file for 'avahi-glib-libs-devel'. # depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}" -short_desc="Avahi glib libraries (development files)" -long_desc="${long_desc} - - This package contains development files for the glib libraries - provided by Avahi." - +short_desc="Avahi glib libraries -- development files" noarch=yes do_install() { vmove "usr/include/avahi-g*" usr/include vmove "usr/lib/pkgconfig/avahi-g*" usr/lib/pkgconfig + vmove "usr/share/gir-*" usr/share } diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template index 2a09e5bae7..de19e9ae91 100644 --- a/srcpkgs/avahi/avahi-glib-libs.template +++ b/srcpkgs/avahi/avahi-glib-libs.template @@ -1,9 +1,6 @@ # Template file for 'avahi-glib-libs'. # short_desc="Avahi glib shared libraries" -long_desc="${long_desc} - - This package contains the glib shared libraries provided by Avahi." do_install() { vmove "usr/lib/libavahi-glib.so*" usr/lib diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template index 511027d756..e2a5b2901a 100644 --- a/srcpkgs/avahi/avahi-libs-devel.template +++ b/srcpkgs/avahi/avahi-libs-devel.template @@ -1,12 +1,7 @@ # Template file for 'avahi-libs-devel'. # depends="libssp-devel dbus-devel avahi-libs-${version}_${revision}" -short_desc="Avahi core libraries (development files)" -long_desc="${long_desc} - - This package contains development files for the core libraries - provided by Avahi." - +short_desc="Avahi core libraries -- development files" noarch=yes do_install() { @@ -15,5 +10,4 @@ do_install() { done vmove usr/lib/pkgconfig/avahi-core.pc usr/lib/pkgconfig vmove usr/lib/pkgconfig/avahi-client.pc usr/lib/pkgconfig - vmove "usr/share/gir-*" usr/share } diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template index 2790dabe5e..15305855bd 100644 --- a/srcpkgs/avahi/avahi-libs.template +++ b/srcpkgs/avahi/avahi-libs.template @@ -1,9 +1,6 @@ # Template file for 'avahi-libs'. # short_desc="Avahi shared libraries" -long_desc="${long_desc} - - This package contains core shared libraries provided by Avahi." do_install() { vmove "usr/lib/libavahi-client.so*" usr/lib diff --git a/srcpkgs/avahi/avahi-python-utils.template b/srcpkgs/avahi/avahi-python-utils.template index 3b82590e3f..a9e347da0a 100644 --- a/srcpkgs/avahi/avahi-python-utils.template +++ b/srcpkgs/avahi/avahi-python-utils.template @@ -2,10 +2,7 @@ # noarch=yes depends="avahi-python>=$version" -short_desc="Avahi python utils" -long_desc="${long_desc} - - This package contains the python utilities provided by Avahi." +short_desc="Avahi python utilities" do_install() { vmove usr/bin/avahi-bookmarks usr/bin diff --git a/srcpkgs/avahi/avahi-python.template b/srcpkgs/avahi/avahi-python.template index 1156412e6d..31979c764f 100644 --- a/srcpkgs/avahi/avahi-python.template +++ b/srcpkgs/avahi/avahi-python.template @@ -2,10 +2,6 @@ # depends="python dbus-python" short_desc="Python utility package for Avahi" -long_desc="${long_desc} - - This package contains utility modules to talk to Avahi with Python easier." - noarch=yes pycompile_module="avahi" diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template index 7e2872830c..333ed91d9f 100644 --- a/srcpkgs/avahi/avahi-ui-libs-devel.template +++ b/srcpkgs/avahi/avahi-ui-libs-devel.template @@ -3,12 +3,7 @@ depends="gtk+-devel gtk+3-devel avahi-libs-devel-${version}_${revision} avahi-ui-libs-${version}_${revision} avahi-ui-libs-gtk3-${version}_${revision}" -short_desc="Avahi UI libraries (development files)" -long_desc="${long_desc} - - This package contains development files for the UI libraries - provided by Avahi." - +short_desc="Avahi UI libraries -- development files" noarch=yes do_install() { diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template index 159ef2a603..7ca0e09ccd 100644 --- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template +++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template @@ -1,9 +1,6 @@ # Template file for 'avahi-ui-libs-gtk3'. # short_desc="Avahi UI GTK+3 shared libraries" -long_desc="${long_desc} - - This package contains the GTK+3 UI shared libraries provided by Avahi." do_install() { vmove "usr/lib/libavahi-ui-gtk3.so*" usr/lib diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template index fd123e6616..6a447a1067 100644 --- a/srcpkgs/avahi/avahi-ui-libs.template +++ b/srcpkgs/avahi/avahi-ui-libs.template @@ -1,9 +1,6 @@ # Template file for 'avahi-ui-libs'. # short_desc="Avahi UI shared libraries" -long_desc="${long_desc} - - This package contains the UI shared libraries provided by Avahi." do_install() { vmove "usr/lib/libavahi-ui.so*" usr/lib diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template index e99718db11..46b1200fff 100644 --- a/srcpkgs/avahi/avahi-ui-utils.template +++ b/srcpkgs/avahi/avahi-ui-utils.template @@ -2,9 +2,6 @@ # depends="desktop-file-utils avahi>=$version" short_desc="Avahi GTK+ utilities" -long_desc="${long_desc} - - This package contains some small GTK+ utilities to discover services." do_install() { vmove "usr/bin/b*" usr/bin diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index ea9bcb3bc3..9556411cd6 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,7 @@ # Template file for 'avahi' pkgname=avahi version=0.6.31 -revision=8 +revision=9 build_style=gnu-configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl @@ -9,24 +9,17 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi --with-autoipd-group=avahi --with-distro=none --disable-xmltoman --disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system - --disable-static" + --disable-static ssp_cv_lib=no" short_desc="Multicast DNS Service Discovery" maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.avahi.org" distfiles="$homepage/download/avahi-$version.tar.gz" checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 -long_desc=" - Avahi is a fully LGPL framework for Multicast DNS Service Discovery. - It allows programs to publish and discover services and hosts running on a - local network with no specific configuration. For example you can plug into - a network and instantly find printers to print to, files to look at and - people to talk to." depends="dbus" - -makedepends="pkg-config intltool libssp-devel dbus-devel libcap-devel - libdaemon-devel gdbm-devel expat-devel dbus-python pygtk-devel +makedepends="pkg-config intltool dbus-devel libcap-devel + libdaemon-devel gdbm-devel dbus-python pygtk-devel gtk+3-devel>=3.6.0_5 gobject-introspection" # Create avahi and netdev system accounts. @@ -44,3 +37,19 @@ subpackages="avahi-autoipd avahi-discover avahi-compat-libs avahi-compat-libs-de avahi-libs avahi-libs-devel avahi-glib-libs avahi-glib-libs-devel avahi-ui-libs avahi-ui-libs-gtk3 avahi-ui-libs-devel avahi-utils avahi-ui-utils avahi-python-utils avahi-python" + +if [ -n "$XBPS_CROSS_TRIPLET" ]; then + # XXX glib, gtk, introspection and python + makedepends="automake gettext-devel glib-devel pkg-config intltool" + crossmakedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" + subpackages="avahi-autoipd avahi-compat-libs avahi-compat-libs-devel + avahi-libs avahi-libs-devel avahi-utils" + configure_args="${configure_args} --disable-glib --disable-gobject + --disable-gtk --disable-gtk3 --disable-introspection + --disable-python --disable-pygtk + PKG_CONFIG_SYSROOT_DIR=/usr/$XBPS_CROSS_TRIPLET + PKG_CONFIG_LIBDIR=/usr/$XBPS_CROSS_TRIPLET/lib/pkgconfig" + pre_configure() { + autoreconf -fi + } +fi