summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD34
2 files changed, 25 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c1596add4a39..264c44879612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = avahi-git
pkgdesc = Multicast DNS-SD / Zeroconf Suite git master
- pkgver = 0.6.32.rc.r7.g916f65b
+ pkgver = v0.7.r59.g4a5454f
pkgrel = 1
url = http://www.avahi.org/
install = avahi.install
@@ -8,16 +8,19 @@ pkgbase = avahi-git
arch = x86_64
license = LGPL
makedepends = git
- makedepends = qt4
+ makedepends = qt5-base
makedepends = pygtk
makedepends = mono
makedepends = intltool
- makedepends = python2-dbus
+ makedepends = expat
+ makedepends = dbus
makedepends = gtk-sharp-2
makedepends = gobject-introspection
makedepends = gtk3
makedepends = xmltoman
makedepends = python-dbus
+ makedepends = nss-mdns
+ makedepends = python-gobject
depends = expat
depends = libdaemon
depends = glib2
@@ -26,7 +29,8 @@ pkgbase = avahi-git
depends = dbus
optdepends = gtk3: avahi-discover-standalone, bshell, bssh, bvnc
optdepends = gtk2: gtk2 bindings
- optdepends = qt4: qt4 bindings
+ optdepends = pygtk
+ optdepends = qt5-base: qt bindings
optdepends = pygtk: avahi-bookmarks, avahi-discover
optdepends = python2-twisted: avahi-bookmarks
optdepends = mono: mono bindings
diff --git a/PKGBUILD b/PKGBUILD
index d384cfaa0505..64584389c33f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer: Grey Christoforo <first name [at] last name [dot] net>
pkgname=avahi-git
-pkgver=0.6.32.rc.r7.g916f65b
+pkgver=v0.7.r59.g4a5454f
pkgrel=1
pkgdesc='Multicast DNS-SD / Zeroconf Suite git master'
url='http://www.avahi.org/'
license=(LGPL)
arch=(i686 x86_64)
depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git qt4 pygtk mono intltool python2-dbus gtk-sharp-2 gobject-introspection gtk3
- xmltoman python-dbus)
+makedepends=(git qt5-base pygtk mono intltool expat dbus gtk-sharp-2 gobject-introspection gtk3 xmltoman python-dbus nss-mdns python-gobject)
optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
'gtk2: gtk2 bindings'
- 'qt4: qt4 bindings'
+ 'pygtk'
+ 'qt5-base: qt bindings'
'pygtk: avahi-bookmarks, avahi-discover'
'python2-twisted: avahi-bookmarks'
'mono: mono bindings'
@@ -40,42 +40,42 @@ prepare() {
build() {
cd avahi
- export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python2
./configure \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/bin \
+ with_dbus_sys=/usr/share/dbus-1/system.d \
--disable-monodoc \
- --disable-qt3 \
+ --disable-qt4 \
--enable-compat-libdns_sd \
- --enable-compat-howl \
--with-distro=archlinux \
--with-avahi-priv-access-group=network \
--with-autoipd-user=avahi \
--with-autoipd-group=avahi \
--with-systemdsystemunitdir=/usr/lib/systemd/system
- cp -a avahi-python/avahi avahi-python/avahi3
-
make
- make -C avahi-python/avahi3 PYTHON=/usr/bin/python3
}
package() {
cd avahi
make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
- PYTHON=/usr/bin/python3 pythondir=/usr/lib/python3.5/site-packages
- # howl compat
- ln -s avahi-compat-howl "$pkgdir/usr/include/howl"
- ln -s avahi-compat-howl.pc "$pkgdir/usr/lib/pkgconfig/howl.pc"
+ rmdir "$pkgdir/run"
+
+ # this isn't ported
+ sed -i '1s|python3|python2|' "$pkgdir/usr/bin/avahi-bookmarks"
# mdnsresponder compat
ln -s avahi-compat-libdns_sd/dns_sd.h "$pkgdir/usr/include/dns_sd.h"
- # see FS#42638
- ln -s avahi-daemon.service "$pkgdir/usr/lib/systemd/system/dbus-org.freedesktop.Avahi.service"
+ # move example services https://bugs.archlinux.org/task/47822
+ install -d "$pkgdir/usr/share/doc/$pkgname"
+ mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \
+ "$pkgdir/usr/share/doc/$pkgname/"
+
+ echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
}