Cleanup unused files and improve dependencies

6 files changed, 4 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fca2355b9b0..a061627bcf4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cartaodecidadao
 	pkgdesc = Portuguese Citizen Card Application
 	pkgver = 3.1.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.cartaodecidadao.pt/
 	arch = i686
 	arch = x86_64
@@ -26,7 +26,7 @@ pkgbase = cartaodecidadao
 	depends = libxerces-c-3.1
 	depends = libcurl-compat
 	depends = xml-security-c
-	optdepends = autenticacao-gov-pt: Necessário para autenticações online
+	optdepends = plugin-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
 	conflicts = classpath
diff --git a/00-fix_certs_path.patch b/00-fix_certs_path.patch
deleted file mode 100644
index bf30566f2806..000000000000
--- a/00-fix_certs_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- common/ConfigCommon.cpp	2017-06-07 21:01:25.043207000 +0100
-+++ common/ConfigCommon_fixed.cpp	2017-09-22 20:53:16.693678311 +0100
-@@ -30,12 +30,12 @@
- #ifdef WIN32

-   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR,   L"$home" WDIRSEP L"eidstore" WDIRSEP L"certs"};

- #else

--  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_CERTSDIR,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs" WDIRSEP};

-+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_CERTSDIR,  WDIRSEP L"usr" WDIRSEP L"share" WDIRSEP L"cartaodecidadao" WDIRSEP L"certs" WDIRSEP};

- #endif

- #ifdef WIN32

-   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST  = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,   L"$home" WDIRSEP L"eidstore" WDIRSEP L"certs_test"};

- #else

--  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,  WDIRSEP L"usr" WDIRSEP L"local" WDIRSEP L"share" WDIRSEP L"certs_test" WDIRSEP};

-+  const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_CERTS_DIR_TEST   = {EIDMW_CNF_SECTION_GENERAL, EIDMW_CNF_GENERAL_CERTSDIR_TEST,  WDIRSEP L"usr" WDIRSEP L"share" WDIRSEP L"cartaodecidado" WDIRSEP L"certs_test" WDIRSEP};

- #endif

- 

-   const struct CConfig::Param_Str CConfig::EIDMW_CONFIG_PARAM_GENERAL_LANGUAGE	 	=	{EIDMW_CNF_SECTION_GENERAL,	EIDMW_CNF_GENERAL_LANGUAGE,		L"nl"};

diff --git a/01-fix_pteiddialogsQTsrv_path.patch b/01-fix_pteiddialogsQTsrv_path.patch
deleted file mode 100644
index 549a6bc0be24..000000000000
--- a/01-fix_pteiddialogsQTsrv_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dialogs/dialogsQT/dlgs.cpp	2017-06-07 21:01:25.043207000 +0100
-+++ dialogs/dialogsQT/dlgs_fixed.cpp	2017-09-22 21:03:43.806012101 +0100
-@@ -431,7 +431,7 @@
-   char csCommand[150];
-   Type_WndGeometry *pWndGeometry = (Type_WndGeometry *)wndGeometry;
- 
--  sprintf(csCommand,"%s/%s %i %s", "/usr/local/bin", csServerName.c_str(),index,csFilename );
-+  sprintf(csCommand,"%s/%s %i %s", "/usr/bin", csServerName.c_str(),index,csFilename );
- 
-   if  ( ( pWndGeometry != NULL )
-         && ( pWndGeometry->x >= 0 ) && ( pWndGeometry->y >= 0 )
diff --git a/02-fix_missing_qicon.patch b/02-fix_missing_qicon.patch
deleted file mode 100644
index abfbe388bb01..000000000000
--- a/02-fix_missing_qicon.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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/03-fix_for_java_versions.patch b/03-fix_for_java_versions.patch
deleted file mode 100644
index 1b1495ca73f2..000000000000
--- a/03-fix_for_java_versions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 1af3d41b7d10..15ec6062eb64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=cartaodecidadao
 _pkgname=autenticacao.gov
 pkgver=3.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Portuguese Citizen Card Application"
 arch=('i686' 'x86_64')
 url="http://www.cartaodecidadao.pt/"
@@ -23,7 +23,7 @@ depends=('qt5-base'
 				 'libcurl-compat'
          'xml-security-c')
 makedepends=('swig' 'qconf' 'git' 'xml-security-c' 'jdk11-openjdk')
-optdepends=('autenticacao-gov-pt: Necessário para autenticações online'
+optdepends=('plugin-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')
 conflicts=('classpath' 'cartaodecidadao-bin')