From 3959ad74657a321ff16a0cfa4b92aa3ede4cfa61 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 13 Apr 2013 13:28:05 +0200 Subject: [PATCH] avahi: finish splitting of avahi glib/gtk/python functionality. --- srcpkgs/avahi-glib-libs | 2 +- srcpkgs/avahi-glib-libs-devel | 2 +- srcpkgs/avahi-python | 2 +- srcpkgs/avahi-python-utils | 2 +- srcpkgs/avahi-ui-libs | 2 +- srcpkgs/avahi-ui-libs-devel | 2 +- srcpkgs/avahi-ui-libs-gtk3 | 2 +- srcpkgs/avahi-ui-utils | 2 +- srcpkgs/avahi/template | 137 +++++----------------------------- 9 files changed, 27 insertions(+), 126 deletions(-) diff --git a/srcpkgs/avahi-glib-libs b/srcpkgs/avahi-glib-libs index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-glib-libs +++ b/srcpkgs/avahi-glib-libs @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-glib-libs-devel b/srcpkgs/avahi-glib-libs-devel index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-glib-libs-devel +++ b/srcpkgs/avahi-glib-libs-devel @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-python b/srcpkgs/avahi-python index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-python +++ b/srcpkgs/avahi-python @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-python-utils b/srcpkgs/avahi-python-utils index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-python-utils +++ b/srcpkgs/avahi-python-utils @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-ui-libs b/srcpkgs/avahi-ui-libs index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-ui-libs +++ b/srcpkgs/avahi-ui-libs @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-ui-libs-devel b/srcpkgs/avahi-ui-libs-devel index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-ui-libs-devel +++ b/srcpkgs/avahi-ui-libs-devel @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-ui-libs-gtk3 b/srcpkgs/avahi-ui-libs-gtk3 index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-ui-libs-gtk3 +++ b/srcpkgs/avahi-ui-libs-gtk3 @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi-ui-utils b/srcpkgs/avahi-ui-utils index 3d497a72746..19fb54cd099 120000 --- a/srcpkgs/avahi-ui-utils +++ b/srcpkgs/avahi-ui-utils @@ -1 +1 @@ -avahi \ No newline at end of file +avahi-discover \ No newline at end of file diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 74c45b1c379..cb59ebff24d 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -9,7 +9,9 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --with-avahi-priv-access-group=network --with-autoipd-user=avahi --with-autoipd-group=avahi --with-distro=none --disable-xmltoman --disable-dbm --with-systemdsystemunitdir=/usr/lib/systemd/system - --disable-static ssp_cv_lib=no" + --disable-static ssp_cv_lib=no --disable-python --disable-pygtk + --disable-glib --disable-gobject --disable-gtk --disable-gtk3 + --disable-introspection" short_desc="Multicast DNS Service Discovery" maintainer="Juan RP " license="LGPL-2.1" @@ -18,114 +20,15 @@ distfiles="$homepage/download/avahi-$version.tar.gz" checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 hostmakedepends="pkg-config intltool" -makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel dbus-python pygtk-devel - gtk+3-devel>=3.6.0_5 gobject-introspection" +makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" if [ "$CROSS_BUILD" ]; then - # XXX glib, gtk, introspection and python hostmakedepends+=" automake gettext-devel glib-devel intltool" - makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" - configure_args+=" --disable-glib --disable-gobject - --disable-gtk --disable-gtk3 --disable-introspection - --disable-python --disable-pygtk" pre_configure() { autoreconf -fi } fi -# XXX disabled packages in cross builds. -if [ -z "$CROSS_BUILD" ]; then - -avahi-discover_package() { - depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" - short_desc="Service discover user interface for avahi" - noarch=yes - pycompile_module="avahi_discover" - pkg_install() { - vmove usr/bin/avahi-discover - vmove "usr/share/man/man1/avahi-discover*" - vmove usr/share/applications/avahi-discover.desktop - vmove usr/lib/python2.7/site-packages/avahi_discover - vmove usr/share/avahi/interfaces/avahi-discover.ui - } -} - -avahi-glib-libs_package() { - short_desc="Avahi glib shared libraries" - pkg_install() { - vmove "usr/lib/libavahi-glib.so*" - vmove "usr/lib/libavahi-gobject.so*" - vmove "usr/lib/girepository*" - } -} - -avahi-glib-libs-devel_package() { - depends="avahi-libs-devel-${version}_${revision} avahi-glib-libs-${version}_${revision}" - short_desc="Avahi glib libraries -- development files" - pkg_install() { - vmove "usr/include/avahi-g*" - vmove "usr/lib/pkgconfig/avahi-g*" - vmove "usr/share/gir-*" - } -} - -avahi-ui-libs_package() { - short_desc="Avahi UI shared libraries" - pkg_install() { - vmove "usr/lib/libavahi-ui.so*" - } -} - -avahi-ui-libs-gtk3_package() { - short_desc="Avahi UI GTK+3 shared libraries" - pkg_install() { - vmove "usr/lib/libavahi-ui-gtk3.so*" - } -} - -avahi-ui-libs-devel_package() { - 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" - pkg_install() { - vmove "usr/include/avahi-ui*" - vmove usr/lib/pkgconfig - } -} - -avahi-ui-utils_package() { - depends="desktop-file-utils avahi>=$version" - short_desc="Avahi GTK+ utilities" - pkg_install() { - vmove "usr/bin/b*" usr/bin - vmove "usr/share/man/man1/b*" - vmove usr/share/applications - vmove usr/bin/avahi-discover-standalone - } -} - -avahi-python-utils_package() { - noarch=yes - depends="avahi-python>=$version" - short_desc="Avahi python utilities" - pkg_install() { - vmove usr/bin/avahi-bookmarks - vmove "usr/share/man/man1/avahi-bookmarks*" - } -} - -avahi-python_package() { - depends="python dbus-python" - short_desc="Python utility package for Avahi" - noarch=yes - pycompile_module="avahi" - pkg_install() { - vmove "usr/lib/python*" - } -} - -fi # !CROSS_BUILD - avahi-autoipd_package() { depends="net-tools" short_desc="Avahi IPv4LL network address configuration daemon" @@ -136,14 +39,6 @@ avahi-autoipd_package() { } } -avahi-compat-libs_package() { - short_desc="Avahi compatiblity shared libraries" - pkg_install() { - vmove "usr/lib/libhowl.so*" - vmove "usr/lib/libdns_sd.so*" - } -} - avahi-compat-libs-devel_package() { depends="avahi-libs-devel-${version}_${revision} avahi-compat-libs-${version}_${revision}" short_desc="Avahi compat libraries -- development files" @@ -153,12 +48,11 @@ avahi-compat-libs-devel_package() { } } -avahi-libs_package() { - short_desc="Avahi shared libraries" +avahi-compat-libs_package() { + short_desc="Avahi compatiblity shared libraries" pkg_install() { - vmove "usr/lib/libavahi-client.so*" - vmove "usr/lib/libavahi-core.so*" - vmove "usr/lib/libavahi-common.so*" + vmove "usr/lib/libhowl.so*" + vmove "usr/lib/libdns_sd.so*" } } @@ -174,13 +68,20 @@ avahi-libs-devel_package() { } } +avahi-libs_package() { + short_desc="Avahi shared libraries" + pkg_install() { + vmove "usr/lib/libavahi-client.so*" + vmove "usr/lib/libavahi-core.so*" + vmove "usr/lib/libavahi-common.so*" + } +} + avahi-utils_package() { short_desc="Avahi browsing, publishing and discovery utilities" pkg_install() { - for f in browse publish resolve set-host-name; do - vmove "usr/bin/avahi-${f}*" - vmove "usr/share/man/man1/avahi-${f}*" - done + vmove usr/bin + vmove usr/share/man/man1 } }