summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉtienne Deparis2018-06-04 18:33:21 +0200
committerÉtienne Deparis2018-06-04 18:33:21 +0200
commitc24126d0344563d53d4304db43b418c33f354357 (patch)
tree5af44fccee48d3d4deca9248c8838e7ec1b21347
parent9a9a39810dfd0af8a10b9473f62cea61cba435d4 (diff)
downloadaur-c24126d0344563d53d4304db43b418c33f354357.tar.gz
Fix build with Qt5.11
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a47892583aaf..66f4aac18845 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
-# Generated by makepkg 5.0.2
-# Tue Apr 24 08:18:06 UTC 2018
+# Generated by makepkg 5.1.0
+# Mon Jun 4 16:32:53 UTC 2018
pkgbase = nitrokey-app
pkgdesc = Nitrokey management application
pkgver = 1.3
- pkgrel = 3
+ pkgrel = 4
url = https://www.nitrokey.com
install = nitrokey-app.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 42c98fac1a57..3ce809fabb7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=nitrokey-app
pkgver=1.3
-pkgrel=3
+pkgrel=4
_cppcodecver=61d9b044d6644293f99fb87dfadc15dcab951bd9
pkgdesc="Nitrokey management application"
arch=('i686' 'x86_64')
@@ -25,6 +25,12 @@ prepare() {
sed -i 's|libnitrokey/LICENSE|/usr/share/licenses/libnitrokey/LICENSE|' \
resources.qrc
+ # Patch for Qt5.11. See https://github.com/Nitrokey/nitrokey-app/issues/361#issuecomment-394345354
+ sed -i '/#include "stick20changepassworddialog.h"/ i #include <QStyle>' \
+ src/ui/stick20changepassworddialog.cpp
+ sed -i '/#include <QDateTime>/ i #include <QStyle>' \
+ src/ui/stick20responsedialog.cpp
+
cd 3rdparty
rmdir cppcodec
ln -s $srcdir/cppcodec-${_cppcodecver} cppcodec