Skip to content

Commit

Permalink
app-crypt/eid-mw: add gtk_not_required_4.1.4.patch addressing issue i…
Browse files Browse the repository at this point in the history
…n gentoo bug

Submitted by proxy maintainer via the gentoo bug

Gentoo bug: #564582

Package-Manager: portage-2.2.23
  • Loading branch information
Ian Delaney committed Nov 9, 2015
1 parent b0b9fe0 commit 5785246
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
4 changes: 2 additions & 2 deletions app-crypt/eid-mw/eid-mw-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
48 changes: 26 additions & 22 deletions app-crypt/eid-mw/files/gtk_not_required_4.1.4.patch
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -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

0 comments on commit 5785246

Please sign in to comment.