2 files changed, 27 insertions, 15 deletions
diff --git a/desktop/nitrokey-app/nitrokey-app.SlackBuild b/desktop/nitrokey-app/nitrokey-app.SlackBuild
index 1812e3678b..037e4b3f0a 100644
--- a/desktop/nitrokey-app/nitrokey-app.SlackBuild
+++ b/desktop/nitrokey-app/nitrokey-app.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for nitrokey-app
 
@@ -23,14 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=nitrokey-app
 
-VERSION=${VERSION:-1.3.1}
-LIBVERSION=${LIBVERSION:-3.3}
-CODECVERSION=${CODECVERSION:-61d9b044d6644293f99fb87dfadc15dcab951bd9}
+VERSION=${VERSION:-1.4.2}
+LIBVERSION=${LIBVERSION:-3.6}
+CODECVERSION=${CODECVERSION:-0.2}
 
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -40,7 +43,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,7 +83,7 @@ tar xvf $CWD/libnitrokey-$LIBVERSION.tar.gz
 mv libnitrokey-$LIBVERSION libnitrokey
 
 rmdir 3rdparty/cppcodec
-unzip $CWD/cppcodec-$CODECVERSION.zip
+tar xvf $CWD/cppcodec-$CODECVERSION.tar.gz
 mv cppcodec-$CODECVERSION 3rdparty/cppcodec
 
 chown -R root:root .
@@ -95,6 +105,8 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
+mv $PKG/usr/lib $PKG/lib
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -108,4 +120,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/nitrokey-app/nitrokey-app.info b/desktop/nitrokey-app/nitrokey-app.info
index 2da11ae6a5..3e92bf0850 100644
--- a/desktop/nitrokey-app/nitrokey-app.info
+++ b/desktop/nitrokey-app/nitrokey-app.info
@@ -1,14 +1,14 @@
 PRGNAM="nitrokey-app"
-VERSION="1.3.1"
+VERSION="1.4.2"
 HOMEPAGE="https://www.nitrokey.com/"
-DOWNLOAD="https://github.com/Nitrokey/nitrokey-app/archive/v1.3.1/nitrokey-app-1.3.1.tar.gz \
-          https://github.com/Nitrokey/libnitrokey/archive/v3.3/libnitrokey-3.3.tar.gz \
-          https://github.com/Nitrokey/cppcodec/archive/61d9b04/cppcodec-61d9b044d6644293f99fb87dfadc15dcab951bd9.zip"
-MD5SUM="28e1b33b75777dda74ed4335d929393b \
-        c4801581c540c420517762601bd1c71d \
-        29d201707eb38dbee180dd21a71cbae9"
+DOWNLOAD="https://github.com/Nitrokey/nitrokey-app/archive/v1.4.2/nitrokey-app-1.4.2.tar.gz \
+          https://github.com/Nitrokey/libnitrokey/archive/v3.6/libnitrokey-3.6.tar.gz \
+          https://github.com/tplgy/cppcodec/archive/v0.2/cppcodec-0.2.tar.gz"
+MD5SUM="b8db205c3a33c8260e837c19941b435c \
+        3b96912b9a99280db9382150f4c552f8 \
+        6394122488de6154a9d78b1b62105354"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5 hidapi"
+REQUIRES="hidapi"
 MAINTAINER="Felipe Bugno"
 EMAIL="capent@yahoo.com"