Adopted and bump vertion to 3.1.0

2 files changed, 42 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03d3e13caad2..e1829490073a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cartaodecidadao
 	pkgdesc = Portuguese Citizen Card Application
-	pkgver = 3.0.13
-	pkgrel = 2
+	pkgver = 3.1.0
+	pkgrel = 1
 	url = http://www.cartaodecidadao.pt/
 	arch = i686
 	arch = x86_64
@@ -9,31 +9,30 @@ pkgbase = cartaodecidadao
 	license = LGPL3
 	license = custom:EUPL
 	makedepends = swig
-	makedepends = subversion
-	depends = java-runtime-openjdk
+	makedepends = qconf
+	makedepends = git
+	makedepends = xml-security-c
+	makedepends = jdk11-openjdk
 	depends = qt5-base
 	depends = qt5-tools
+	depends = qt5-quickcontrols
 	depends = qt5-quickcontrols2
 	depends = qt5-graphicaleffects
 	depends = pcsclite>=1.5.0
 	depends = openssl-1.0
 	depends = ccid
+	depends = libzip
 	depends = poppler-qt5
-	depends = xerces-c
-	depends = xml-security-c-ria
+	depends = libxerces-c-3.1
+	depends = libcurl-compat
+	depends = xml-security-c
 	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/version3.0.13/_src/eidmw
-	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
+	optdepends = ecce-gov-pt-certificates: Certificados da ECCE quem assina dos certificados contidos em cartaodecidadao-pki
+	conflicts = classpath
+	conflicts = cartaodecidadao-bin
+	source = git+https://github.com/amagovpt/autenticacao.gov/#branch=openssl-migration
 	sha512sums = SKIP
-	sha512sums = 0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571
-	sha512sums = f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2
-	sha512sums = 2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4
-	sha512sums = e97bc2c5aca688345283abe353e64373a28ab92a0d8d668a165800aa16d72be4dcb7e0de619e2595ef42499203bacaa91aea7d79098059550d3ca056236d7289
 
 pkgname = cartaodecidadao
 
diff --git a/PKGBUILD b/PKGBUILD
index b4fb5150e07c..629baf4fd4e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,95 +1,54 @@
 # Maintainer: Carlos Silva <r3pek@r3pek.org>
 
 pkgname=cartaodecidadao
-pkgver=3.0.13
-_rev=${pkgver##*.}
-_ver=${pkgver%.*}
-pkgrel=2
+_pkgname=autenticacao.gov
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Portuguese Citizen Card Application"
 arch=('i686' 'x86_64')
 url="http://www.cartaodecidadao.pt/"
 license=('GPL2' 'LGPL3' 'custom:EUPL')
-depends=('java-runtime-openjdk'
-         'qt5-base'
+depends=('qt5-base'
          'qt5-tools'
-         'qt5-quickcontrols2'
+         'qt5-quickcontrols'
+				 'qt5-quickcontrols2'
          'qt5-graphicaleffects'
          'pcsclite>=1.5.0'
          'openssl-1.0'
          'ccid'
+         'libzip'
          'poppler-qt5'
-         'xerces-c'
-         'xml-security-c-ria')
-makedepends=('swig' 'subversion')
+				 'libxerces-c-3.1'
+				 'libcurl-compat'
+         'xml-security-c')
+makedepends=('swig' 'qconf' 'git' 'xml-security-c' 'jdk11-openjdk')
 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)')
+            'ecce-gov-pt-certificates: Certificados da ECCE quem assina dos certificados contidos em cartaodecidadao-pki')
+conflicts=('classpath' 'cartaodecidadao-bin')
 
-#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"
-        "02-fix_missing_qicon.patch"
-        "03-fix_for_java_versions.patch")
+source=('git+https://github.com/amagovpt/autenticacao.gov/#branch=openssl-migration')
 
-sha512sums=('SKIP'
-            '0c2e434ee00d0b0b3f40d32bd7926d43332d9b1a0adb8d1ef53bd0a357caff92765ab6081207051ef94b7e5ad6800031573bfdb5ed9b45c956414ab6e2f89571'
-            'f47e75015582fddd0e97995ec27103fd26e5c72e987dc927cbbc0cd152522579115f3853bf727f4090b4689861fc7a9803c00ce1776b701d2a595c692fed1eb2'
-            '2dc3e36d76024a08db8f9a78b9af986ece4391d09514626dbfe084d827cab634c2f55a79024611ca98e38fb23f472cecaf9c32070c92f165878040bd6b94ccd4'
-            'e97bc2c5aca688345283abe353e64373a28ab92a0d8d668a165800aa16d72be4dcb7e0de619e2595ef42499203bacaa91aea7d79098059550d3ca056236d7289')
+sha512sums=('SKIP')
 
-prepare() {
-	chmod +x ${srcdir}/eidmw/configure
-
-	sed -i -e "s|CFLAGS ?=|CFLAGS +=|g" ${srcdir}/eidmw/FreeImagePTEiD/Makefile.gnu
-	sed -i -e "s|CXXFLAGS ?=|CXXFLAGS +=|g" ${srcdir}/eidmw/FreeImagePTEiD/Makefile.gnu
-	sed -i -e "s|local/||g" ${srcdir}/eidmw/FreeImagePTEiD/Makefile.gnu
-
-	sed -i -e "s|local/||g" ${srcdir}/eidmw/pteid-poppler/poppler/Makefile
-
-	sed -i -e "/^INSTALLS/d" ${srcdir}/eidmw/eidmw.pro
-
-	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
-	patch -p0 < ${srcdir}/03-fix_for_java_versions.patch
+prepare(){
+	# Temporary Fix in order to compile with archlinux java handling neededs sudo and conflicts with GNU classpath
+	sudo archlinux-java set java-11-openjdk
+	sudo ln -sf /usr/lib/jvm/default/include/jni.h /usr/include/jni.h
+	sudo ln -sf /usr/lib/jvm/default/include/linux/jni_md.h /usr/include/jni_md.h
 }
 
 build() {
-	cd ${srcdir}/eidmw
-
-	./configure  \
-		--prefix=/usr \
-		--include+="/usr/include/openssl-1.0/" \
-		--lib+="-L/usr/lib/openssl-1.0"  \
-
-	make
+	cd ${srcdir}/${_pkgname}/pteid-mw-pt/_src/eidmw
+		qmake pteid-mw.pro
+		make
 }
 
 package() {
-	cd ${srcdir}/eidmw
+	cd ${srcdir}/${_pkgname}/pteid-mw-pt/_src/eidmw
 
 	# Install programs and libraries
-	INSTALL_ROOT="$pkgdir" make install
-	install -Dm644 ${srcdir}/eidmw/misc/DSS/dss-standalone-app-3.0.4.jar ${pkgdir}/usr/share/${pkgname}/DSS/dss-standalone-app-3.0.4.jar
-	install -Dm644 ${srcdir}/eidmw/misc/DSS/config.properties ${pkgdir}/usr/share/${pkgname}/DSS/config.properties
-
-	# Install EUPL License
-	install -Dm644 ${srcdir}/eidmw/misc/licenses/License_pt.rtf ${pkgdir}/usr/share/licenses/${pkgname}/EUPL
-
-	# Install desktop files
-	install -Dm644 ${srcdir}/eidmw/debian/pteid-mw-gui.desktop ${pkgdir}/usr/share/applications/pteid-mw-gui.desktop
-	install -Dm644 ${srcdir}/eidmw/debian/pteid-dss.desktop ${pkgdir}/usr/share/applications/pteid-dss.desktop
-	sed -i -e "s|local/bin|share/${pkgname}|g" ${pkgdir}/usr/share/applications/pteid-dss.desktop
-
-	# Install image files
-	install -Dm644 ${srcdir}/eidmw/debian/pteid-signature.png ${pkgdir}/usr/share/pixmaps/pteid-signature.png
-	install -Dm644 ${srcdir}/eidmw/debian/pteid-scalable.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/pteid-scalable.svg
-
-	# Install MIME Types
-	install -Dm644 ${srcdir}/eidmw/debian/pteid-mw.sharedmimeinfo ${pkgdir}/usr/share/mime/packages/pteid-mw.xml
-
-	# Install certificates
-	install -Dm644 -t ${pkgdir}/usr/share/${pkgname}/certs/ ${srcdir}/eidmw/misc/certs/*
+	mkdir -p ${pkgdir}/usr/local/lib/
+	make INSTALL_ROOT="$pkgdir" DESTDIR=$pkgdir PREFIX=/usr install
+	mv ${pkgdir}/usr/local/lib/ ${pkgdir}/usr/lib/ 
 }