summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkevku2018-06-01 17:43:36 +0300
committerkevku2018-06-01 17:43:36 +0300
commit7e344e61e6fcd601bdce3464e4e965f759ed1176 (patch)
treea0a38a8ff0024e2035a066a8e03aa5613462ad34
parent5a41fd90fb68b7740008df14ebd1897ec6ab9e85 (diff)
downloadaur-qdigidoc.tar.gz
fix build qt5.11
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--qdigidoc-3.13.6.1525-qt5.11.patch67
3 files changed, 76 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 092c63b1a15..593cf77637a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qdigidoc
pkgdesc = Qt based UI application for verifying and signing digital signatures
pkgver = 3.13.6.1525
- pkgrel = 1
+ pkgrel = 2
url = http://www.id.ee/
arch = x86_64
arch = i686
@@ -17,7 +17,9 @@ pkgbase = qdigidoc
depends = hicolor-icon-theme
depends = desktop-file-utils
source = https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.13.6.1525.orig.tar.xz
+ source = qdigidoc-3.13.6.1525-qt5.11.patch
sha256sums = 75e86c2626647005d5d5bff94631eea7380802f5d9a78965eec126909558b2a2
+ sha256sums = b0dacc044ff0a49053eb395b2301d423e72112bb7a053c6b270c6ab3c1a232b0
pkgname = qdigidoc
diff --git a/PKGBUILD b/PKGBUILD
index 129600d95e3..e46288071e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer: kevku <kevku@gmx.com>
pkgname=qdigidoc
pkgver=3.13.6.1525
-pkgrel=1
+pkgrel=2
pkgdesc="Qt based UI application for verifying and signing digital signatures"
arch=('x86_64' 'i686')
url="http://www.id.ee/"
license=('LGPL2.1')
depends=('libdigidocpp>=3.13.5' 'opensc' 'qt5-base>=5.10.0' 'shared-mime-info' 'ccid' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('cmake' 'qt5-tools' 'qt5-translations')
-source=("https://installer.id.ee/media/ubuntu/pool/main/q/$pkgname/${pkgname}_$pkgver.orig.tar.xz")
-sha256sums=('75e86c2626647005d5d5bff94631eea7380802f5d9a78965eec126909558b2a2')
+source=("https://installer.id.ee/media/ubuntu/pool/main/q/$pkgname/${pkgname}_$pkgver.orig.tar.xz"
+ "qdigidoc-3.13.6.1525-qt5.11.patch")
+sha256sums=('75e86c2626647005d5d5bff94631eea7380802f5d9a78965eec126909558b2a2'
+ 'b0dacc044ff0a49053eb395b2301d423e72112bb7a053c6b270c6ab3c1a232b0')
prepare() {
[[ -d "$pkgname-build" ]] && rm -r "$pkgname-build"
mkdir "$pkgname-build"
+ patch -p1 -i "$srcdir/qdigidoc-3.13.6.1525-qt5.11.patch"
}
build() {
diff --git a/qdigidoc-3.13.6.1525-qt5.11.patch b/qdigidoc-3.13.6.1525-qt5.11.patch
new file mode 100644
index 00000000000..d86289555cd
--- /dev/null
+++ b/qdigidoc-3.13.6.1525-qt5.11.patch
@@ -0,0 +1,67 @@
+diff -Nurd qdigidoc_3.13.6.1525.orig/client/Application.cpp qdigidoc_3.13.6.1525/client/Application.cpp
+--- qdigidoc_3.13.6.1525.orig/client/Application.cpp 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/client/Application.cpp 2018-06-01 17:37:26.000000000 +0300
+@@ -57,6 +57,7 @@
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QProgressBar>
+ #include <QtWidgets/QProgressDialog>
++#include <QtWidgets/QAction>
+
+ #if defined(Q_OS_MAC)
+ #include <common/MacMenuBar.h>
+diff -Nurd qdigidoc_3.13.6.1525.orig/client/MainWindow.cpp qdigidoc_3.13.6.1525/client/MainWindow.cpp
+--- qdigidoc_3.13.6.1525.orig/client/MainWindow.cpp 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/client/MainWindow.cpp 2018-06-01 17:35:22.000000000 +0300
+@@ -44,6 +44,8 @@
+ #include <QtPrintSupport/QPrinter>
+ #include <QtPrintSupport/QPrinterInfo>
+ #include <QtPrintSupport/QPrintPreviewDialog>
++#include <QtWidgets/QActionGroup>
++#include <QtWidgets/QButtonGroup>
+ #include <QtWidgets/QCompleter>
+ #include <QtWidgets/QMessageBox>
+
+diff -Nurd qdigidoc_3.13.6.1525.orig/client/MainWindow.h qdigidoc_3.13.6.1525/client/MainWindow.h
+--- qdigidoc_3.13.6.1525.orig/client/MainWindow.h 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/client/MainWindow.h 2018-06-01 17:35:40.000000000 +0300
+@@ -24,6 +24,7 @@
+ #include <QtCore/QStringList>
+
+ class DigiDoc;
++class QActionGroup;
+ class QPrinter;
+
+ class MainWindow: public QWidget, private Ui::MainWindow
+diff -Nurd qdigidoc_3.13.6.1525.orig/common/qtsingleapplication/CMakeLists.txt qdigidoc_3.13.6.1525/common/qtsingleapplication/CMakeLists.txt
+--- qdigidoc_3.13.6.1525.orig/common/qtsingleapplication/CMakeLists.txt 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/common/qtsingleapplication/CMakeLists.txt 2018-06-01 17:29:57.000000000 +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()
+diff -Nurd qdigidoc_3.13.6.1525.orig/crypto/MainWindow.cpp qdigidoc_3.13.6.1525/crypto/MainWindow.cpp
+--- qdigidoc_3.13.6.1525.orig/crypto/MainWindow.cpp 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/crypto/MainWindow.cpp 2018-06-01 17:31:24.000000000 +0300
+@@ -35,6 +35,8 @@
+ #include <QtGui/QDesktopServices>
+ #include <QtGui/QDragEnterEvent>
+ #include <QtNetwork/QSslKey>
++#include <QtWidgets/QActionGroup>
++#include <QtWidgets/QButtonGroup>
+ #include <QtWidgets/QMessageBox>
+ #include <QtWidgets/QProgressBar>
+ #include <QtWidgets/QProgressDialog>
+diff -Nurd qdigidoc_3.13.6.1525.orig/crypto/MainWindow.h qdigidoc_3.13.6.1525/crypto/MainWindow.h
+--- qdigidoc_3.13.6.1525.orig/crypto/MainWindow.h 2018-03-21 11:39:24.000000000 +0200
++++ qdigidoc_3.13.6.1525/crypto/MainWindow.h 2018-06-01 17:32:33.000000000 +0300
+@@ -21,6 +21,7 @@
+
+ #include "ui_MainWindow.h"
+
++class QActionGroup;
+ class CKey;
+ class CryptoDoc;
+