Update to current version available in [Extra].

2 files changed, 15 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f89aa96b0c49..fadb8d00fa63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,29 @@
 pkgbase = lib32-avahi
 	pkgdesc = Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour (32-bit)
-	pkgver = 0.7+18+g1b5f401
+	pkgver = 0.8+15+ge8a3dd0
 	pkgrel = 1
 	url = https://github.com/lathiat/avahi
 	arch = x86_64
 	license = LGPL
-	makedepends = gcc-multilib
 	makedepends = git
 	makedepends = gobject-introspection
-	makedepends = gtk-sharp-2
-	makedepends = intltool
-	makedepends = lib32-gtk2
+	makedepends = libevent
+	makedepends = lib32-libevent
 	makedepends = lib32-gtk3
-	makedepends = pygtk
 	makedepends = python-dbus
 	makedepends = python-gobject
-	makedepends = mono
 	makedepends = xmltoman
 	depends = avahi
 	depends = expat
+	depends = lib32-dbus
 	depends = lib32-gdbm
 	depends = lib32-glib2
 	depends = lib32-libcap
 	depends = lib32-libdaemon
-	depends = lib32-dbus
 	optdepends = lib32-gtk3: gtk3 bindings
-	optdepends = lib32-gtk2: gtk2 bindings
+	optdepends = lib32-libevent: libevent bindings
 	options = !emptydirs
-	source = git+https://github.com/lathiat/avahi#tag=1b5f401f64d7bed40c4335b0327acf4125da3086
+	source = git+https://github.com/lathiat/avahi#tag=e8a3dd0d480a754318e312e6fa66fea249808187
 	sha256sums = SKIP
 
 pkgname = lib32-avahi
diff --git a/PKGBUILD b/PKGBUILD
index 4474dd89339d..32b1c53808c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,24 @@
 # Contributor: Douglas Soares de Andrade <douglas at archlinux dot org>
 
 pkgname=lib32-avahi
-pkgver=0.7+18+g1b5f401
+pkgver=0.8+15+ge8a3dd0
 pkgrel=1
 pkgdesc='Service Discovery for Linux using mDNS/DNS-SD -- compatible with Bonjour (32-bit)'
 arch=('x86_64')
 url='https://github.com/lathiat/avahi'
 license=('LGPL')
-depends=("${pkgname#lib32-}" 'expat' 'lib32-gdbm' 'lib32-glib2' 'lib32-libcap' 'lib32-libdaemon' 'lib32-dbus')
-makedepends=('gcc-multilib' 'git' 'gobject-introspection' 'gtk-sharp-2' 'intltool' 'lib32-gtk2' 'lib32-gtk3'
-             'pygtk' 'python-dbus' 'python-gobject' 'mono' 'xmltoman')
+depends=("${pkgname#lib32-}" 'expat' 'lib32-dbus' 'lib32-gdbm' 'lib32-glib2' 'lib32-libcap' 'lib32-libdaemon')
+makedepends=('git' 'gobject-introspection' 'libevent' 'lib32-libevent'
+             'lib32-gtk3' 'python-dbus' 'python-gobject' 'xmltoman')
 optdepends=('lib32-gtk3: gtk3 bindings'
-            'lib32-gtk2: gtk2 bindings')
+            'lib32-libevent: libevent bindings')
 options=(!emptydirs)
-_commit=1b5f401f64d7bed40c4335b0327acf4125da3086  # pull/115/merge~2
+_commit=e8a3dd0d480a754318e312e6fa66fea249808187  # master
 source=("git+$url#tag=$_commit")
 sha256sums=('SKIP')
 
 prepare() {
   cd ${pkgname#lib32-}
-  # CVE-2017-6519 CVE-2018-100084
-  git cherry-pick -n e111def44a7df4624a4aa3f85fe98054bffb6b4f
   NOCONFIGURE=1 ./autogen.sh
 }
 
@@ -40,8 +38,6 @@ build() {
   export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
 #  export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
 
-  export PYTHON=/usr/bin/python3
-
   cd ${pkgname#lib32-}
   ./configure \
     --build=i686-pc-linux-gnu \
@@ -50,14 +46,14 @@ build() {
     --localstatedir=/var \
     --sbindir=/usr/bin \
     --libdir=/usr/lib32 \
-    --disable-monodoc \
-    --disable-qt4 \
+    --disable-mono \
     --disable-qt5 \
     --enable-compat-libdns_sd \
     --with-distro=archlinux \
     --with-avahi-priv-access-group=network \
     --with-autoipd-user=avahi \
     --with-autoipd-group=avahi \
+    --with-dbus-sys=/usr/share/dbus-1/system.d \
     --with-systemdsystemunitdir=/usr/lib/systemd/system 
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   
@@ -69,5 +65,5 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # Remove conflicting files.
-  rm -rf "${pkgdir}"/{etc,usr/{share,lib,include,bin,lib32/mono}}
+  rm -rf "${pkgdir}"/{etc,usr/{share,lib,include,bin}}
 }