ausweisapp2 1.14.0-1: New version

2 files changed, 23 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf8df4e85b25..3da4b8b2e1b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
 # Generated by mksrcinfo v8
-# Fri Sep 15 18:10:19 UTC 2017
+# Sat Dec 23 12:56:51 UTC 2017
 pkgbase = ausweisapp2
 	pkgdesc = A software application that you install on your computer to use your national identity card or your electronic residence permit for online identification
-	pkgver = 1.12.2
+	pkgver = 1.14.0
 	pkgrel = 1
 	url = https://www.ausweisapp.bund.de/ausweisapp2-home/
 	arch = i686
 	arch = x86_64
 	license = custom:EUPL1.2
 	makedepends = cmake
-	makedepends = python2
-	depends = libgl
+	makedepends = qt5-connectivity
+	makedepends = qt5-tools
+	makedepends = qt5-translations
+	depends = qt5-svg
+	depends = qt5-websockets
 	depends = pcsclite
-	depends = libxkbcommon-x11
-	noextract = qt-everywhere-opensource-src-5.8.0.tar.xz
-	noextract = openssl-1.0.2k.tar.gz
-	source = https://github.com/Governikus/AusweisApp2/releases/download/1.12.2/AusweisApp2-1.12.2.tar.gz
-	source = https://github.com/Governikus/AusweisApp2/releases/download/1.12.2/AusweisApp2-1.12.2.tar.gz.asc
-	source = https://download.qt.io/official_releases/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.xz
-	source = https://www.openssl.org/source/openssl-1.0.2k.tar.gz
-	sha256sums = b1d0daacd5ad1daefde8b2e125e3f2c024130e74ea7541728f26ffd700837c82
+	source = https://github.com/Governikus/AusweisApp2/releases/download/1.14.0/AusweisApp2-1.14.0.tar.gz
+	source = https://github.com/Governikus/AusweisApp2/releases/download/1.14.0/AusweisApp2-1.14.0.tar.gz.asc
+	sha256sums = 72db292bb5b2c45349c5e4038a265850f7b0106638ec65e916367f70812e0d4c
 	sha256sums = SKIP
-	sha256sums = 0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6
-	sha256sums = 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 
 pkgname = ausweisapp2
 
diff --git a/PKGBUILD b/PKGBUILD
index e94775426bc9..b5e2e0c4374a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,35 @@
 # Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
 
 pkgname=ausweisapp2
-pkgver=1.12.2
+pkgver=1.14.0
 pkgrel=1
 pkgdesc="A software application that you install on your computer to use your national identity card or your electronic residence permit for online identification"
 arch=('i686' 'x86_64')
 license=('custom:EUPL1.2')
 url="https://www.ausweisapp.bund.de/ausweisapp2-home/"
-depends=('libgl' 'pcsclite' 'libxkbcommon-x11')
-makedepends=('cmake' 'python2')
-source=("https://github.com/Governikus/AusweisApp2/releases/download/${pkgver}/AusweisApp2-${pkgver}.tar.gz"{,.asc}
-        "https://download.qt.io/official_releases/qt/5.8/5.8.0/single/qt-everywhere-opensource-src-5.8.0.tar.xz"
-        "https://www.openssl.org/source/openssl-1.0.2k.tar.gz")
-noextract=("qt-everywhere-opensource-src-5.8.0.tar.xz"
-           "openssl-1.0.2k.tar.gz")
+depends=('qt5-svg' 'qt5-websockets' 'pcsclite')
+makedepends=('cmake' 'qt5-connectivity' 'qt5-tools' 'qt5-translations')
+source=("https://github.com/Governikus/AusweisApp2/releases/download/${pkgver}/AusweisApp2-${pkgver}.tar.gz"{,.asc})
 validpgpkeys=('699BF3055B0A49224EFDE7C72D7479A531451088')
-sha256sums=('b1d0daacd5ad1daefde8b2e125e3f2c024130e74ea7541728f26ffd700837c82'
-            'SKIP'
-            '0f4c54386d3dbac0606a936a7145cebb7b94b0ca2d29bc001ea49642984824b6'
-            '6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0')
+sha256sums=('72db292bb5b2c45349c5e4038a265850f7b0106638ec65e916367f70812e0d4c'
+            'SKIP')
 
 build() {
-  mkdir -p "${srcdir}/Toolchain" "${srcdir}/Build"
-
-  cd "${srcdir}/Toolchain"
-  msg2 "Building toolchain"
-  cmake -DCMAKE_BUILD_TYPE=RELEASE -DPACKAGES_DIR="${srcdir}" "${srcdir}/AusweisApp2-${pkgver}/libs"
-  make
+  mkdir -p "${srcdir}/Build"
 
   cd "${srcdir}/Build"
-  msg2 "Building AusweisApp2"
-  cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_PREFIX_PATH="${srcdir}/Toolchain/dist" "${srcdir}/AusweisApp2-${pkgver}"
+  cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/opt/AusweisApp2 "${srcdir}/AusweisApp2-${pkgver}"
   make
 }
 
 package() {
   cd "${srcdir}/Build"
 
-  make install
-  install -dm755 "${pkgdir}/opt" "${pkgdir}/usr/bin"
-  cp -a dist "${pkgdir}/opt/AusweisApp2"
+  make install DESTDIR="${pkgdir}"
+  install -dm755 "${pkgdir}/usr/bin"
+  # fwr the translation directory is expected to be located right next to the application binary
+  ln -s "/opt/AusweisApp2/translations" "${pkgdir}/opt/AusweisApp2/bin/"
+  ln -s "/opt/AusweisApp2/bin/AusweisApp2" "${pkgdir}/usr/bin/"
   mv "${pkgdir}/opt/AusweisApp2/share" "${pkgdir}/usr/share"
-  sed -i '/^Exec=/cExec=/usr/bin/AusweisApp2' "${pkgdir}/usr/share/applications/AusweisApp2.desktop"
-  echo -e '[Paths]\nPrefix=..' > "${pkgdir}/opt/AusweisApp2/bin/qt.conf"
-  install -Dt "${pkgdir}/opt/AusweisApp2/lib" -m755 "${srcdir}/Toolchain/dist/lib/"*.so*
-  cp -a "${srcdir}/Toolchain/dist/plugins" "${pkgdir}/opt/AusweisApp2/"
-  install -t "${pkgdir}/opt/AusweisApp2/translations" -m644 "${srcdir}/Toolchain/dist/translations/"qt*.qm
-  echo -e '#!/usr/bin/env sh\nexport LD_LIBRARY_PATH="/opt/AusweisApp2/lib:${LD_LIBRARY_PATH}"\n/opt/AusweisApp2/bin/AusweisApp2' > "${pkgdir}/usr/bin/AusweisApp2"
-  chmod 755 "${pkgdir}/usr/bin/AusweisApp2"
   install -Dm644 "${srcdir}/AusweisApp2-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
 }