* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2015-08-16 18:16 Sven Vermeulen
0 siblings, 0 replies; 9+ messages in thread
From: Sven Vermeulen @ 2015-08-16 18:16 UTC (permalink / raw
To: gentoo-commits
commit: 4a2f76fd85afb8c3b4fbdf67153378894bc2b821
Author: Sven Vermeulen <swift <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 18:08:07 2015 +0000
Commit: Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 18:16:03 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a2f76fd
app-crypt/eid-mw: Update -9999 to drop gtk requirement in newest builds
Provided by Vincent Hardy, this patches the live ebuild to drop the gtk
requirement from the code. It also includes the pkgconfig file.
Gentoo-Bug: 557604
Package-Manager: portage-2.2.20.1
app-crypt/eid-mw/eid-mw-9999.ebuild | 43 ++++++++++-----
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 64 ++++++++++++++++++++++
app-crypt/eid-mw/metadata.xml | 7 ++-
3 files changed, 99 insertions(+), 15 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 9ef575a..06e154c 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -4,18 +4,18 @@
EAPI=5
-inherit eutils versionator mozextension multilib
+inherit eutils autotools mozextension multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
https://github.com/Fedict/${PN}.git"
- inherit git-2 autotools
+ inherit git-2
SRC_URI=""
else
- MY_P="${PN}-${PV/_p/-}"
- SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
- S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
+ MY_P="${P}-v${PV}"
+ SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~x86 ~amd64 ~arm"
+ S="${WORKDIR}/${MY_P}"
fi
SLOT="0"
@@ -24,9 +24,12 @@ DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian
HOMEPAGE="http://eid.belgium.be"
-IUSE="+gtk +xpi"
+IUSE="+gtk +xpi +dialogs"
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE="
+ dialogs? ( gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:* )
>=sys-apps/pcsc-lite-1.2.9
xpi? ( || ( >=www-client/firefox-bin-3.6.24
>=www-client/firefox-3.6.20 ) )
@@ -35,18 +38,32 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
DEPEND="${RDEPEND}
virtual/pkgconfig"
-if [[ ${PV} == "9999" ]]; then
- src_prepare() {
+src_prepare() {
+ use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+
+ if [[ ${PV} == "9999" ]] ; then
+ # Only in current git. Hopefully, in next release.
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in
+ fi
+
+ if [[ ${PV} == "9999" ]] || ! use gtk ; then
eautoreconf
- }
-fi
+ fi
+}
src_configure() {
- econf $(use_enable gtk dialogs) --disable-static
+ econf $(use_enable dialogs) --disable-static
}
src_install() {
emake DESTDIR="${D}" install
+
+ if [[ ${PV} != "9999" ]] ; then
+ # Automatically done in current git. Hopefully, in next release.
+ rm doc/sdk/include/rsaref220/win32.h
+ doheader -r doc/sdk/include/*
+ fi
if use xpi; then
declare MOZILLA_FIVE_HOME
if has_version '>=www-client/firefox-3.6.20'; then
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
new file mode 100644
index 0000000..ba4d4b1
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -0,0 +1,64 @@
+diff --git a/Makefile.am b/Makefile.am
+index 1a605f7..6475886 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index b70e7f2..ac38944 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+ dialogs/dialogsgtk/single_dialog.c
+ endif
+
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 102c1c7..efdf0e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,11 +56,6 @@ then
+ fi
+ fi
+
+-if test x"$have_gtk" = "xno"
+-then
+- AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 964772a..a695712 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -20,9 +20,12 @@ These three functions form the basis of the countless applications for your eID.
</longdescription>
<use>
<flag name="gtk">
- Enable the dialog pages, by using <pkg>x11-libs/gtk+:2</pkg>
+ All dialogs are available, by using <pkg>x11-libs/gtk+:*</pkg>
</flag>
- <flag name="xpi">
+ <flag name="dialogs">
+ Enable "askaccess" dialog box, by using <pkg>x11-libs/gtk+:*</pkg>
+ </flag>
+ <flag name="xpi">
Build and install an extension for Mozilla browsers.
</flag>
</use>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2015-11-09 2:55 Ian Delaney
0 siblings, 0 replies; 9+ messages in thread
From: Ian Delaney @ 2015-11-09 2:55 UTC (permalink / raw
To: gentoo-commits
commit: 5785246ea4ed856768181f6bbc5550be6950ef2d
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 07:38:05 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 9 02:54:50 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5785246e
app-crypt/eid-mw: add gtk_not_required_4.1.4.patch addressing issue in gentoo bug
Submitted by proxy maintainer via the gentoo bug
Gentoo bug: #564582
Package-Manager: portage-2.2.23
app-crypt/eid-mw/eid-mw-9999.ebuild | 4 +-
.../eid-mw/files/gtk_not_required_4.1.4.patch | 48 ++++++++++++----------
2 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 06e154c..b6a8553 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
MY_P="${P}-v${PV}"
- SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-270730.gz -> ${MY_P}.tar.gz"
+ SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
KEYWORDS="~x86 ~amd64 ~arm"
S="${WORKDIR}/${MY_P}"
fi
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- use gtk || epatch "${FILESDIR}"/gtk_not_required_${PV}.patch
+ use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
if [[ ${PV} == "9999" ]] ; then
# Only in current git. Hopefully, in next release.
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
index 137ef8e..ba4d4b1 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@@ -1,11 +1,24 @@
-diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
---- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200
-@@ -164,29 +164,3 @@
- dialogs/dialogsgtk/dlgs_gtk.cpp \
+diff --git a/Makefile.am b/Makefile.am
+index 1a605f7..6475886 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index b70e7f2..ac38944 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
endif
--
+
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
@@ -31,10 +44,13 @@ diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
-diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
---- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200
-@@ -55,11 +55,6 @@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 102c1c7..efdf0e2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,11 +56,6 @@ then
fi
fi
@@ -46,15 +62,3 @@ diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
###########################################################################
####### read user-specific requests from --enable directives ######
###########################################################################
-diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
---- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200
-+++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
-
--SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
-
- xpipackage:
- $(MAKE) -C plugins_tools/xpi xpipackage
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2015-11-14 14:59 Ian Delaney
0 siblings, 0 replies; 9+ messages in thread
From: Ian Delaney @ 2015-11-14 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 7f9ea004e09fbf082532931934f87a6e8e0493bf
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 14:58:33 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 14:59:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9ea004
app-crypt/eid-mw: revise and correct patches
Patches apply to versions 4.1.4, 4.1.9 and the live ebuild,
supplied by proxy maintainer sourced from the gentoo bug
Gentoo bug: #564582
Package-Manager: portage-2.2.24
app-crypt/eid-mw/eid-mw-4.1.4.ebuild | 2 +-
app-crypt/eid-mw/eid-mw-4.1.9.ebuild | 2 +-
app-crypt/eid-mw/eid-mw-9999.ebuild | 4 +-
.../eid-mw/files/gtk_not_required_4.1.4.patch | 48 ++++++++++------------
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 36 ++++++++++++----
5 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
index 5b16967..0e40e87 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.4.ebuild
@@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"
diff --git a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
index 6055c30..f748be3 100644
--- a/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.1.9.ebuild
@@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware by the Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index b6a8553..2424341 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -20,7 +20,7 @@ fi
SLOT="0"
LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="http://eid.belgium.be"
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- use gtk || epatch "${FILESDIR}"/gtk_not_required_4.1.4.patch
+ use gtk || epatch "${FILESDIR}"/gtk_not_required_9999.patch
if [[ ${PV} == "9999" ]] ; then
# Only in current git. Hopefully, in next release.
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
index ba4d4b1..137ef8e 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
@@ -1,24 +1,11 @@
-diff --git a/Makefile.am b/Makefile.am
-index 1a605f7..6475886 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
-
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 tests/unit plugins_tools/xpi
-
- xpipackage:
- $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..ac38944 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+diff -ur eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/cardcomm/pkcs11/src/Makefile.am 2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/cardcomm/pkcs11/src/Makefile.am 2015-08-13 14:12:43.827586821 +0200
+@@ -164,29 +164,3 @@
+ dialogs/dialogsgtk/dlgs_gtk.cpp \
dialogs/dialogsgtk/single_dialog.c
endif
-
+-
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
@@ -44,13 +31,10 @@ index b70e7f2..ac38944 100644
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 102c1c7..efdf0e2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,11 +56,6 @@ then
+diff -ur eid-mw-4.1.4-v4.1.4-a/configure.ac eid-mw-4.1.4-v4.1.4-b/configure.ac
+--- eid-mw-4.1.4-v4.1.4-a/configure.ac 2015-07-27 10:30:34.641752294 +0200
++++ eid-mw-4.1.4-v4.1.4-b/configure.ac 2015-08-13 14:13:51.456736608 +0200
+@@ -55,11 +55,6 @@
fi
fi
@@ -62,3 +46,15 @@ index 102c1c7..efdf0e2 100644
###########################################################################
####### read user-specific requests from --enable directives ######
###########################################################################
+diff -ur eid-mw-4.1.4-v4.1.4-a/Makefile.am eid-mw-4.1.4-v4.1.4-b/Makefile.am
+--- eid-mw-4.1.4-v4.1.4-a/Makefile.am 2015-07-27 10:30:34.638418958 +0200
++++ eid-mw-4.1.4-v4.1.4-b/Makefile.am 2015-08-13 14:11:43.878340486 +0200
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk
++SUBDIRS=cardcomm/pkcs11/src tests/unit plugins_tools/xpi
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index ba4d4b1..93ddc67 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -12,31 +12,48 @@ index 1a605f7..6475886 100644
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index b70e7f2..ac38944 100644
+index b70e7f2..066c348 100644
--- a/cardcomm/pkcs11/src/Makefile.am
+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,30 +165,4 @@ libbeidpkcs11_la_SOURCES += \
+@@ -165,30 +165,30 @@ libbeidpkcs11_la_SOURCES += \
dialogs/dialogsgtk/single_dialog.c
endif
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
--
++#libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
-beid_askpin_LDADD = @GTK_LIBS@
--
++#beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
++#beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
++#beid_askpin_LDADD = @GTK_LIBS@
++#
++#beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
++#beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_changepin_LDADD = @GTK_LIBS@
+
-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_changepin_LDADD = @GTK_LIBS@
--
++#beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
++#beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_badpin_LDADD = @GTK_LIBS@
+
-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_badpin_LDADD = @GTK_LIBS@
--
++#beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
++#beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_askaccess_LDADD = @GTK_LIBS@
+
-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_askaccess_LDADD = @GTK_LIBS@
--
++#beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
++#beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_spr_askpin_LDADD = @GTK_LIBS@
+
-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_askpin_LDADD = @GTK_LIBS@
@@ -44,7 +61,10 @@ index b70e7f2..ac38944 100644
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
-beid_spr_changepin_LDADD = @GTK_LIBS@
--
++#beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
++#beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
++#beid_spr_changepin_LDADD = @GTK_LIBS@
+
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
index 102c1c7..efdf0e2 100644
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2017-02-02 14:55 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2017-02-02 14:55 UTC (permalink / raw
To: gentoo-commits
commit: cad92e97469bebb918f4b2e3e47b7a8e7cad381d
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 14:42:55 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 14:55:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cad92e97
app-crypt/eid-mw: ver bump 4.2.0 bug #607206. Vincent Hardy
Package-Manager: portage-2.3.0
app-crypt/eid-mw/Manifest | 1 +
app-crypt/eid-mw/eid-mw-4.2.0.ebuild | 98 +++++++++++++++++++++++
app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 +++++++++++++++++
app-crypt/eid-mw/metadata.xml | 3 +
4 files changed, 176 insertions(+)
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 0d8cca6..0bea827 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1,4 @@
DIST eid-mw-4.1.18-v4.1.18.tar.gz 3480541 SHA256 abc9d3194008f05b2589ddd9a29c45d22d89716bdc8689fcec42b2aa8450ddbf SHA512 18825a06007f7c07609cee034896ebf64b589200e04b72fece2bd65004a738c01cf64475d59f2c94b7242aa1adfc433bf4af6cf8b5d809746f3e9357ac27b98c WHIRLPOOL 584817aff81a1e0b1af24e5b259fa7e40b5a43b27be701242430cdc480d8ba57205faeba6fb787f1321e02916e6f3efa722e01609151fa3798b8e37b13cb159e
DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
+DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
diff --git a/app-crypt/eid-mw/eid-mw-4.2.0.ebuild b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
new file mode 100644
index 00000000..2ff1843
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+ https://github.com/Fedict/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+ ${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64 ~arm"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="http://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+ dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+ x11-libs/gtk+:*
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ !app-misc/eid-viewer-bin
+ )
+ >=sys-apps/pcsc-lite-1.2.9
+ p11-kit? ( app-crypt/p11-kit )
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24
+ >=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+ # hardcoded lsb_info
+ sed -i \
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+ plugins_tools/aboutmw/gtk/about-main.c || die
+
+ if [[ ${PV} == "9999" ]] ; then
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+ else
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ --with-gnu-ld \
+ --disable-static \
+ --disable-signed
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use xpi; then
+ declare MOZILLA_FIVE_HOME
+ if has_version '>=www-client/firefox-3.6.20'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ if has_version '>=www-client/firefox-bin-3.6.24'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ fi
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+ use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
new file mode 100644
index 00000000..7990aca
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
@@ -0,0 +1,74 @@
+diff --git a/Makefile.am b/Makefile.am
+index de5416f..8e55277 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 6e33315..fce4494 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+ dialogs/dialogsgtk/single_dialog.c
+ endif
+
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+ install-exec-hook:
+@@ -176,28 +174,4 @@ install-exec-hook:
+ $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
+
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+diff --git a/configure.ac b/configure.ac
+index 92bbb3b..a47e7c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,14 +59,6 @@ fi
+
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
+
+-if test "$have_gtk" = "no"
+-then
+- AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index a0a9188..9cc3204 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -28,5 +28,8 @@ These three functions form the basis of the countless applications for your eID.
<flag name="xpi">
Build and install an extension for Mozilla browsers.
</flag>
+ <flag name="p11-kit">
+ Support for app-crypt/p11-kit.
+ </flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2017-02-02 15:33 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2017-02-02 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 209f44991bab243a5643b669da87ed9bbc752992
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 2 15:23:44 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu Feb 2 15:30:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209f4499
app-crypt/eid-mw: update live ebuild #607488. Vincent Hardy
Package-Manager: portage-2.3.0
app-crypt/eid-mw/eid-mw-9999.ebuild | 67 ++++++++++++----------
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 19 +++---
2 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 57bb7b8..c5f5f8f 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit autotools mozextension
+inherit eutils autotools mozextension multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
@@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
SRC_URI=""
else
- MY_P="${P}-v${PV}"
- SRC_URI="https://downloads.services.belgium.be/eid/${MY_P}.tar.gz"
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+ ${P}.tar.gz"
KEYWORDS="~x86 ~amd64 ~arm"
- S="${WORKDIR}/${MY_P}"
fi
SLOT="0"
@@ -24,17 +23,22 @@ DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal
HOMEPAGE="http://eid.belgium.be"
-IUSE="+gtk +xpi +dialogs"
+IUSE="+dialogs +gtk p11-kit +xpi"
REQUIRED_USE="
dialogs? ( gtk )"
-RDEPEND="gtk? ( x11-libs/gtk+:= )
+RDEPEND="gtk? (
+ x11-libs/gtk+:*
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ !app-misc/eid-viewer-bin
+ )
>=sys-apps/pcsc-lite-1.2.9
- net-libs/libproxy
+ p11-kit? ( app-crypt/p11-kit )
xpi? ( || ( >=www-client/firefox-bin-3.6.24
- >=www-client/firefox-3.6.20 ) )
- !app-misc/beid-runtime"
+ >=www-client/firefox-3.6.20 ) )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -42,28 +46,30 @@ DEPEND="${RDEPEND}
src_prepare() {
eapply_user
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+ # hardcoded lsb_info
+ sed -i \
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+ plugins_tools/aboutmw/gtk/about-main.c || die
+
if [[ ${PV} == "9999" ]] ; then
use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
-
- # Only in current git. Hopefully, in next release.
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
else
- use gtk || eapply "${FILESDIR}"/gtk_not_required_4.1.4.patch
- fi
-
- if [[ ${PV} == "9999" ]] || ! use gtk ; then
- eautoreconf
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
fi
- # Do that after autoreconf (if autoreconf is required)
- # This patch is not mandatory, it's just to do things properly :-)
- eapply "${FILESDIR}"/not_zip_xpi_plugin.patch
+ eautoreconf
}
src_configure() {
econf \
$(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ --with-gnu-ld \
--disable-static \
--disable-signed
}
@@ -71,21 +77,22 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- if [[ ${PV} != "9999" ]] ; then
- # Automatically done in current git. Hopefully, in next release.
- rm doc/sdk/include/rsaref220/win32.h || die
- doheader -r doc/sdk/include/*
- fi
if use xpi; then
declare MOZILLA_FIVE_HOME
if has_version '>=www-client/firefox-3.6.20'; then
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
fi
if has_version '>=www-client/firefox-bin-3.6.24'; then
MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
fi
fi
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la || die
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+ use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
}
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
index f66ec18..7990aca 100644
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
@@ -1,13 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
-index 65baf07..c264576 100644
+index de5416f..8e55277 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath debian build-debian.sh rpm doc
+ EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc
-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
xpipackage:
$(MAKE) -C plugins_tools/xpi xpipackage
@@ -54,10 +54,10 @@ index 6e33315..fce4494 100644
-
pkgconfig_DATA=libbeidpkcs11.pc
diff --git a/configure.ac b/configure.ac
-index 6485b23..a1f9c93 100644
+index 92bbb3b..a47e7c2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -59,11 +59,6 @@ fi
+@@ -59,14 +59,6 @@ fi
AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
@@ -66,6 +66,9 @@ index 6485b23..a1f9c93 100644
- AC_MSG_ERROR([At least one version of GTK is required.])
-fi
-
- PKG_CHECK_MODULES([XML2], [libxml-2.0])
- PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives ######
+ ###########################################################################
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2017-04-12 17:02 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2017-04-12 17:02 UTC (permalink / raw
To: gentoo-commits
commit: e100d4676d821df59fe477088a28b1775c003149
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 16:56:28 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 16:59:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e100d467
app-crypt/eid-mw: version bump 4.2.5. Vincent Hardy
Package-Manager: portage-2.3.3
app-crypt/eid-mw/Manifest | 1 +
app-crypt/eid-mw/eid-mw-4.2.5.ebuild | 98 ++++++++++++++++++++++
.../eid-mw/files/gtk_not_required_4_2_5.patch | 75 +++++++++++++++++
app-crypt/eid-mw/metadata.xml | 2 +-
4 files changed, 175 insertions(+), 1 deletion(-)
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d6c050028fb..881a3d0dc69 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
DIST eid-mw-4.2.0.tar.gz 8508064 SHA256 4d86f4750f973a8dcf700544b92ffc3069a85ff93086538b9f334d76dd5c9747 SHA512 c0785e25c8b3640d0b60110553a520df3c3c5a0774f4f3fba6a4d9329c0d6e6187b0837d8c254a3959ffa798dc6299399e6cb8edfc7a20dabca080b61f532a5f WHIRLPOOL b1dee0c0a1800b81a7f392bc0e13d070a1cbc7fa6eb2f26e9c50903e058f322ff0b2da69469f90bd38240f49520be29bb548ca6954bc052ef5b23bdb4cad2643
+DIST eid-mw-4.2.5.tar.gz 7751526 SHA256 d2c46a65026790485f39db0b6d9b66a65b1d19061f3682a0b6da2e2b0c54bc81 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075 WHIRLPOOL c24186b1f2b6b02df4a790e3a8c3d1f8e762b1e556d8f55aeeb4523a71387045827b47444246334933fc3d746485ea14086cfe41c5ec23f43826e6a7375c7fc3
diff --git a/app-crypt/eid-mw/eid-mw-4.2.5.ebuild b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
new file mode 100644
index 00000000000..f77817c88b4
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-4.2.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils autotools mozextension
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
+ https://github.com/Fedict/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} ->
+ ${P}.tar.gz"
+ KEYWORDS="~x86 ~amd64 ~arm"
+fi
+
+SLOT="0"
+LICENSE="LGPL-3"
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+
+HOMEPAGE="https://eid.belgium.be"
+
+IUSE="+dialogs +gtk p11-kit +xpi"
+
+REQUIRED_USE="
+ dialogs? ( gtk )"
+
+RDEPEND="gtk? (
+ x11-libs/gdk-pixbuf[jpeg]
+ x11-libs/gtk+:*
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ !app-misc/eid-viewer-bin
+ )
+ >=sys-apps/pcsc-lite-1.2.9
+ p11-kit? ( app-crypt/p11-kit )
+ xpi? ( || ( >=www-client/firefox-bin-3.6.24
+ >=www-client/firefox-3.6.20 ) )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ eapply_user
+
+ sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
+ sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
+
+ # hardcoded lsb_info
+ sed -i \
+ -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+ -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+ -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+ plugins_tools/aboutmw/gtk/about-main.c || die
+
+ if [[ ${PV} == "9999" ]] ; then
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
+ else
+ use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2_5.patch
+ fi
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ --with-gnu-ld \
+ --disable-static \
+ --disable-signed
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ if use xpi; then
+ declare MOZILLA_FIVE_HOME
+ if has_version '>=www-client/firefox-3.6.20'; then
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ if has_version '>=www-client/firefox-bin-3.6.24'; then
+ MOZILLA_FIVE_HOME="/opt/firefox"
+ xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
+ fi
+ fi
+ rm -r "${D}/usr/share/mozilla" "${D}"/usr/$(get_libdir)/*.la || die
+ use gtk || rm -r "${D}/usr/include/eid-util" || die
+}
+
+pkg_postinst()
+{
+ use gtk && glib-compile-schemas /usr/share/glib-2.0/schemas/
+}
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
new file mode 100644
index 00000000000..a1680c2353d
--- /dev/null
+++ b/app-crypt/eid-mw/files/gtk_not_required_4_2_5.patch
@@ -0,0 +1,75 @@
+diff --git a/Makefile.am b/Makefile.am
+index 393ecb3..0e14661 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
+
+ xpipackage:
+ $(MAKE) -C plugins_tools/xpi xpipackage
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 02e4e36..86d607b 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
+ dialogs/dialogsgtk/single_dialog.c
+ endif
+
+-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+
+ if P11KIT
+ dist_p11kitcf_DATA = beid.module
+@@ -176,30 +175,4 @@ install-exec-hook:
+ $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
+ endif
+
+-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_askpin_LDADD = @GTK_LIBS@
+-
+-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_changepin_LDADD = @GTK_LIBS@
+-
+-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_badpin_LDADD = @GTK_LIBS@
+-
+-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_askaccess_LDADD = @GTK_LIBS@
+-
+-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_spr_askpin_LDADD = @GTK_LIBS@
+-
+-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
+-beid_spr_changepin_LDADD = @GTK_LIBS@
+-
+ pkgconfig_DATA=libbeidpkcs11.pc
+-
+-SUBDIRS = dialogs/dialogsgtk/po
+diff --git a/configure.ac b/configure.ac
+index 9bf10f9..f0120b1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,14 +59,6 @@ fi
+
+ AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
+
+-if test "$have_gtk" = "no"
+-then
+- AC_MSG_ERROR([At least one version of GTK is required.])
+-fi
+-
+-PKG_CHECK_MODULES([XML2], [libxml-2.0])
+-PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
+-
+ ###########################################################################
+ ####### read user-specific requests from --enable directives ######
+ ###########################################################################
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 9cc32049c19..5a0c5666c03 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -16,7 +16,7 @@ With your eID, you can:
- authenticate yourself. This is a way of checking that you are who you say you are. That can be handy on the internet or to enable your children to chat in safety.
- place a legally binding electronic signature on electronic documents.
-These three functions form the basis of the countless applications for your eID. Go to http://welcome-to-e-belgium.be/en/ and check out what can you do with it? and discover all the things you can use the eID for.
+These three functions form the basis of the countless applications for your eID. Go to https://my.belgium.be and check out what can you do with it? and discover all the things you can use the eID for.
</longdescription>
<use>
<flag name="gtk">
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2017-06-28 8:15 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2017-06-28 8:15 UTC (permalink / raw
To: gentoo-commits
commit: e90698c633420aeeffe3b365383b189f2d771838
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 08:10:35 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 08:15:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90698c6
app-crypt/eid-mw: update live ebuild. Vincent Hardy
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-crypt/eid-mw/eid-mw-9999.ebuild | 7 +-
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 75 ----------------------
2 files changed, 1 insertion(+), 81 deletions(-)
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 0f64029e0d8..4ccf556d280 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -56,12 +56,6 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
- if [[ ${PV} == "9999" ]] ; then
- use gtk || eapply "${FILESDIR}"/gtk_not_required_9999.patch
- else
- use gtk || eapply "${FILESDIR}"/gtk_not_required_4_2.patch
- fi
-
eautoreconf
}
@@ -69,6 +63,7 @@ src_configure() {
econf \
$(use_enable dialogs) \
$(use_enable p11-kit p11kit) \
+ $(use_with gtk gtkvers)$(use gtk && echo =detect) \
--with-gnu-ld \
--disable-static \
--disable-signed
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch
deleted file mode 100644
index a1680c2353d..00000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 393ecb3..0e14661 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
-
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi
-
- xpipackage:
- $(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 02e4e36..86d607b 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \
- dialogs/dialogsgtk/single_dialog.c
- endif
-
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
-
- if P11KIT
- dist_p11kitcf_DATA = beid.module
-@@ -176,30 +175,4 @@ install-exec-hook:
- $(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
-
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"'
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
--
--SUBDIRS = dialogs/dialogsgtk/po
-diff --git a/configure.ac b/configure.ac
-index 9bf10f9..f0120b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
-
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
-
--if test "$have_gtk" = "no"
--then
-- AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
--PKG_CHECK_MODULES([XML2], [libxml-2.0])
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
--
- ###########################################################################
- ####### read user-specific requests from --enable directives ######
- ###########################################################################
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2021-01-03 20:55 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2021-01-03 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 0cf87b70d683bb210882ef7f171bbd8b44123d63
Author: Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 3 20:50:57 2021 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Jan 3 20:54:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf87b70
app-crypt/eid-mw: version bump 5.0.11, fix bug #751472
Closes: https://bugs.gentoo.org/751472
Submitted-by: Vincent Hardy <vincent.hardy.be <AT> gmail.com>
Package-Manager: Portage-3.0.9, Repoman-2.3.23
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
app-crypt/eid-mw/Manifest | 1 +
.../{eid-mw-9999.ebuild => eid-mw-5.0.11.ebuild} | 15 ++++++++++++---
app-crypt/eid-mw/eid-mw-9999.ebuild | 5 ++++-
app-crypt/eid-mw/files/use-printf-in-Makefile.patch | 21 +++++++++++++++++++++
4 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 466fd851283..43ea89c2253 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,3 @@
DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
+DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
similarity index 83%
copy from app-crypt/eid-mw/eid-mw-9999.ebuild
copy to app-crypt/eid-mw/eid-mw-5.0.11.ebuild
index 19055f55bc5..b0e0654fd5b 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools desktop gnome2-utils xdg-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="https://eid.belgium.be"
-EGIT_REPO_URI="https://github.com/Fedict/${PN}.git"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="+dialogs +gtk +p11v220 p11-kit"
RDEPEND=">=sys-apps/pcsc-lite-1.2.9
@@ -32,6 +33,11 @@ REQUIRED_USE="dialogs? ( gtk )"
src_prepare() {
default
+ # Buggy internal versioning when autoreconf a tarball release.
+ # Weird numbering is required otherwise we get a seg fault in
+ # about-eid-mw program.
+ echo "${PV}-v${PV}" > .version
+
# xpi module : we don't want it anymore
sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
@@ -53,6 +59,9 @@ src_prepare() {
-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
configure.ac || die
+ # See bug #751472
+ eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
eautoreconf
}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 19055f55bc5..5b107133261 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,6 +53,9 @@ src_prepare() {
-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
configure.ac || die
+ # See bug #751472
+ eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
eautoreconf
}
diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
new file mode 100644
index 00000000000..5b4ef2adc07
--- /dev/null
+++ b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
@@ -0,0 +1,21 @@
+diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+--- a/plugins_tools/eid-viewer/Makefile.am 2020-08-19 15:32:50.000000000 +0200
++++ b/plugins_tools/eid-viewer/Makefile.am 2020-12-21 23:07:49.980421703 +0200
+@@ -125,13 +125,13 @@
+ SUBDIRS = . gtk/po test uml
+
+ resources/%.c: resources/%.png
+- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@
+- echo -e "#pragma GCC diagnostic pop\n" >> $@
++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ resources/%.c: resources/%.jpg
+- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@
+- echo -e "#pragma GCC diagnostic pop\n" >> $@
++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+
+ BUILT_SOURCES = gtk/viewer_glade.h \
+ resources/coat_of_arms_nl.c \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/
@ 2024-08-10 13:58 Amy Liffey
0 siblings, 0 replies; 9+ messages in thread
From: Amy Liffey @ 2024-08-10 13:58 UTC (permalink / raw
To: gentoo-commits
commit: 8ebd1d9a0846f5e8110a22bb88f428ae343c19c3
Author: Vincent Hardy <vincent.hardy.be <AT> gmail <DOT> com>
AuthorDate: Sat Aug 10 13:51:24 2024 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 13:52:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebd1d9a
app-crypt/eid-mw: add 5.1.19
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org>
app-crypt/eid-mw/Manifest | 1 +
app-crypt/eid-mw/eid-mw-5.1.19.ebuild | 91 ++++++++++++++++++++++
.../files/0001-Do-not-build-xpi-module.patch | 38 +++++++++
.../files/0001-Fix-libdir-for-manifestdir.patch | 30 +++++++
app-crypt/eid-mw/files/0001-Remove-uml-build.patch | 48 ++++++++++++
5 files changed, 208 insertions(+)
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 623c7a009f28..f2415a4abd3b 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1 +1,2 @@
DIST eid-mw-5.1.18.tar.gz 16299966 BLAKE2B 417b92ad366f32da42c112828d9d01c5beee59045750b4fc69bbcfdea338e1e5d2db00765cae5dab5d22f36122437aa113a968620aefa013f893aebb74208d76 SHA512 1e6e9056fdadbeae623039f1a0e8e6b6e4e80ab313e0fed31824035a32b3173a042f18c254c06bb57d918afbf5162eb23990b51bb0c525e7929128466c74b4d7
+DIST eid-mw-5.1.19.tar.gz 16299622 BLAKE2B a66c861c1120851ecbfd66de4b61db2c2f0951735982365ad516f2cf31249e7241180829e2992738821ecbd09c0fd83a0cba11cf34b23cdc45bfd9899072777a SHA512 9383fa4661a6e46510c3c0f1509aa9c9ee772b7222faacdad3de9433529591c9e7b102d954363f345e47104f4f0473e241c0be57d1049936842e67dac45adc2f
diff --git a/app-crypt/eid-mw/eid-mw-5.1.19.ebuild b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
new file mode 100644
index 000000000000..905a49b49f47
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.19.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop gnome2-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+dialogs +gtk p11-kit"
+
+RDEPEND="sys-apps/pcsc-lite
+ gtk? (
+ x11-libs/gdk-pixbuf[jpeg]
+ x11-libs/gtk+:3
+ dev-libs/libxml2
+ net-misc/curl[ssl]
+ net-libs/libproxy
+ app-crypt/pinentry[gtk]
+ )
+ p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+PATCHES=(
+ "${FILESDIR}/0001-Do-not-build-xpi-module.patch"
+ "${FILESDIR}/0001-Fix-libdir-for-manifestdir.patch"
+ "${FILESDIR}/0001-Remove-uml-build.patch"
+ )
+
+src_prepare() {
+ default
+
+ # Buggy internal versioning when autoreconf a tarball release.
+ # Weird numbering is required otherwise we get a seg fault in
+ # about-eid-mw program.
+ echo "${PV}-v${PV}" > .version
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable dialogs) \
+ $(use_enable p11-kit p11kit) \
+ $(use_with gtk gtkvers '3') \
+ --with-gnu-ld
+}
+
+src_install() {
+ default
+ find "${ED}" -type f -name '*.la' -delete || die
+ if use gtk; then
+ domenu plugins_tools/eid-viewer/eid-viewer.desktop
+ doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+ fi
+}
+
+pkg_postinst() {
+ if use gtk; then
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+
+ local peimpl=$(eselect --brief --colour=no pinentry show)
+ case "${peimpl}" in
+ *gnome*|*qt*) ;;
+ *) ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+ ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+ ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+ ewarn " # eselect pinentry set pinentry-gnome3"
+ ;;
+ esac
+ fi
+}
+
+pkg_postrm() {
+ if use gtk; then
+ gnome2_schemas_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ fi
+}
diff --git a/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
new file mode 100644
index 000000000000..6bea1b0056a6
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Do-not-build-xpi-module.patch
@@ -0,0 +1,38 @@
+From 2e5b6e80acc9ffc42afe329facdcb443dca21a34 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:30:27 +0200
+Subject: [PATCH] Do not build xpi module
+
+xpi module has to be installed by the users
+---
+ Makefile.am | 2 +-
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 209a83c85..1073a8141 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I scripts/m4
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc
+
+-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/v240 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/chrome_pkcs11 tests/fuzz
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/v240 plugins_tools/util tests/unit plugins_tools/chrome_pkcs11 tests/fuzz
+
+ if GTK
+ SUBDIRS += plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
+diff --git a/configure.ac b/configure.ac
+index 845e8487c..b729bb870 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -275,6 +275,5 @@ AC_CONFIG_FILES([Makefile
+ plugins_tools/eid-viewer/gtk/eid-viewer.desktop.sh
+ plugins_tools/eid-viewer/uml/Makefile
+ rpm/eid-mw.spec])
+-AC_CONFIG_SUBDIRS([plugins_tools/xpi])
+
+ AC_OUTPUT
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
new file mode 100644
index 000000000000..4121c208725c
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Fix-libdir-for-manifestdir.patch
@@ -0,0 +1,30 @@
+From feb0032d95568e7f0dd1736ac773363cc778ce59 Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 10:58:44 +0200
+Subject: [PATCH] Fix libdir for manifestdir
+
+See also https://github.com/Fedict/eid-mw/pull/199
+---
+ cardcomm/pkcs11/src/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..ddc410fb4 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -211,10 +211,10 @@ beid_spr_changepin_LDADD = @GTK_LIBS@
+ metainfodir = $(datarootdir)/metainfo
+ dist_metainfo_DATA = be.belgium.eid.eidmw.metainfo.xml
+
+-pkcs11_manifestdir = $(prefix)/lib/mozilla/pkcs11-modules
++pkcs11_manifestdir = $(libdir)/mozilla/pkcs11-modules
+ pkcs11_manifest_DATA = beidpkcs11.json beidpkcs11_alt.json
+
+-managed_storage_manifestdir = $(prefix)/lib/mozilla/managed-storage
++managed_storage_manifestdir = $(libdir)/mozilla/managed-storage
+ managed_storage_manifest_DATA = belgiumeid@eid.belgium.be.json
+
+ pkgconfig_DATA=libbeidpkcs11.pc
+--
+2.44.2
+
diff --git a/app-crypt/eid-mw/files/0001-Remove-uml-build.patch b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
new file mode 100644
index 000000000000..6ff056a9876a
--- /dev/null
+++ b/app-crypt/eid-mw/files/0001-Remove-uml-build.patch
@@ -0,0 +1,48 @@
+From 3ad7dc89bdcae1607b90909cb2a5598363da74cf Mon Sep 17 00:00:00 2001
+From: Vincent Hardy <vincent.hardy.be@gmail.com>
+Date: Thu, 8 Aug 2024 15:02:00 +0200
+Subject: [PATCH] Remove uml build
+
+See bug #811270
+---
+ cardcomm/pkcs11/src/Makefile.am | 3 +--
+ plugins_tools/eid-viewer/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
+index 33201b147..5decdfb26 100644
+--- a/cardcomm/pkcs11/src/Makefile.am
++++ b/cardcomm/pkcs11/src/Makefile.am
+@@ -148,7 +148,6 @@ noinst_HEADERS = \
+ dialogs/dialogsgtk/gtk_dialog_names.h \
+ fuzz/beid_fuzz.h
+
+-SUBDIRS = cardlayer/uml
+ if NO_DIALOGS
+ libbeidpkcs11_la_CXXFLAGS += -DNO_DIALOGS
+ libbeidpkcs11_la_LIBADD += libbeidcommon.la
+@@ -171,7 +170,7 @@ libdialogs_la_SOURCES = \
+ dialogs/dialogsgtk/dlgs_gtk.cpp \
+ dialogs/dialogsgtk/single_dialog.c
+ libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
+-SUBDIRS += dialogs/dialogsgtk/po
++SUBDIRS = dialogs/dialogsgtk/po
+ endif
+ endif
+
+diff --git a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+index a25746d3d..0a631d41c 100644
+--- a/plugins_tools/eid-viewer/Makefile.am
++++ b/plugins_tools/eid-viewer/Makefile.am
+@@ -139,7 +139,7 @@ libeidviewer_la_LIBADD = $(top_builddir)/plugins_tools/util/liblabels.la $(top_b
+ libeidviewer_la_LDFLAGS = -version-info 1:0:1
+ AM_CFLAGS = @GTK_CFLAGS@ -I. -I$(srcdir)/include -Igtk -DDATAROOTDIR='"$(datarootdir)"' -I$(top_srcdir)/doc/sdk/include/v240 -I$(top_srcdir)/cardcomm/pkcs11/src/fuzz -I$(top_srcdir)/plugins_tools/util @SSL_CFLAGS@ @GIO_CFLAGS@ @XML2_CFLAGS@ @CURL_CFLAGS@ @libproxy_CFLAGS@ -fvisibility=hidden @FUZZING@
+ AM_CXXFLAGS = $(AM_CFLAGS) -std=c++98
+-SUBDIRS = . gtk/po test uml
++SUBDIRS = . gtk/po test
+
+ resources/%.c: resources/%.png
+ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+--
+2.44.2
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-08-10 13:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-10 13:58 [gentoo-commits] repo/gentoo:master commit in: app-crypt/eid-mw/files/, app-crypt/eid-mw/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2021-01-03 20:55 Amy Liffey
2017-06-28 8:15 Amy Liffey
2017-04-12 17:02 Amy Liffey
2017-02-02 15:33 Amy Liffey
2017-02-02 14:55 Amy Liffey
2015-11-14 14:59 Ian Delaney
2015-11-09 2:55 Ian Delaney
2015-08-16 18:16 Sven Vermeulen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox