[arch-commits] Commit in avahi/trunk (PKGBUILD)

[Jan Steffens]

    Date: Tuesday, February 18, 2020 @ 13:46:11
  Author: heftig
Revision: 375788

0.8+6+g751be80-1

Modified:
  avahi/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-18 13:11:27 UTC (rev 375787)
+++ PKGBUILD	2020-02-18 13:46:11 UTC (rev 375788)
@@ -3,27 +3,29 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=avahi
-pkgver=0.7+18+g1b5f401
-pkgrel=3
+pkgver=0.8+6+g751be80
+pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour'
 url='https://github.com/lathiat/avahi'
 license=(LGPL)
 arch=(x86_64)
 depends=(expat libdaemon glib2 libcap gdbm dbus)
-makedepends=(git pygtk mono intltool gtk-sharp-2 gobject-introspection gtk3 qt5-base
-             xmltoman python-dbus python-gobject doxygen graphviz)
+makedepends=(git pygtk gobject-introspection gtk3 qt5-base xmltoman python-dbus
+             python-gobject doxygen graphviz libevent)
 optdepends=('gtk3: avahi-discover, avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
             'qt5-base: qt5 bindings'
+            'libevent: libevent bindings'
+            'nss-mdns: NSS support for mDNS'
             'pygtk: avahi-bookmarks'
-            'python2-twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'nss-mdns: NSS support for mDNS'
-            'python-gobject: avahi-discover'
-            'python-dbus: avahi-discover')
+            'python-twisted: avahi-bookmarks'
+            'python-gobject: avahi-bookmarks, avahi-discover'
+            'python-dbus: avahi-bookmarks, avahi-discover')
+provides=(libavahi-client.so libavahi-common.so libavahi-core.so
+          libavahi-glib.so libavahi-gobject.so libavahi-libevent.so
+          libavahi-qt5.so libavahi-ui-gtk3.so libdns_sd.so)
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
         usr/lib/avahi/service-types.db)
-_commit=1b5f401f64d7bed40c4335b0327acf4125da3086  # pull/115/merge~2
+_commit=751be804e891aec5701a059144e2f5cbfc981b36  # master
 source=("git+https://github.com/lathiat/avahi#commit=$_commit")
 sha512sums=('SKIP')
 
@@ -34,16 +36,11 @@
 
 prepare() {
   cd $pkgname
-
-  # CVE-2017-6519 CVE-2018-100084
-  git cherry-pick -n e111def44a7df4624a4aa3f85fe98054bffb6b4f
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
   cd $pkgname
-  export PYTHON=/usr/bin/python3
 
   ./configure \
     --prefix=/usr \
@@ -51,8 +48,7 @@
     --localstatedir=/var \
     --sbindir=/usr/bin \
     with_dbus_sys=/usr/share/dbus-1/system.d \
-    --disable-monodoc \
-    --disable-qt4 \
+    --disable-mono \
     --enable-compat-libdns_sd \
     --with-distro=archlinux \
     --with-avahi-priv-access-group=network \
@@ -61,23 +57,17 @@
     --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/avahi2
-
   make
-  make -C avahi-python/avahi2 PYTHON=/usr/bin/python2
 }
 
 package() {
+  depends+=(libdbus-1.so)
+
   cd $pkgname
   make DESTDIR="$pkgdir" 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"