Version bump to 3.0.13

3 files changed, 26 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31b8027424ea..2d22700084cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cartaodecidadao
 	pkgdesc = Portuguese Citizen Card Application
-	pkgver = 2.4.6.5238
+	pkgver = 3.0.13
 	pkgrel = 1
 	url = http://www.cartaodecidadao.pt/
 	arch = i686
@@ -13,21 +13,24 @@ pkgbase = cartaodecidadao
 	depends = java-runtime-openjdk
 	depends = qt5-base
 	depends = qt5-tools
+	depends = qt5-quickcontrols2
 	depends = pcsclite>=1.5.0
 	depends = openssl-1.0
 	depends = ccid
 	depends = poppler-qt5
 	depends = xerces-c
-	depends = xml-security-c
+	depends = xml-security-c-ria
 	optdepends = autenticacao-gov-pt: Necessário para autenticações online
 	optdepends = cartaodecidadao-pki: PKI que confirma a validade dos certificados dos CC
 	optdepends = ecce-gov-pt-certificates: Certificados da ECCE (quem assina dos certificados contidos em cartaodecidadao-pki)
-	source = svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version2.4.6-5238/source/_src/eidmw
+	source = svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version3.0.13/_src/eidmw
 	source = 00-fix_certs_path.patch
 	source = 01-fix_pteiddialogsQTsrv_path.patch
+	source = 02-fix_missing_qicon.patch
 	sha512sums = SKIP
 	sha512sums = 0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571
 	sha512sums = f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2
+	sha512sums = 2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4
 
 pkgname = cartaodecidadao
 
diff --git a/02-fix_missing_qicon.patch b/02-fix_missing_qicon.patch
new file mode 100644
index 000000000000..abfbe388bb01
--- /dev/null
+++ b/02-fix_missing_qicon.patch
@@ -0,0 +1,10 @@
+--- dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp	2018-08-02 01:30:28.516876132 +0100
++++ dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp	2018-08-02 01:30:46.523461372 +0100
+@@ -21,6 +21,7 @@
+ #include "dlgWndPinpadInfo.h"
+ #include "../langUtil.h"
+ #include <QDesktopWidget>
++#include <QIcon>
+ 
+ dlgWndPinpadInfo::dlgWndPinpadInfo( unsigned long ulHandle,
+ 		DlgPinOperation operation, const QString & Reader,
diff --git a/PKGBUILD b/PKGBUILD
index bd6d6876cc47..3e9f0476f61e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlos Silva <r3pek@r3pek.org>
 
 pkgname=cartaodecidadao
-pkgver=2.4.6.5238
+pkgver=3.0.13
 _rev=${pkgver##*.}
 _ver=${pkgver%.*}
 pkgrel=1
@@ -12,24 +12,28 @@ license=('GPL2' 'LGPL3' 'custom:EUPL')
 depends=('java-runtime-openjdk'
          'qt5-base'
          'qt5-tools'
+         'qt5-quickcontrols2'
          'pcsclite>=1.5.0'
          'openssl-1.0'
          'ccid'
          'poppler-qt5'
          'xerces-c'
-         'xml-security-c')
+         'xml-security-c-ria')
 makedepends=('swig' 'subversion')
 optdepends=('autenticacao-gov-pt: Necessário para autenticações online'
             'cartaodecidadao-pki: PKI que confirma a validade dos certificados dos CC'
             'ecce-gov-pt-certificates: Certificados da ECCE (quem assina dos certificados contidos em cartaodecidadao-pki)')
 
-source=("svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${_ver}-${_rev}/source/_src/eidmw"
+#source=("svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${_ver}-${_rev}/source/_src/eidmw"
+source=("svn+https://svn.gov.pt/projects/ccidadao/repository/middleware-offline/tags/version${pkgver}/_src/eidmw"
         "00-fix_certs_path.patch"
-        "01-fix_pteiddialogsQTsrv_path.patch")
+        "01-fix_pteiddialogsQTsrv_path.patch"
+        "02-fix_missing_qicon.patch")
 
 sha512sums=('SKIP'
             '0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571'
-            'f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2')
+            'f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2'
+            '2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4')
 
 prepare() {
 	chmod +x ${srcdir}/eidmw/configure
@@ -45,6 +49,7 @@ prepare() {
 	cd ${srcdir}/eidmw
 	patch -p0 < ${srcdir}/00-fix_certs_path.patch
 	patch -p0 < ${srcdir}/01-fix_pteiddialogsQTsrv_path.patch
+	patch -p0 < ${srcdir}/02-fix_missing_qicon.patch
 }
 
 build() {