avahi: update to 0.7.4

1 files changed, 33 insertions, 19 deletions

diff --git a/abs/core/avahi/PKGBUILD b/abs/core/avahi/PKGBUILD
index 5aa2247..68d5751 100644
--- a/abs/core/avahi/PKGBUILD
+++ b/abs/core/avahi/PKGBUILD
@@ -4,39 +4,46 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
-pkgver=0.6.32
-pkgrel=2
-_commit=4f334990f692ce08ab4ea2eece695f1592f535b2
+pkgver=0.7
+pkgrel=4
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
-arch=(i686 x86_64)
+arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git qt4 pygtk mono intltool python2-dbus gtk-sharp-2 gobject-introspection gtk3
-             xmltoman)
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+makedepends=(git qt4 pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3
+             xmltoman python-dbus python-gobject doxygen graphviz)
+optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
             'qt4: qt4 bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
+            'pygtk: avahi-bookmarks'
             'python2-twisted: avahi-bookmarks'
             'mono: mono bindings'
-            'python2-dbus: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-install=avahi.install
+            'nss-mdns: NSS support for mDNS'
+            'python-gobject: avahi-discover'
+            'python-dbus: avahi-discover')
 backup=(etc/avahi/{hosts,avahi-daemon.conf}
-        usr/lib/avahi/service-types.db usr/share/avahi/service-types)
-source=("git+$url#commit=$_commit")
-sha256sums=('SKIP')
+        usr/lib/avahi/service-types.db)
+_commit=6242e5f0fe001b7de2ccaa9431db279b2ee76b83  # tags/v0.7
+source=("git+https://github.com/lathiat/avahi#commit=$_commit"
+        0001-avahi-python-Use-the-agnostic-DBM-interface.patch)
+sha512sums=('SKIP'
+            '8cfc7c2cb0061e6348caa96b73bb6069efce5b4438962aa12448e46bc950a47c1f18059afbb1cacf7b2a1aa21f77025472532ad5e6eddb17834a8b1a34432226')
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
   cd $pkgname
+  patch -Np1 -i ../0001-avahi-python-Use-the-agnostic-DBM-interface.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
-  export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python2
+  export MOC_QT4=/usr/bin/moc-qt4 PYTHON=/usr/bin/python3
 
   ./configure \
     --prefix=/usr \
@@ -51,19 +58,25 @@ build() {
     --with-autoipd-user=avahi \
     --with-autoipd-group=avahi \
     --with-systemdsystemunitdir=/usr/lib/systemd/system
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-  cp -a avahi-python/avahi avahi-python/avahi3
+  cp -a avahi-python/avahi avahi-python/avahi2
 
   make
-  make -C avahi-python/avahi3 PYTHON=/usr/bin/python2
+  make -C avahi-python/avahi2 PYTHON=/usr/bin/python2
 }
 
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" -C avahi-python/avahi3 install \
+  make DESTDIR="$pkgdir" -C avahi-python/avahi2 install \
     PYTHON=/usr/bin/python2 pythondir=/usr/lib/python2.7/site-packages
 
+  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"
 
@@ -72,5 +85,6 @@ package() {
   mv "$pkgdir"/etc/avahi/services/{,sftp-}ssh.service \
     "$pkgdir/usr/share/doc/$pkgname/"
 
-  rmdir "$pkgdir"/var{/run,}
+  echo 'u avahi - "Avahi mDNS/DNS-SD daemon"' |
+    install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 }