Add fix for java versions 10+ and missing dep

3 files changed, 20 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d22700084cf..932700562e60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = cartaodecidadao
 	depends = qt5-base
 	depends = qt5-tools
 	depends = qt5-quickcontrols2
+	depends = qt5-graphicaleffects
 	depends = pcsclite>=1.5.0
 	depends = openssl-1.0
 	depends = ccid
@@ -27,10 +28,12 @@ pkgbase = cartaodecidadao
 	source = 00-fix_certs_path.patch
 	source = 01-fix_pteiddialogsQTsrv_path.patch
 	source = 02-fix_missing_qicon.patch
+	source = 03-fix_for_java_versions.patch
 	sha512sums = SKIP
 	sha512sums = 0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571
 	sha512sums = f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2
 	sha512sums = 2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4
+	sha512sums = e97bc2c5aca688345283abe353e64373a28ab92a0d8d668a165800aa16d72be4dcb7e0de619e2595ef42499203bacaa91aea7d79098059550d3ca056236d7289
 
 pkgname = cartaodecidadao
 
diff --git a/03-fix_for_java_versions.patch b/03-fix_for_java_versions.patch
new file mode 100644
index 000000000000..1b1495ca73f2
--- /dev/null
+++ b/03-fix_for_java_versions.patch
@@ -0,0 +1,11 @@
+--- configure	2018-10-18 00:42:28.055226264 +0100
++++ configure	2018-10-18 00:42:37.565169483 +0100
+@@ -121,7 +121,7 @@
+ chomp($javaVer);
+ 
+ # get the version nr from the version string
+-$javaVer =~ m/([0-9])\.([0-9]+)\.([0-9]+)/;
++$javaVer =~ m/([0-9]+)\.([0-9]+)\.([0-9]+)/;
+ my $javaVerXX = $1;
+ my $javaVerYY = $2;
+ my $javaVerZZ = $3;
diff --git a/PKGBUILD b/PKGBUILD
index 3e9f0476f61e..958fabca6975 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,6 +13,7 @@ depends=('java-runtime-openjdk'
          'qt5-base'
          'qt5-tools'
          'qt5-quickcontrols2'
+         'qt5-graphicaleffects'
          'pcsclite>=1.5.0'
          'openssl-1.0'
          'ccid'
@@ -28,12 +29,14 @@ optdepends=('autenticacao-gov-pt: Necessário para autenticações online'
 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"
-        "02-fix_missing_qicon.patch")
+        "02-fix_missing_qicon.patch"
+        "03-fix_for_java_versions.patch")
 
 sha512sums=('SKIP'
             '0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571'
             'f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2'
-            '2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4')
+            '2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4'
+            'e97bc2c5aca688345283abe353e64373a28ab92a0d8d668a165800aa16d72be4dcb7e0de619e2595ef42499203bacaa91aea7d79098059550d3ca056236d7289')
 
 prepare() {
 	chmod +x ${srcdir}/eidmw/configure
@@ -50,6 +53,7 @@ prepare() {
 	patch -p0 < ${srcdir}/00-fix_certs_path.patch
 	patch -p0 < ${srcdir}/01-fix_pteiddialogsQTsrv_path.patch
 	patch -p0 < ${srcdir}/02-fix_missing_qicon.patch
+	patch -p0 < ${srcdir}/03-fix_for_java_versions.patch
 }
 
 build() {