| 1 |
commit: eaa706cbf986a2b286670f1a180f5886149bada0 |
| 2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 8 08:04:42 2017 +0000 |
| 4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 8 08:08:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa706cb |
| 7 |
|
| 8 |
app-crypt/eid-mw: live ebuild patch updated. Vincent Hardy |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
app-crypt/eid-mw/files/gtk_not_required_9999.patch | 31 +++++++++++----------- |
| 13 |
1 file changed, 16 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-crypt/eid-mw/files/gtk_not_required_9999.patch b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 16 |
index 7990acaebdd..a1680c2353d 100644 |
| 17 |
--- a/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 18 |
+++ b/app-crypt/eid-mw/files/gtk_not_required_9999.patch |
| 19 |
@@ -1,60 +1,61 @@ |
| 20 |
diff --git a/Makefile.am b/Makefile.am |
| 21 |
-index de5416f..8e55277 100644 |
| 22 |
+index 393ecb3..0e14661 100644 |
| 23 |
--- a/Makefile.am |
| 24 |
+++ b/Makefile.am |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
ACLOCAL_AMFLAGS = -I scripts/m4 |
| 27 |
- EXTRA_DIST = scripts/build-aux/config.rpath debian rpm doc |
| 28 |
+ EXTRA_DIST = scripts/build-aux/config.rpath scripts/build-aux/genver.sh .version debian rpm doc |
| 29 |
|
| 30 |
-SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer |
| 31 |
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
| 32 |
++SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi |
| 33 |
|
| 34 |
xpipackage: |
| 35 |
$(MAKE) -C plugins_tools/xpi xpipackage |
| 36 |
diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am |
| 37 |
-index 6e33315..fce4494 100644 |
| 38 |
+index 02e4e36..86d607b 100644 |
| 39 |
--- a/cardcomm/pkcs11/src/Makefile.am |
| 40 |
+++ b/cardcomm/pkcs11/src/Makefile.am |
| 41 |
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \ |
| 42 |
+@@ -165,7 +165,6 @@ libbeidpkcs11_la_SOURCES += \ |
| 43 |
dialogs/dialogsgtk/single_dialog.c |
| 44 |
endif |
| 45 |
|
| 46 |
-libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin |
| 47 |
-- |
| 48 |
+ |
| 49 |
if P11KIT |
| 50 |
dist_p11kitcf_DATA = beid.module |
| 51 |
- install-exec-hook: |
| 52 |
-@@ -176,28 +174,4 @@ install-exec-hook: |
| 53 |
+@@ -176,30 +175,4 @@ install-exec-hook: |
| 54 |
$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so |
| 55 |
endif |
| 56 |
|
| 57 |
-beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c |
| 58 |
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ |
| 59 |
+-beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 60 |
-beid_askpin_LDADD = @GTK_LIBS@ |
| 61 |
- |
| 62 |
-beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c |
| 63 |
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ |
| 64 |
+-beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 65 |
-beid_changepin_LDADD = @GTK_LIBS@ |
| 66 |
- |
| 67 |
-beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c |
| 68 |
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ |
| 69 |
+-beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 70 |
-beid_badpin_LDADD = @GTK_LIBS@ |
| 71 |
- |
| 72 |
-beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c |
| 73 |
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ |
| 74 |
+-beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 75 |
-beid_askaccess_LDADD = @GTK_LIBS@ |
| 76 |
- |
| 77 |
-beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c |
| 78 |
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ |
| 79 |
+-beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 80 |
-beid_spr_askpin_LDADD = @GTK_LIBS@ |
| 81 |
- |
| 82 |
-beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c |
| 83 |
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ |
| 84 |
+-beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@ -DDATAROOTDIR='"$(datarootdir)"' |
| 85 |
-beid_spr_changepin_LDADD = @GTK_LIBS@ |
| 86 |
- |
| 87 |
pkgconfig_DATA=libbeidpkcs11.pc |
| 88 |
+- |
| 89 |
+-SUBDIRS = dialogs/dialogsgtk/po |
| 90 |
diff --git a/configure.ac b/configure.ac |
| 91 |
-index 92bbb3b..a47e7c2 100644 |
| 92 |
+index 9bf10f9..f0120b1 100644 |
| 93 |
--- a/configure.ac |
| 94 |
+++ b/configure.ac |
| 95 |
@@ -59,14 +59,6 @@ fi |
Archives