From 78468630c8913764f1a2852c8069751efba15913 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 25 Oct 2010 22:25:40 +0200 Subject: [PATCH] avahi: update to 0.6.28. --- srcpkgs/avahi/avahi-compat-libs-devel.template | 2 -- srcpkgs/avahi/avahi-compat-libs.template | 2 -- srcpkgs/avahi/avahi-discover.template | 2 -- srcpkgs/avahi/avahi-glib-libs-devel.template | 2 -- srcpkgs/avahi/avahi-glib-libs.template | 2 -- srcpkgs/avahi/avahi-libs-devel.template | 5 ++--- srcpkgs/avahi/avahi-libs.template | 2 -- srcpkgs/avahi/avahi-ui-libs-devel.template | 2 -- srcpkgs/avahi/avahi-ui-libs.template | 4 ++-- srcpkgs/avahi/avahi-ui-utils.template | 4 ++-- srcpkgs/avahi/gir-avahi.template | 12 ++++++++++++ srcpkgs/avahi/template | 9 ++++----- srcpkgs/gir-avahi | 1 + 13 files changed, 23 insertions(+), 26 deletions(-) create mode 100644 srcpkgs/avahi/gir-avahi.template create mode 120000 srcpkgs/gir-avahi diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template index 07c3364bb00..4f554fd2d99 100644 --- a/srcpkgs/avahi/avahi-compat-libs-devel.template +++ b/srcpkgs/avahi/avahi-compat-libs-devel.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains development files for the HOWL compatibility libraries provided by Avahi." -revision=1 - Add_dependency run avahi-libs-devel Add_dependency run avahi-compat-libs diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template index 8a3f99531f5..c062b3cfb21 100644 --- a/srcpkgs/avahi/avahi-compat-libs.template +++ b/srcpkgs/avahi/avahi-compat-libs.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains howl/mDNSResponder compatibility shared libraries provided by Avahi." -revision=1 - Add_dependency run glibc Add_dependency run libssp Add_dependency run dbus-libs diff --git a/srcpkgs/avahi/avahi-discover.template b/srcpkgs/avahi/avahi-discover.template index 0cb7fde7be5..53c4d558fe8 100644 --- a/srcpkgs/avahi/avahi-discover.template +++ b/srcpkgs/avahi/avahi-discover.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains a user interface for discovering services." -revision=1 - Add_dependency run avahi Add_dependency run python Add_dependency run avahi-python diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template index 01f3da12ab9..63a6f58148c 100644 --- a/srcpkgs/avahi/avahi-glib-libs-devel.template +++ b/srcpkgs/avahi/avahi-glib-libs-devel.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains development files for the glib libraries provided by Avahi." -revision=1 - Add_dependency run glibc-devel Add_dependency run avahi-libs-devel Add_dependency run glib-devel diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template index 891201b6d34..1452d3219de 100644 --- a/srcpkgs/avahi/avahi-glib-libs.template +++ b/srcpkgs/avahi/avahi-glib-libs.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains the glib shared libraries provided by Avahi." -revision=2 - Add_dependency run glibc Add_dependency run libssp Add_dependency run dbus-libs diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template index 39b3e660251..cc663d467cc 100644 --- a/srcpkgs/avahi/avahi-libs-devel.template +++ b/srcpkgs/avahi/avahi-libs-devel.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains development files for the core libraries provided by Avahi." -revision=2 - Add_dependency run glibc-devel Add_dependency run libssp-devel Add_dependency run dbus-devel @@ -15,7 +13,7 @@ Add_dependency run avahi-libs do_install() { - mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include + mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/{share,include} for f in common client core; do mv ${SRCPKGDESTDIR}/usr/include/avahi-${f} \ @@ -27,4 +25,5 @@ do_install() ${DESTDIR}/usr/lib/pkgconfig mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/avahi-client.pc \ ${DESTDIR}/usr/lib/pkgconfig + mv ${SRCPKGDESTDIR}/usr/share/gir-* ${DESTDIR}/usr/share } diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template index ad59ee25ef4..380ab8be27c 100644 --- a/srcpkgs/avahi/avahi-libs.template +++ b/srcpkgs/avahi/avahi-libs.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains core shared libraries provided by Avahi." -revision=1 - Add_dependency run glibc Add_dependency run libssp Add_dependency run dbus-libs diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template index 38f7b9a2eb8..c0c79c26c38 100644 --- a/srcpkgs/avahi/avahi-ui-libs-devel.template +++ b/srcpkgs/avahi/avahi-ui-libs-devel.template @@ -6,8 +6,6 @@ long_desc="${long_desc} This package contains development files for the UI libraries provided by Avahi." -revision=1 - Add_dependency run glibc-devel Add_dependency run avahi-libs-devel Add_dependency run gtk+-devel diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template index 6bb8219f7e8..02fb7eb2f84 100644 --- a/srcpkgs/avahi/avahi-ui-libs.template +++ b/srcpkgs/avahi/avahi-ui-libs.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains the UI shared libraries provided by Avahi." -revision=2 - Add_dependency run glibc Add_dependency run avahi-libs Add_dependency run dbus-libs @@ -18,6 +16,8 @@ Add_dependency run cairo Add_dependency run freetype Add_dependency run fontconfig Add_dependency run libssp +Add_dependency run gdk-pixbuf +Add_dependency run libpng Add_dependency run gtk+ Add_dependency run gdbm diff --git a/srcpkgs/avahi/avahi-ui-utils.template b/srcpkgs/avahi/avahi-ui-utils.template index d0f3ef5d48d..613fccd3cd3 100644 --- a/srcpkgs/avahi/avahi-ui-utils.template +++ b/srcpkgs/avahi/avahi-ui-utils.template @@ -5,9 +5,9 @@ long_desc="${long_desc} This package contains some small GTK+ utilities to discover services." -revision=2 - Add_dependency run libglade +Add_dependency run gdk-pixbuf +Add_dependency run libpng Add_dependency run gtk+ Add_dependency run libxml2 Add_dependency run atk diff --git a/srcpkgs/avahi/gir-avahi.template b/srcpkgs/avahi/gir-avahi.template new file mode 100644 index 00000000000..f0fdae33a09 --- /dev/null +++ b/srcpkgs/avahi/gir-avahi.template @@ -0,0 +1,12 @@ +# Template file for 'gir-avahi'. +# +short_desc="Introspection data for Avahi" +long_desc="${long_desc} + + This package contains small pieces of introspection data for Avahi." + +do_install() +{ + install -d ${DESTDIR}/usr/lib + mv ${SRCPKGDESTDIR}/usr/lib/girepository-1.0 ${DESTDIR}/usr/lib +} diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 610bcf6cfc8..dda310c62ed 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -1,7 +1,6 @@ # Template file for 'avahi' pkgname=avahi -version=0.6.25 -revision=5 +version=0.6.28 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz" build_style=gnu_configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc @@ -9,10 +8,10 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi --with-avahi-priv-access-group=netdev --with-autoipd-user=avahi --with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman - --disable-dbm --localstatedir=/var" + --disable-dbm --localstatedir=/var --disable-gtk3" short_desc="Multicast DNS Service Discovery" maintainer="Juan RP " -checksum=9220d974f5515b8ccfa3900cd72cedcac0fa4cc87ca3c64405f7c55346cbba59 +checksum=a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91 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 @@ -31,7 +30,7 @@ subpackages="$subpackages $pkgname-libs-devel $pkgname-glib-libs" subpackages="$subpackages $pkgname-glib-libs-devel $pkgname-ui-libs" subpackages="$subpackages $pkgname-ui-libs-devel $pkgname-utils" subpackages="$subpackages $pkgname-ui-utils $pkgname-python-utils" -subpackages="$subpackages $pkgname-python" +subpackages="$subpackages $pkgname-python gir-$pkgname" Add_dependency run glibc Add_dependency run dbus diff --git a/srcpkgs/gir-avahi b/srcpkgs/gir-avahi new file mode 120000 index 00000000000..3d497a72746 --- /dev/null +++ b/srcpkgs/gir-avahi @@ -0,0 +1 @@ +avahi \ No newline at end of file