[packages/qesteidutil/dev-3.12] fix building with qt 5.11

glen glen at pld-linux.org
Wed Aug 22 12:33:23 CEST 2018


commit 417a77a8594a413ffd3f30b5fdfeea072260d72c
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 22 13:31:50 2018 +0300

    fix building with qt 5.11

 qesteidutil.spec |  2 ++
 qt-5.11.patch    | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
---
diff --git a/qesteidutil.spec b/qesteidutil.spec
index 4993674..a56ad3f 100644
--- a/qesteidutil.spec
+++ b/qesteidutil.spec
@@ -16,6 +16,7 @@ Source0:	https://github.com/open-eid/qesteidutil/releases/download/v%{version}/%
 # Source0-md5:	4e3805d3449e94427a67f5dfe7bae3c9
 Patch0:		system_qtsingleapplication.patch
 Patch1:		desktop.patch
+Patch2:		qt-5.11.patch
 URL:		https://github.com/open-eid/qesteidutil
 BuildRequires:	Qt5Core-devel
 BuildRequires:	Qt5Network-devel
@@ -46,6 +47,7 @@ extract and view certificates, set up mobile ID, and configure
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Remove bundled qtsingleapplication to make sure it isn't used
 rm -r common/qtsingleapplication
diff --git a/qt-5.11.patch b/qt-5.11.patch
new file mode 100644
index 0000000..ebdba9d
--- /dev/null
+++ b/qt-5.11.patch
@@ -0,0 +1,20 @@
+--- qesteidutil-3.12.10/src/Updater.cpp~	2017-11-22 14:34:33.000000000 +0200
++++ qesteidutil-3.12.10/src/Updater.cpp	2018-08-22 13:25:34.252173986 +0300
+@@ -38,6 +38,7 @@
+ #include <QtNetwork/QNetworkReply>
+ #include <QtNetwork/QSslKey>
+ #include <QtGui/QPainter>
++#include <QtGui/QRegExpValidator>
+ #include <QtWidgets/QPushButton>
+ 
+ #include <openssl/evp.h>
+--- qesteidutil-3.12.10/src/MainWindow.cpp~	2017-11-22 14:34:33.000000000 +0200
++++ qesteidutil-3.12.10/src/MainWindow.cpp	2018-08-22 13:24:47.763068029 +0300
+@@ -56,6 +56,7 @@
+ #include <QtNetwork/QSslKey>
+ #include <QtWidgets/QFileDialog>
+ #include <QtWidgets/QMessageBox>
++#include <QtWidgets/QButtonGroup>
+ 
+ Q_DECLARE_METATYPE(Emails)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qesteidutil.git/commitdiff/417a77a8594a413ffd3f30b5fdfeea072260d72c



More information about the pld-cvs-commit mailing list