diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-14 13:43:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-05-14 13:43:46 +0000 |
| commit | 06d09d0b0c143d259aca764d9bce716d920f87fd (patch) | |
| tree | 30d357cd093091c47a892f024bdfcac49ed467be /main/avahi | |
| parent | 1ccaf329a21c08d0b585a1a0797a040e7fd40d45 (diff) | |
| download | aports-06d09d0b0c143d259aca764d9bce716d920f87fd.tar.bz2 aports-06d09d0b0c143d259aca764d9bce716d920f87fd.tar.xz | |
main/avahi: remove ui tools to break circular deps
We currently have circular dependency avahi -> gtk -> cups -> avahi
We drop building the gtk tools to break this and can build those in
separate package.
Diffstat (limited to 'main/avahi')
| -rw-r--r-- | main/avahi/APKBUILD | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/main/avahi/APKBUILD b/main/avahi/APKBUILD index 7d0856ef6f..34ebfbd98c 100644 --- a/main/avahi/APKBUILD +++ b/main/avahi/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=5 +pkgrel=6 pkgdesc="A multicast/unicast DNS-SD framework" url="http://www.avahi.org/" arch="all" license="LGPL2+" depends="" -depends_dev="gtk+-dev gdbm-dev" -makedepends="py-gtk-dev py-dbus-dev intltool gobject-introspection-dev expat-dev - libdaemon-dev glib-dev dbus-dev libcap-dev gdbm-dev gtk+-dev py-gdbm" +depends_dev="gdbm-dev" +makedepends="py-dbus-dev intltool gobject-introspection-dev expat-dev + libdaemon-dev glib-dev dbus-dev libcap-dev gdbm-dev py-gdbm" install="$pkgname.pre-install" pkgusers="avahi" pkggroups="avahi" -subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-ui-tools:uitools - $pkgname-glib $pkgname-ui $pkgname-libs $pkgname-compat-howl:howl +subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-glib + $pkgname-libs $pkgname-compat-howl:howl $pkgname-compat-libdns_sd:lidns_sd $pkgname-lang" patches="initscripts.patch musl-fix.patch" @@ -43,10 +43,12 @@ build() { --disable-autoipd \ --disable-qt3 \ --disable-qt4 \ + --disable-gtk \ --disable-gtk3 \ --disable-mono \ --disable-monodoc \ --disable-doxygen-doc \ + --disable-pygtk \ --disable-xmltoman \ --enable-compat-libdns_sd \ --enable-compat-howl \ @@ -80,17 +82,6 @@ tools() { "$subpkgdir"/usr/bin/ } -uitools() { - pkgdesc="UI tools for mDNS browsing" - depends="py-gtk py-dbus py-gdbm" - mkdir -p "$subpkgdir"/usr/bin - cd "$pkgdir"/usr/bin - mv avahi-bookmarks avahi-discover avahi-discover-standalone b* \ - "$subpkgdir"/usr/bin/ - install -D -m 644 "$srcdir"/gnome-nettool.png \ - "$subpkgdir"/usr/share/pixmaps/gnome-nettool.png -} - glib() { pkgdesc="Glib libraries and GObject wrapper for avahi" mkdir -p "$subpkgdir"/usr/lib @@ -99,13 +90,6 @@ glib() { "$subpkgdir"/usr/lib/ } -ui() { - pkgdesc="Gtk user interface library for Avahi" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libavahi-ui.so.* \ - "$subpkgdir"/usr/lib/ -} - libs() { pkgdesc="Libraries for avahi run-time use" mkdir -p "$subpkgdir"/usr/lib |