summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevku2018-10-30 15:23:49 +0200
committerkevku2018-10-30 15:23:49 +0200
commit5983a2602a744a7892e7dc499aa9bbb29513d88c (patch)
tree4e1fbde49eb7a9741f103ed9983433d4b53b5119
parent2d7ab146ca5b6054e940b1a2564a06a9ec9222af (diff)
downloadaur-5983a2602a744a7892e7dc499aa9bbb29513d88c.tar.gz
update 4.1.0.30
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD13
-rw-r--r--qdigidoc4_4.0.0.23-qt5.11.patch43
3 files changed, 9 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 95021b48adb..6081db3c234 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
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 = 2
+ pkgver = 4.1.0.30
+ pkgrel = 1
url = http://www.id.ee/
arch = x86_64
arch = i686
@@ -18,10 +18,8 @@ pkgbase = qdigidoc4
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
+ source = https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc4/qdigidoc4_4.1.0.30.orig.tar.xz
+ sha256sums = fd66e309968fcf7a1ff4857f505c414fec0926afec9c5ec4fb0fdecdb41911e4
pkgname = qdigidoc4
diff --git a/PKGBUILD b/PKGBUILD
index ce9f3b13066..10bdbdb24d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: kevku <kevku@gmx.com>
pkgname=qdigidoc4
-pkgver=4.0.0.23
-pkgrel=2
+pkgver=4.1.0.30
+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/"
@@ -11,16 +11,13 @@ makedepends=('cmake' 'qt5-tools' 'qt5-translations')
optdepends=('ccid: smart card support')
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')
+source=("https://installer.id.ee/media/ubuntu/pool/main/q/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
+sha256sums=('fd66e309968fcf7a1ff4857f505c414fec0926afec9c5ec4fb0fdecdb41911e4')
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"
+ sed -i 's|#{ENV\["BUILD_NUMBER"\]}|30|g' cmake/modules/VersionInfo.cmake
}
build() {
diff --git a/qdigidoc4_4.0.0.23-qt5.11.patch b/qdigidoc4_4.0.0.23-qt5.11.patch
deleted file mode 100644
index eb3ccf4ffee..00000000000
--- a/qdigidoc4_4.0.0.23-qt5.11.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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()