update 4.0.0.23

3 files changed, 112 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..0f8611b739cb
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,30 @@
+pkgbase = qdigidoc4
+	pkgdesc = DigiDoc4 Client is an application for digitally signing and encrypting documents; the software includes functionality to manage Estonian ID-card - change pin codes, update certificates etc.
+	pkgver = 4.0.0.23
+	pkgrel = 1
+	url = http://www.id.ee/
+	arch = x86_64
+	arch = i686
+	license = LGPL2.1
+	makedepends = cmake
+	makedepends = qt5-tools
+	makedepends = qt5-translations
+	depends = libdigidocpp>=3.13.6
+	depends = opensc>=0.18.0
+	depends = qt5-base
+	depends = qt5-svg
+	depends = shared-mime-info
+	depends = ccid
+	depends = hicolor-icon-theme
+	depends = desktop-file-utils
+	provides = qdigidoc
+	provides = qesteidutil
+	conflicts = qdigidoc
+	conflicts = qesteidutil
+	source = https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc4/qdigidoc4_4.0.0.23.orig.tar.xz
+	source = qdigidoc4_4.0.0.23-qt5.11.patch
+	sha256sums = e2ed6f0bad477a2fa8f8b3d7cb4fa1c2b72ed4c65afa1dea72c3df445341a959
+	sha256sums = b6c71e40d0b8b91597f95f05b42c6c148027223fbc13fa714e0039ad6e39a9d2
+
+pkgname = qdigidoc4
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..cf3cf1a2ab7f
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: kevku <kevku@gmx.com>
+pkgname=qdigidoc4
+pkgver=4.0.0.23
+pkgrel=1
+pkgdesc="DigiDoc4 Client is an application for digitally signing and encrypting documents; the software includes functionality to manage Estonian ID-card - change pin codes, update certificates etc."
+arch=('x86_64' 'i686')
+url="http://www.id.ee/"
+license=('LGPL2.1')
+depends=('libdigidocpp>=3.13.6' 'opensc>=0.18.0' 'qt5-base' 'qt5-svg' 'shared-mime-info' 'ccid' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('cmake' 'qt5-tools' 'qt5-translations')
+conflicts=('qdigidoc' 'qesteidutil')
+provides=('qdigidoc' 'qesteidutil')
+source=("https://installer.id.ee/media/ubuntu/pool/main/q/$pkgname/${pkgname}_$pkgver.orig.tar.xz"
+        "qdigidoc4_4.0.0.23-qt5.11.patch")
+sha256sums=('e2ed6f0bad477a2fa8f8b3d7cb4fa1c2b72ed4c65afa1dea72c3df445341a959'
+            'b6c71e40d0b8b91597f95f05b42c6c148027223fbc13fa714e0039ad6e39a9d2')
+
+prepare() {
+  [[ -d "$pkgname-build" ]] && rm -r "$pkgname-build"
+  mkdir "$pkgname-build"
+  sed -i 's|#{ENV\["BUILD_NUMBER"\]}|23|g' cmake/modules/VersionInfo.cmake
+  patch -p1 -i "$srcdir/qdigidoc4_4.0.0.23-qt5.11.patch"
+}
+
+build() {
+  cd "$pkgname-build"
+  cmake .. -DCMAKE_C_FLAGS:STRING="${CFLAGS} -ffile-prefix-map=$srcdir=." \
+           -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS} -ffile-prefix-map=$srcdir=." \
+           -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \
+           -DCMAKE_INSTALL_PREFIX="/usr" \
+           -DCMAKE_INSTALL_LIBDIR="lib" \
+           -DCMAKE_INSTALL_SYSCONFDIR="/etc"
+  make
+}
+
+package() {
+  cd "$pkgname-build"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/qdigidoc4_4.0.0.23-qt5.11.patch b/qdigidoc4_4.0.0.23-qt5.11.patch
new file mode 100644
index 000000000000..eb3ccf4ffee0
--- /dev/null
+++ b/qdigidoc4_4.0.0.23-qt5.11.patch
@@ -0,0 +1,43 @@
+diff -NurdZ qdigidoc4_4.0.0.23.orig/client/dialogs/PinUnblock.cpp qdigidoc4_4.0.0.23/client/dialogs/PinUnblock.cpp
+--- qdigidoc4_4.0.0.23.orig/client/dialogs/PinUnblock.cpp	2018-06-01 08:20:05.000000000 +0300
++++ qdigidoc4_4.0.0.23/client/dialogs/PinUnblock.cpp	2018-06-12 16:24:42.266717807 +0300
+@@ -25,6 +25,7 @@
+ 
+ #include <QLabel>
+ #include <QList>
++#include <QtGui/QRegExpValidator>
+ 
+ 
+ struct InfoLine
+diff -NurdZ qdigidoc4_4.0.0.23.orig/client/dialogs/Updater.cpp qdigidoc4_4.0.0.23/client/dialogs/Updater.cpp
+--- qdigidoc4_4.0.0.23.orig/client/dialogs/Updater.cpp	2018-06-01 08:20:05.000000000 +0300
++++ qdigidoc4_4.0.0.23/client/dialogs/Updater.cpp	2018-06-12 16:23:14.046367649 +0300
+@@ -40,6 +40,7 @@
+ #include <QtNetwork/QNetworkProxy>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtNetwork/QSslKey>
++#include <QtGui/QRegExpValidator>
+ #include <QtGui/QPainter>
+ #include <QtWidgets/QPushButton>
+ 
+diff -NurdZ qdigidoc4_4.0.0.23.orig/client/widgets/OtherData.h qdigidoc4_4.0.0.23/client/widgets/OtherData.h
+--- qdigidoc4_4.0.0.23.orig/client/widgets/OtherData.h	2018-06-01 08:20:05.000000000 +0300
++++ qdigidoc4_4.0.0.23/client/widgets/OtherData.h	2018-06-12 16:31:54.445526409 +0300
+@@ -21,6 +21,7 @@
+ 
+ #include <QWidget>
+ #include <QPainter>
++#include <QtWidgets/QStyleOption>
+ 
+ namespace Ui {
+ class OtherData;
+diff -NurdZ qdigidoc4_4.0.0.23.orig/common/qtsingleapplication/CMakeLists.txt qdigidoc4_4.0.0.23/common/qtsingleapplication/CMakeLists.txt
+--- qdigidoc4_4.0.0.23.orig/common/qtsingleapplication/CMakeLists.txt	2018-06-01 08:20:06.000000000 +0300
++++ qdigidoc4_4.0.0.23/common/qtsingleapplication/CMakeLists.txt	2018-06-12 16:20:07.692294653 +0300
+@@ -5,5 +5,5 @@
+ set_target_properties( qtsingleapplication PROPERTIES AUTOMOC TRUE )
+ 
+ if( Qt5Widgets_FOUND )
+-	qt5_use_modules( qtsingleapplication Widgets Network )
++	target_link_libraries(qtsingleapplication Qt5::Widgets Qt5::Network)
+ endif()