Correct building; remove Makefile patch

3 files changed, 42 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ee46691d0a4..d27e413109b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Apr  3 02:41:15 UTC 2016
+# Fri Sep 22 22:29:20 UTC 2017
 pkgbase = armory-git
 	pkgdesc = Full-featured Bitcoin wallet management application
-	pkgver = v0.94.1.r0.gc8a5963
+	pkgver = v0.96.3.r0.g2b65ac06
 	pkgrel = 1
 	url = https://github.com/goatpig/BitcoinArmory
 	install = armory-git.install
@@ -14,9 +14,9 @@ pkgbase = armory-git
 	makedepends = make
 	depends = crypto++
 	depends = swig
-	depends = python2
-	depends = twisted
 	depends = qt4
+	depends = python2
+	depends = python2-twisted
 	depends = python2-pyqt4
 	depends = python2-bsddb
 	depends = python2-psutil
@@ -25,10 +25,8 @@ pkgbase = armory-git
 	conflicts = armory
 	source = armory-git::git+https://github.com/goatpig/BitcoinArmory.git
 	source = run-armory.sh
-	source = makefile-01.patch
 	sha256sums = SKIP
 	sha256sums = 4b8ab285588ec07601fb4d9580b84e11a513635a102d92ee7c283261d0b6c0dc
-	sha256sums = 5091c0e66bba8bb2daff320224dc3643279d2d5e014ac52a880b7e20ee67dd91
 
 pkgname = armory-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 443af5467c70..027cbf23c05f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,66 @@
 # Maintainer: Jonathan la Cour <jon@lacour.me>
 # Contributor: Pieter Kokx <pieter@kokx.nl>
+# Contributor: Patrick Glandien <patrick@synix.io>
 pkgname=armory-git
-pkgver=v0.94.1.r0.gc8a5963
+pkgver=v0.96.3.r0.g2b65ac06
 pkgrel=1
 pkgdesc="Full-featured Bitcoin wallet management application"
 arch=('i686' 'x86_64')
 url="https://github.com/goatpig/BitcoinArmory"
 license=('AGPL3')
-depends=('crypto++' 'swig' 'python2' 'twisted' 'qt4' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
+depends=('crypto++' 'swig' 'qt4' 'python2' 'python2-twisted' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
 makedepends=('git' 'gcc' 'make')
 optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
 install="${pkgname}.install"
 provides=('armory')
 conflicts=('armory')
 source=("$pkgname"::'git+https://github.com/goatpig/BitcoinArmory.git'
-        'run-armory.sh'
-        'makefile-01.patch')
+        'run-armory.sh')
 noextract=()
 sha256sums=('SKIP'
-            '4b8ab285588ec07601fb4d9580b84e11a513635a102d92ee7c283261d0b6c0dc'
-            '5091c0e66bba8bb2daff320224dc3643279d2d5e014ac52a880b7e20ee67dd91')
+            '4b8ab285588ec07601fb4d9580b84e11a513635a102d92ee7c283261d0b6c0dc')
 
 pkgver() {
-    cd "$srcdir/$pkgname"
-    git describe --tags --long $(git rev-list --tags --max-count=1) | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+  cd "$srcdir/$pkgname"
+  git describe --tags --long $(git rev-list --tags --max-count=1) | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd "$srcdir/$pkgname"
+
+  git submodule update --init
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver}  ./autogen.sh
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-    patch -p0 -i $srcdir/makefile-01.patch
-    make
+  cd "$srcdir/$pkgname"
+
+  ## Get Python2 Version
+  _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
+  _py2ver=${_py2longver%.*}
+  PYTHON_VERSION=${_py2ver} ./configure
+
+  ## Build using current python2 version
+  PYTHON_VERSION=${_py2ver} make -j"${nproc}"
 }
 
 package() {
-    install -Dm644 "$srcdir/$pkgname/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
-    install -Dm644 "$srcdir/$pkgname/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
-    install -Dm644 "$srcdir/$pkgname/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
-    install -Dm644 "$srcdir/$pkgname/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
-    install -Dm644 "$srcdir/$pkgname/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+  install -Dm644 "$srcdir/$pkgname/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/$pkgname/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/$pkgname/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/$pkgname/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/$pkgname/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
 
-    install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
+  install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
 
-    mkdir -p "$pkgdir/opt"
-    cp -R "$srcdir/$pkgname/" "$pkgdir/opt/"
+  mkdir -p "$pkgdir/opt"
+  cp -R "$srcdir/$pkgname/" "$pkgdir/opt/"
 
-    rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
-    rm -rf "$pkgdir/opt/$pkgname/.git/"
-    rm -rf "$pkgdir/opt/$pkgname/.gitignore"
+  rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
+  rm -rf "$pkgdir/opt/$pkgname/.git/"
+  rm -rf "$pkgdir/opt/$pkgname/.gitignore"
 }
diff --git a/makefile-01.patch b/makefile-01.patch
deleted file mode 100644
index 8c1e24070102..000000000000
--- a/makefile-01.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cppForSwig/Makefile 2015-02-21 17:03:39.480800425 -0700
-+++ cppForSwig/Makefilex        2015-02-21 17:04:25.097329717 -0700
-@@ -33,12 +33,7 @@
-        libcryptopp.a mdb.o midl.o txio.o
- 
- #if python is specified, use it
--ifndef PYVER
--PYVER=python
--PYTHON_INCLUDES=$(shell python-config --includes )
--else
--PYTHON_INCLUDES=$(shell $(PYVER)-config --includes )
--endif
-+PYTHON_INCLUDES=$(shell python2.7-config --includes )
- 
- CPPFLAGS += $(ARMORY_CPPFLAGS) -Icryptopp -Imdb -DUSE_CRYPTOPP -D__STDC_LIMIT_MACROS
- LDLIBS += -lpthread -Lmdb
\ No newline at end of file