Fix qt5-tools deps missing and hidapi weird bug

2 files changed, 10 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fa93e15be073..16ed86d51a34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,25 @@
 # Generated by makepkg 5.0.1
-# Mon May 15 22:17:12 UTC 2017
+# Tue May 16 08:17:07 UTC 2017
 pkgbase = nitrokey-app
 	pkgdesc = Nitrokey management application
 	pkgver = 1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.nitrokey.com
 	install = nitrokey-app.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
+	makedepends = qt5-tools
 	depends = qt5-base
 	depends = libusb
 	depends = hicolor-icon-theme
+	depends = hidapi
 	source = nitrokey-app-1.1.tar.gz::https://github.com/Nitrokey/nitrokey-app/archive/v1.1.tar.gz
 	source = libnitrokey.tar.gz::https://github.com/Nitrokey/libnitrokey/archive/06c0deb7935a9390a67bc02d6c323e64c785a026.tar.gz
-	source = hidapi.tar.gz::https://github.com/Nitrokey/hidapi/archive/324dc7c0d125f57a06e1107e90e49eb4377bd03c.tar.gz
 	source = cppcodec.tar.gz::https://github.com/tplgy/cppcodec/archive/61d9b044d6644293f99fb87dfadc15dcab951bd9.tar.gz
 	sha256sums = 7501af813721b22c6f859600fd42c7269be60f2da5d0f33cf90e68c19e3f1893
 	sha256sums = acbc4a27cd92d660e44f4f7d9d4b2129ce010e0f5b2deb01a4ffda93c4b6c334
-	sha256sums = 800f8e6da641080308504dfefbfb085165fcc0fe9aaf8ec6063c6d66ea59c1d7
 	sha256sums = 80c2f0ebc0da7186386f525d798bad0eaf14837c9548d86060b503751193b010
 
 pkgname = nitrokey-app
diff --git a/PKGBUILD b/PKGBUILD
index a633c04e5d33..8d67cbc7095e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=nitrokey-app
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 _libnitrokeyver=06c0deb7935a9390a67bc02d6c323e64c785a026
 _hidapiver=324dc7c0d125f57a06e1107e90e49eb4377bd03c
 _cppcodecver=61d9b044d6644293f99fb87dfadc15dcab951bd9
@@ -11,16 +11,14 @@ pkgdesc="Nitrokey management application"
 arch=('i686' 'x86_64')
 url="https://www.nitrokey.com"
 license=('GPL3')
-depends=('qt5-base' 'libusb' 'hicolor-icon-theme')
-makedepends=('cmake')
+depends=('qt5-base' 'libusb' 'hicolor-icon-theme' 'hidapi')
+makedepends=('cmake' 'qt5-tools')
 install=nitrokey-app.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Nitrokey/nitrokey-app/archive/v$pkgver.tar.gz"
         "libnitrokey.tar.gz::https://github.com/Nitrokey/libnitrokey/archive/${_libnitrokeyver}.tar.gz"
-        "hidapi.tar.gz::https://github.com/Nitrokey/hidapi/archive/${_hidapiver}.tar.gz"
         "cppcodec.tar.gz::https://github.com/tplgy/cppcodec/archive/${_cppcodecver}.tar.gz")
 sha256sums=('7501af813721b22c6f859600fd42c7269be60f2da5d0f33cf90e68c19e3f1893'
             'acbc4a27cd92d660e44f4f7d9d4b2129ce010e0f5b2deb01a4ffda93c4b6c334'
-            '800f8e6da641080308504dfefbfb085165fcc0fe9aaf8ec6063c6d66ea59c1d7'
             '80c2f0ebc0da7186386f525d798bad0eaf14837c9548d86060b503751193b010')
 
 prepare() {
@@ -30,15 +28,11 @@ prepare() {
       CMakeLists.txt
 
   rmdir libnitrokey
-  ln -s ../libnitrokey-${_libnitrokeyver} libnitrokey
+  ln -s $srcdir/libnitrokey-${_libnitrokeyver} libnitrokey
 
-  cd libnitrokey
-  rmdir hidapi
-  ln -s ../../hidapi-${_hidapiver} hidapi
-
-  cd ../3rdparty
+  cd 3rdparty
   rmdir cppcodec
-  ln -s ../../cppcodec-${_cppcodecver} cppcodec
+  ln -s $srcdir/cppcodec-${_cppcodecver} cppcodec
 
   cd ../data/icons
   rm -r ubuntu-mono-dark ubuntu-mono-light