diff options
author | Amy Liffey <amynka@gentoo.org> | 2017-02-02 15:42:55 +0100 |
---|---|---|
committer | Amy Liffey <amynka@gentoo.org> | 2017-02-02 15:55:09 +0100 |
commit | cad92e97469bebb918f4b2e3e47b7a8e7cad381d (patch) | |
tree | 7c67e7d2ab1e96ee97a971fcf406bf84c3ff8094 /app-crypt/eid-mw/files | |
parent | net-misc/quagga: version bump (diff) | |
download | gentoo-cad92e97469bebb918f4b2e3e47b7a8e7cad381d.tar.gz gentoo-cad92e97469bebb918f4b2e3e47b7a8e7cad381d.tar.bz2 gentoo-cad92e97469bebb918f4b2e3e47b7a8e7cad381d.zip |
app-crypt/eid-mw: ver bump 4.2.0 bug #607206. Vincent Hardy
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-crypt/eid-mw/files')
-rw-r--r-- | app-crypt/eid-mw/files/gtk_not_required_4_2.patch | 74 |
1 files changed, 74 insertions, 0 deletions
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 000000000000..7990acaebdd2 --- /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 ###### + ########################################################################### |