public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/user/ssnb:master commit in: app-misc/cartao-cidadao-git/files/, app-misc/cartao-cidadao-git/
@ 2019-11-17  0:16 Samuel Bernardo
  0 siblings, 0 replies; 2+ messages in thread
From: Samuel Bernardo @ 2019-11-17  0:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f6793d420ef15d0306af4406c73659413373a47c
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun Nov 17 00:15:42 2019 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun Nov 17 00:15:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=f6793d42

add cartao-cidadao-git

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 app-misc/cartao-cidadao-git/Manifest               |  10 +++
 .../cartao-cidadao-git-3.0.20.ebuild               |  94 +++++++++++++++++++++
 .../cartao-cidadao-git/files/Makefile.gnu.patch    |  17 ++++
 .../files/XSECDOMUtils.hpp.patch                   |  12 +++
 .../files/XadesSignature.cpp.3.0.16.patch          |  30 +++++++
 .../files/XadesSignature.cpp.patch                 |  38 +++++++++
 .../files/dlgQndPinpadInfo.cpp.patch               |  20 +++++
 .../cartao-cidadao-git/files/extras-3.0.16.tar.gz  | Bin 0 -> 93414 bytes
 .../cartao-cidadao-git/files/extras-3.0.20.tar.gz  | Bin 0 -> 133120 bytes
 app-misc/cartao-cidadao-git/files/qmake.patch      |  17 ++++
 app-misc/cartao-cidadao-git/metadata.xml           |  11 +++
 11 files changed, 249 insertions(+)

diff --git a/app-misc/cartao-cidadao-git/Manifest b/app-misc/cartao-cidadao-git/Manifest
new file mode 100644
index 0000000..fe732a3
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/Manifest
@@ -0,0 +1,10 @@
+AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
+AUX XSECDOMUtils.hpp.patch 536 BLAKE2B 5ea81c2ef978ab408ece58fc068ab972251bd74b0d163c184169ec96064446d5a3781ca11b918ded7f1af9e04b9ab872a817dfdf45a54cd69326c346fa7fe153 SHA512 7ae206233ef95c5e0cd3c6e00dd8d47db81b85c1ee99bbf01c0dff143b8dcf2394a4c211eccb7a8f8fb1c3a2c78d624883865017d7f9a9118fcff9bd03564c66
+AUX XadesSignature.cpp.3.0.16.patch 1005 BLAKE2B 756f629c778a3c5330631ea786395b4f5c41e5b41ff49d6f22f874a98d6c3bab9be8c46990896e67107f8d00bdbec79f4dd0dd543aa1043664c824f73d883163 SHA512 09070ccb55b7b4cc311cb84924dbf791e3b7584aeb7c66cdde8cf5e940169930e8b3f8a4be30fd224b2293ca91ba7e5a13351b3a5fb6ce81d1741ba2120d61e8
+AUX XadesSignature.cpp.patch 1260 BLAKE2B db162abcf4011fc99f6cbf09d70fb5109370b1a75057ad6a7f54dac357f748e144ea5a3585bfd4bbfc3f4d8cfa617137673a3e742208257661eeb12c18ca2d81 SHA512 0d216324c9bba7497aa1af1498bfc2f4bd048d5ba73b8c5479925a4df7f4950a07130b1285abf6928a36fac723b30943b777e1a9ce9213ab3651b94e0f56dca8
+AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
+AUX extras-3.0.16.tar.gz 93414 BLAKE2B 6f4f30fd6a0f7da8b0daef4bef0012085053d857a06fc811d2f4c534346cf66e91c9d02caa6807de4390a79bec8d4cded904a5b6a16eb34c2c064651d4dc8fa1 SHA512 c660421575bcf6e7af50e1e585a3f309e3e0ee855ec81ecc2bee87f42b395b7c817f264e3d4d74a81b98ad6bbf3c89b7c7abe1f7cf23df2ae998639bcb6bd1ae
+AUX extras-3.0.20.tar.gz 133120 BLAKE2B 7743858d88359d05eae39e1f4e4589714d98fcace12b20d83c23619af37d76b72b63725196ccee5e815a2dfcafb0436bc2c3e40ac6ef2ebca59bc54d1a2c417d SHA512 f7b1cd11e45e170d307de800fc92ea29c5fba7a2f8cae06079b813b9441f70a89bb0ccaae6769bf42007549eed45f6261028dcd6e147fcce9bfaec45bf62867a
+AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
+EBUILD cartao-cidadao-git-3.0.20.ebuild 2075 BLAKE2B 31d6e41f432f00381f5a42e51012a7e6dfb7a5e713dbb80768d57b0cbd9625e1c228cff70ec0cf2e6851b1db53975436d7980ea68c6539b870dce2efff936186 SHA512 cd8a240dfdaa8fdd7e142e60512dd27c9f32ff60db61a3236081ea2ff160588f64dabe7cda6cfffefdcb2a976bd61e384104f09400345b31d3ba32b86fd5699b
+MISC metadata.xml 352 BLAKE2B cd72105d43a6ffe93ea0b14ca747161283860b37f2c70aac1d29227bc1b774fbfc1d8020effb2fd24c3165d1ffab853ce8791dd263cbaf6ceaf44b36036af25b SHA512 19f6c0e85c78157c5c542b951b3907f59b2891567d452163b46fd3369545095e772167eddc87c31a00e7b5283070f233d92edd86cac5159c123615ffd2c298b9

diff --git a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild
new file mode 100644
index 0000000..c124da1
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.0.20.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tools for authenticating with https://www.autenticacao.gov.pt/"
+HOMEPAGE="https://svn.gov.pt/projects/ccidadao"
+
+inherit git-r3 unpacker eutils
+
+EGIT_CLONE_TYPE="single"
+EGIT_REPO_URI="https://github.com/amagovpt/autenticacao.gov.git"
+EGIT_COMMIT="v$PV"
+
+LICENSE="EUPL"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=sys-apps/pcsc-lite-1.5.0
+	sys-apps/pcsc-tools
+	app-crypt/ccid
+	>=dev-qt/qtcore-5
+	dev-qt/qtchooser
+	dev-libs/xml-security-c
+	dev-libs/xerces-c
+	dev-vcs/subversion
+	dev-libs/openssl
+	media-libs/jasper
+	app-text/poppler
+	dev-libs/libzip"
+RDEPEND="${DEPEND}
+	!app-misc/autenticacao-gov-pt:2
+	!app-misc/cartao-cidadao-svn"
+
+PATCHES=(
+	#"${FILESDIR}/*.${PV}.patch"
+	)
+
+src_unpack() {
+	default
+	git-r3_fetch
+	git-r3_checkout
+	unpack ${FILESDIR}/extras-${PV}.tar.gz
+}
+
+src_prepare() {
+	default
+	cd "${S}"
+	rm -rf ./docs README.md license.txt
+	mv pteid-mw-pt/_src/eidmw/* .
+	rm -rf pteid-mw-pt
+}
+
+src_configure() {
+	# configure
+	if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
+		${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
+	elif [[ -f ${ECONF_SOURCE:-.}/configure ]] ; then
+		fperms 755 ${ECONF_SOURCE:-.}/configure
+		${ECONF_SOURCE:-.}/configure || die "Error: econf failed"
+	else
+		default
+	fi
+}
+
+src_compile() {
+	# qmake
+	if [ -f pteid-mw.pro ]; then
+		qmake pteid-mw.pro
+	else
+		die "Error: compile phase failed because is missing pteid-mw.pro!"
+	fi
+
+	# make
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake || die "Error: emake failed"
+	else
+		die "Error: compile phase failed because is missing Makefile!"
+	fi
+}
+
+src_install() {
+	# make install
+	if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
+		emake INSTALL_ROOT="${D}" DESTDIR="${D}" install || die "Error: emake install failed"
+	else
+		die "Error: install phase failed because is missing Makefile!"
+	fi
+
+	# extras install
+	cp -R "${WORKDIR}/usr" "${D}" || die "Error: copy files in install phase failed!"
+}
+

diff --git a/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch b/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch
new file mode 100644
index 0000000..b935940
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/Makefile.gnu.patch
@@ -0,0 +1,17 @@
+--- a/FreeImagePTEiD/Makefile.gnu	2017-09-21 20:54:23.981722201 +0100
++++ b/FreeImagePTEiD/Makefile.gnu	2017-10-21 17:47:58.342409997 +0100
+@@ -23,9 +23,11 @@
+ override CXXFLAGS += -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+ override CXXFLAGS += $(INCLUDE)
+ 
+-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
+-	CFLAGS += -fPIC
+-	CXXFLAGS += -fPIC
++ARCH_TEST := $(shell sh -c 'uname -m 2>/dev/null || echo not')
++ARCH_TEST ?= error
++ifeq ($(ARCH_TEST),x86_64)
++	override CFLAGS += -fPIC
++	override CXXFLAGS += -fPIC
+ endif
+ 
+ TARGET  = freeimagePTEiD

diff --git a/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch b/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch
new file mode 100644
index 0000000..6cc59ec
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/XSECDOMUtils.hpp.patch
@@ -0,0 +1,12 @@
+diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
+--- a/applayer/XadesSignature.cpp	2019-01-13 20:06:05.519457738 +0000
++++ b/applayer/XadesSignature.cpp	2019-01-13 20:40:45.482262806 +0000
+@@ -63,7 +63,7 @@
+ #include <xsec/enc/XSECCryptoUtils.hpp>
+ #include <xsec/enc/XSECCryptoException.hpp>
+ #include <xsec/utils/XSECBinTXFMInputStream.hpp>
+-#include <xsec/utils/XSECDOMUtils.hpp>
++//#include <xsec/utils/XSECDOMUtils.hpp>
+ #include <xsec/transformers/TXFMBase.hpp>
+ #include <xsec/transformers/TXFMChain.hpp>
+ 

diff --git a/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch
new file mode 100644
index 0000000..88e6b9b
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.3.0.16.patch
@@ -0,0 +1,30 @@
+diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
+--- a/applayer/XadesSignature.cpp	2019-09-13 08:07:22.239291284 +0100
++++ b/applayer/XadesSignature.cpp	2019-09-13 08:14:39.319813193 +0100
+@@ -577,7 +577,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -632,7 +632,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -897,7 +897,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append((char*)&buffer[0], size_t(bytes));

diff --git a/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch
new file mode 100644
index 0000000..5014b8f
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/XadesSignature.cpp.patch
@@ -0,0 +1,38 @@
+diff -Naur a/applayer/XadesSignature.cpp b/applayer/XadesSignature.cpp
+--- a/applayer/XadesSignature.cpp	2019-02-18 23:48:47.483833073 +0000
++++ b/applayer/XadesSignature.cpp	2019-02-19 00:43:51.207845230 +0000
+@@ -62,6 +62,7 @@
+ 
+ #include <xsec/enc/XSECCryptoUtils.hpp>
+ #include <xsec/enc/XSECCryptoException.hpp>
++#include <xsec/enc/XSECCryptoHash.hpp>
+ #include <xsec/utils/XSECBinTXFMInputStream.hpp>
+ #include <xsec/utils/XSECDOMUtils.hpp>
+ #include <xsec/transformers/TXFMBase.hpp>
+@@ -567,7 +568,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -622,7 +623,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append( (char*)&buffer[0], size_t(bytes));
+@@ -881,7 +882,7 @@
+ 
+     string c14n;
+     unsigned char buffer[1024];
+-    xsecsize_t bytes = 0;
++    XMLSize_t bytes = 0;
+     while((bytes = canonicalizer.outputBuffer(buffer, 1024)) > 0)
+     {
+         c14n.append((char*)&buffer[0], size_t(bytes));

diff --git a/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch b/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch
new file mode 100644
index 0000000..126b308
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/dlgQndPinpadInfo.cpp.patch
@@ -0,0 +1,20 @@
+diff -Naur a/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp b/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp
+--- a/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp	2018-11-11 13:51:45.408429081 +0000
++++ b/dialogs/dialogsQTsrv/dlgWndPinpadInfo.cpp	2018-11-11 13:54:03.660290076 +0000
+@@ -21,6 +21,7 @@
+ #include "dlgWndPinpadInfo.h"
+ #include "../langUtil.h"
+ #include <QDesktopWidget>
++#include <QIcon>
+ 
+ dlgWndPinpadInfo::dlgWndPinpadInfo( unsigned long ulHandle,
+ 		DlgPinOperation operation, const QString & Reader,
+@@ -39,7 +40,7 @@
+ 
+ 	QString Title="";
+ 
+-	this->setWindowIcon( QIcon(":/Resources/ICO_CARD_EID_PLAIN_16x16.png") );
++	this->setWindowIcon( QIcon("./Resources/ICO_CARD_EID_PLAIN_16x16.png") );
+ 
+     if (operation == DLG_PIN_OP_CHANGE)
+         Title+= QString::fromWCharArray(GETSTRING_DLG(ChangeYourPin));

diff --git a/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz b/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz
new file mode 100644
index 0000000..67e2ac0
Binary files /dev/null and b/app-misc/cartao-cidadao-git/files/extras-3.0.16.tar.gz differ

diff --git a/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz b/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz
new file mode 100644
index 0000000..f1cdfd5
Binary files /dev/null and b/app-misc/cartao-cidadao-git/files/extras-3.0.20.tar.gz differ

diff --git a/app-misc/cartao-cidadao-git/files/qmake.patch b/app-misc/cartao-cidadao-git/files/qmake.patch
new file mode 100644
index 0000000..3b7c465
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/qmake.patch
@@ -0,0 +1,17 @@
+--- a/configure	2017-09-21 20:34:16.391377881 +0100
++++ b/configure	2017-09-21 21:24:12.444003296 +0100
+@@ -302,11 +302,11 @@
+ my $QtVerZ = 0;
+ my $qmakeVerI = 10000 * $QtVerX + 100 * $QtVerY + $QtVerZ;
+ 
+-my $qmakeVer = `qmake -v`;
+-my $qmakeCmd = "qmake";
++my $qmakeVer = `qmake -qt=5 -v`;
++my $qmakeCmd = "qmake -qt=5";
+ eval {
+ 	print "trying qmake...";
+-	$qmakeVer = `qmake -v`;
++	$qmakeVer = `qmake -qt=5 -v`;
+ };
+ 
+ # get the version nr from the version string

diff --git a/app-misc/cartao-cidadao-git/metadata.xml b/app-misc/cartao-cidadao-git/metadata.xml
new file mode 100644
index 0000000..05b65b5
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuelbernardo.mail@gmail.com</email>
+		<name>Samuel Bernardo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">app-misc/cartao-cidadao-git</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/user/ssnb:master commit in: app-misc/cartao-cidadao-git/files/, app-misc/cartao-cidadao-git/
@ 2021-05-16 16:32 Samuel Bernardo
  0 siblings, 0 replies; 2+ messages in thread
From: Samuel Bernardo @ 2021-05-16 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     be474b67c22a37247fd4afe40cb9a2ad5235dcee
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun May 16 16:32:04 2021 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun May 16 16:32:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=be474b67

Update cartao-cidadao-git to 3.5.0

Signed-off-by: Samuel Bernardo <samuelbernardo.mail <AT> gmail.com>

 app-misc/cartao-cidadao-git/Manifest               | 11 +++++
 ....1.0.ebuild => cartao-cidadao-git-3.5.0.ebuild} |  9 ++--
 .../files/openjpeg.h.3.5.0.patch                   | 48 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/app-misc/cartao-cidadao-git/Manifest b/app-misc/cartao-cidadao-git/Manifest
index fd5cd0e..d13ac4e 100644
--- a/app-misc/cartao-cidadao-git/Manifest
+++ b/app-misc/cartao-cidadao-git/Manifest
@@ -1,4 +1,15 @@
+AUX Makefile.gnu.patch 592 BLAKE2B 417e9fd33f4ba6897f4ddbcd8ec6e53e2bc50e2f854188e1698ada8c9e2e0ea6bbdf5fbf40ddd11e653ec024abdd9fd37f091b38afcbabef7ed445c98ee3ce75 SHA512 8da9359d93fbd4a2ed6df8a58f15228ba13ee7117634e024c2ea759ee046b5ba255d374143b087b506a32d21f44c2cad63b2af95a6834ad051d52e0b5b8aa9cb
+AUX XSECDOMUtils.hpp.patch 536 BLAKE2B 5ea81c2ef978ab408ece58fc068ab972251bd74b0d163c184169ec96064446d5a3781ca11b918ded7f1af9e04b9ab872a817dfdf45a54cd69326c346fa7fe153 SHA512 7ae206233ef95c5e0cd3c6e00dd8d47db81b85c1ee99bbf01c0dff143b8dcf2394a4c211eccb7a8f8fb1c3a2c78d624883865017d7f9a9118fcff9bd03564c66
+AUX XadesSignature.cpp.3.0.16.patch 1005 BLAKE2B 756f629c778a3c5330631ea786395b4f5c41e5b41ff49d6f22f874a98d6c3bab9be8c46990896e67107f8d00bdbec79f4dd0dd543aa1043664c824f73d883163 SHA512 09070ccb55b7b4cc311cb84924dbf791e3b7584aeb7c66cdde8cf5e940169930e8b3f8a4be30fd224b2293ca91ba7e5a13351b3a5fb6ce81d1741ba2120d61e8
+AUX XadesSignature.cpp.patch 1260 BLAKE2B db162abcf4011fc99f6cbf09d70fb5109370b1a75057ad6a7f54dac357f748e144ea5a3585bfd4bbfc3f4d8cfa617137673a3e742208257661eeb12c18ca2d81 SHA512 0d216324c9bba7497aa1af1498bfc2f4bd048d5ba73b8c5479925a4df7f4950a07130b1285abf6928a36fac723b30943b777e1a9ce9213ab3651b94e0f56dca8
+AUX dlgQndPinpadInfo.cpp.patch 813 BLAKE2B 47f0f20e56102ee6eeb65209ad9a11544101e7f03bec7d37cfbab35788066daf8afaa915193ce9b61fc566f30b5826fee3ebfb20d647d620b30ec4751221a4fa SHA512 b8ddccf85b652fc28f9fea77016da45b1c2c6122a03e3ee3de6a558c552e60cca29a3009f8197f687a1aed65dedf77573c497267cffd297d3481afd05ededd72
+AUX extras-3.0.20.tar.gz 92892 BLAKE2B ebaff394933ffa84a6e46989cc93bb7c9395cea37393ed6a9c6dee1d137e5ddd651ca6b36567a9dd25dd302889f009a01aeca53d3fcf6132f6d0aa3819ad940c SHA512 bd32872f0e7ea1ce43d856f0a1e471b2fa04473ea9e0998261bf9cc024ca17d477a01889cacb230a8aa0ae135db1a7880bdcb93a124953322f8dbc59e4a910bf
+AUX openjpeg.h.3.5.0.patch 1917 BLAKE2B 81600f5ffc8a3e1a8387dfd7d8415b1ab1e30b2df5bf04e6d54081d0c1d45df088ee44857bd759e4d7e3f44d6bc5bcdd417e9e81aaa6eedf91db67a2a18993bd SHA512 d6e66dcdde8cbf884574be0c02d97a82735ecd38f7c004998c5ea8c45cff543910075b04fb00efed84aa8240bb14fd2ed09e2235e2d4ea98d6c10732f96529d1
 AUX pteid-mw.pro.patch 440 BLAKE2B 3e46d395af741f23adb860dffa5a4c36e6ea40e6ac2bb8d43025d427c401df3ae4a8493296050f24a776aad82e2670d2d277c0cc10946fe5d3b8e3ccb446849a SHA512 cf89b8c9f5494dbe48a6738077df1a9f9fabb269af837772527c607a2050500679b2230cf7638073f463acc52455c0e7210a2fa58a0eb39f88ebaec08b872cc8
+AUX pteidapplayer.2008.vcxproj.3.4.0.patch 5121 BLAKE2B 40e843f146d0e1fedd2b9b192e76aa9ed15e59cbc508d2b84072964c66cd95e71021d2da7cce8e6235a3cd45f97d38af2d37d7e0fea3ee3f43d2bd6e2583a95e SHA512 b07387206db8727dabf39f736faa4b68e006303cc797d2f077766f0202d94c63113cab5a08a8e8808fe70a8c4fe7c7f2f7a0a3e0165735b1f015fc1f58ff480b
+AUX qmake.patch 468 BLAKE2B 2f91848f33b7d94de801e65d4a97dc3c030701888043df444e10a464f0d796dd7f5f9fc55feef2b8fa175fa984fe4b5f460b6268cce5e7d63d0de78b106deaaf SHA512 ff8ed18d0748e04b1041c7b189a93dfe6674273e677ec86676187b2323ca794d61424204ec8c395c1f5b603c5dd6c346ae2db1cf9886fb42550a827f50c55d34
 DIST Autenticacao.gov_Ubuntu_20_x64.deb 2395212 BLAKE2B 4895d47a446df2dacefd2376e2fea0fb1b1dbbd6e402f14ccffd35b98ce7c5554d59ff5bcaafb02b2939af0afe7ac95ae8e39f77e640ef9d2ce0745d21b359ed SHA512 dd412985b97b2461d648a9b186fbee022ce34f5b4589d5756165309e56de6c09e564d151e412ab26785ffe17f4dd67ab5d60021e598c6e48ecfd34a05f4da6f1
+EBUILD cartao-cidadao-git-3.0.20.ebuild 2075 BLAKE2B 31d6e41f432f00381f5a42e51012a7e6dfb7a5e713dbb80768d57b0cbd9625e1c228cff70ec0cf2e6851b1db53975436d7980ea68c6539b870dce2efff936186 SHA512 cd8a240dfdaa8fdd7e142e60512dd27c9f32ff60db61a3236081ea2ff160588f64dabe7cda6cfffefdcb2a976bd61e384104f09400345b31d3ba32b86fd5699b
 EBUILD cartao-cidadao-git-3.1.0.ebuild 3481 BLAKE2B 8f522f28b53ee6415cf445b1d5891a0a6eb830aa32f4ce98d1e014cfae1d947645cfa72fa44a8120c1f0348389869711caff02f783d1477d2679038a73813a14 SHA512 f11b7f052575e74329f410023c524a95a645b77ad96f0b92338cbbd94f69c2c67e7e6aa0b61f67917a754dea9a9700ad38a718b098659071263f932f772571b2
+EBUILD cartao-cidadao-git-3.5.0.ebuild 3569 BLAKE2B f0604a8ff0a2c9a0e956dd01f257882b3eb755c894087c817cad6f2422eeb74ba7dbc78e066dc37604fd19b627debec0cc09af0d74e6031a2cdca6d07a95f57d SHA512 812990501613e5f553508cc0b03598cdb45711b5f4bccca625f88db0dac7e4a84c7aa02423382a5e2ac9dac2f45d834beeb693520b1dc464a35fdbeda69c54f1
 MISC metadata.xml 352 BLAKE2B cd72105d43a6ffe93ea0b14ca747161283860b37f2c70aac1d29227bc1b774fbfc1d8020effb2fd24c3165d1ffab853ce8791dd263cbaf6ceaf44b36036af25b SHA512 19f6c0e85c78157c5c542b951b3907f59b2891567d452163b46fd3369545095e772167eddc87c31a00e7b5283070f233d92edd86cac5159c123615ffd2c298b9

diff --git a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.1.0.ebuild b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.5.0.ebuild
similarity index 95%
rename from app-misc/cartao-cidadao-git/cartao-cidadao-git-3.1.0.ebuild
rename to app-misc/cartao-cidadao-git/cartao-cidadao-git-3.5.0.ebuild
index ba004ac..b744a16 100644
--- a/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.1.0.ebuild
+++ b/app-misc/cartao-cidadao-git/cartao-cidadao-git-3.5.0.ebuild
@@ -10,8 +10,8 @@ inherit git-r3 unpacker eutils
 
 EGIT_CLONE_TYPE="single"
 EGIT_REPO_URI="https://github.com/amagovpt/autenticacao.gov.git"
-#EGIT_COMMIT="v$PV"
-EGIT_BRANCH="openssl-migration"
+EGIT_COMMIT="v$PV"
+#EGIT_BRANCH="openssl-migration"
 
 SRC_URI="https://www.autenticacao.gov.pt/documents/10179/11962/Autenticacao.gov_Ubuntu_20_x64.deb"
 
@@ -21,8 +21,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="java"
 
 DEPEND="dev-lang/swig
+        sys-devel/qconf
         dev-libs/xml-security-c
 	>=dev-libs/openssl-1.1.0
+	>=media-libs/openjpeg-2.4.0
+	<=media-libs/openjpeg-2.5.0
 	java? ( dev-java/openjdk:11 )"
 RDEPEND="${DEPEND}
         >=sys-apps/pcsc-lite-1.5.0
@@ -44,7 +47,7 @@ RDEPEND="${DEPEND}
 	!app-misc/cartao-cidadao-svn"
 
 PATCHES=(
-	#"${FILESDIR}/*.${PV}.patch"
+	${FILESDIR}/openjpeg.h.${PV}.patch
 	)
 
 src_unpack() {

diff --git a/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch b/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch
new file mode 100644
index 0000000..7f83ccf
--- /dev/null
+++ b/app-misc/cartao-cidadao-git/files/openjpeg.h.3.5.0.patch
@@ -0,0 +1,48 @@
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h b/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h
+--- a/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h	2021-05-16 16:59:11.683395980 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/J2KHelper.h	2021-05-16 17:01:52.437847679 +0100
+@@ -3,7 +3,7 @@
+ 
+ #include <zlib.h>
+ #include <png.h>
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "PNGConverter.h"
+ 
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp
+--- a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp	2021-05-16 16:59:11.684395952 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.cpp	2021-05-16 17:01:52.442847538 +0100
+@@ -43,7 +43,7 @@
+ #include <ctype.h>
+ #include <limits.h>
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "PNGConverter.h"
+ 
+diff -Naur a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h
+--- a/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h	2021-05-16 16:59:11.684395952 +0100
++++ b/pteid-mw-pt/_src/eidmw/applayer/PNGConverter.h	2021-05-16 17:01:52.446847426 +0100
+@@ -1,7 +1,7 @@
+ #ifndef __J2K_CONVERT_H
+ #define __J2K_CONVERT_H
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ /* Component precision clipping */
+ void clip_component(opj_image_comp_t* component, OPJ_UINT32 precision);
+diff -Naur a/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h b/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h
+--- a/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h	2021-05-16 16:59:11.812392305 +0100
++++ b/pteid-mw-pt/_src/eidmw/pteid-poppler/poppler/JPEG2000Stream.h	2021-05-16 17:01:52.456847146 +0100
+@@ -16,7 +16,7 @@
+ #ifndef JPEG2000STREAM_H
+ #define JPEG2000STREAM_H
+ 
+-#include <openjpeg.h>
++#include <openjpeg-2.4/openjpeg.h>
+ 
+ #include "goo/gtypes.h"
+ #include "Object.h"


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-16 16:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-16 16:32 [gentoo-commits] repo/user/ssnb:master commit in: app-misc/cartao-cidadao-git/files/, app-misc/cartao-cidadao-git/ Samuel Bernardo
  -- strict thread matches above, loose matches on Subject: below --
2019-11-17  0:16 Samuel Bernardo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox