New git revision (r27347.2d928ee05)

2 files changed, 13 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0556fc042d9d..6d8d91065994 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Thu Aug 23 00:30:25 UTC 2018
 pkgbase = gnunet-git
 	pkgdesc = A framework for secure peer-to-peer networking
-	pkgver = 0.11.0
+	pkgver = 0.11.0.r27347.2d928ee05
 	pkgrel = 1
 	url = http://gnunet.org
 	install = gnunet.install
@@ -13,21 +11,24 @@ pkgbase = gnunet-git
 	makedepends = autoconf
 	makedepends = fakeuser-git
 	makedepends = bluez-libs
-	makedepends = python2
+	makedepends = python
 	makedepends = glpk
 	makedepends = libpulse
 	makedepends = opus
+	depends = gmp
+	depends = libgcrypt
 	depends = libextractor
 	depends = sqlite
 	depends = gnurl
 	depends = libmicrohttpd
+	depends = libunistring
+	depends = libidn
 	depends = jansson
 	optdepends = bluez-libs
-	optdepends = python2
+	optdepends = python
 	optdepends = glpk
 	optdepends = libpulse
 	optdepends = opus
-	optdepends = python2-zbar
 	provides = gnunet
 	conflicts = gnunet
 	options = !makeflags
diff --git a/PKGBUILD b/PKGBUILD
index 7cef698f6634..9aad61af8acb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='gnunet-git'
 _appname='gnunet'
-pkgver='0.11.0'
+pkgver='0.11.0.r27347.2d928ee05'
 pkgrel=1
 pkgdesc="A framework for secure peer-to-peer networking"
 arch=('x86_64')
@@ -14,16 +14,15 @@ url="http://gnunet.org"
 license=('GPL')
 provides=("${_appname}")
 conflicts=("${_appname}")
-depends=('libextractor' 'sqlite' 'gnurl'
-	 'libmicrohttpd' 'jansson')
+depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'gnurl'
+	 'libmicrohttpd' 'libunistring' 'libidn' 'jansson')
 makedepends=('gettext' 'pkgconfig' 'autoconf' 'fakeuser-git'
-	     'bluez-libs' 'python2' 'glpk' 'libpulse' 'opus')
+	     'bluez-libs' 'python' 'glpk' 'libpulse' 'opus')
 optdepends=('bluez-libs'
-	    'python2'
+	    'python'
 	    'glpk'
 	    'libpulse'
-	    'opus'
-	    'python2-zbar')
+	    'opus')
 install='gnunet.install'
 backup=('etc/gnunetd.conf')
 options=('!makeflags')
@@ -36,9 +35,6 @@ md5sums=('SKIP'
 
 _fakeadd_error() {
 
-	echo "NOTE: makepkg -R is not supported because it does not load libfakeuser."
-	echo "      If pass -R, you will always see the following error message."
-	echo
 	echo "You must have a 'gnunet' user and group, and additionally a 'gnunetdns' group in"
 	echo 'your system prior to building this package.'
 	echo
@@ -65,14 +61,6 @@ pkgver() {
 prepare() {
 
 	cd "${srcdir}/${_appname}"
-
-
-	# zbar (required by gnunet-qr) only has bindings for python2, so we have to use python2
-	# Not sure whether other parts of Gnunet fully support Python v3.0. It does build with v3.
-	# NOTE: can't override in aclocal.m4 (that file is autogenerated)
-	_redefine_py="m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python2])"
-	sed -i "0,/^AM_PATH_PYTHON.*/s/^AM_PATH_PYTHON.*/$_redefine_py\n&/" configure.ac
-
 	autoreconf -fi
 	sed -i 's|contrib doc|doc|' Makefile.*
 	[ -f Makefile ] || ./configure --prefix=/usr \