diff options
author | Petre Rodan <kaiowas@gentoo.org> | 2007-03-31 18:43:43 +0000 |
---|---|---|
committer | Petre Rodan <kaiowas@gentoo.org> | 2007-03-31 18:43:43 +0000 |
commit | 5d1fa99138717b218d5ee29bc3bc76597c1db8d9 (patch) | |
tree | a8bd66559d73df746812b081b3eeec21cc775ec2 /dev-libs/openct | |
parent | Bumping to version 1.4.3 (diff) | |
download | gentoo-2-5d1fa99138717b218d5ee29bc3bc76597c1db8d9.tar.gz gentoo-2-5d1fa99138717b218d5ee29bc3bc76597c1db8d9.tar.bz2 gentoo-2-5d1fa99138717b218d5ee29bc3bc76597c1db8d9.zip |
added fix from bug #168446
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-libs/openct')
-rw-r--r-- | dev-libs/openct/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch | 39 | ||||
-rw-r--r-- | dev-libs/openct/openct-0.6.11-r1.ebuild | 15 |
3 files changed, 57 insertions, 3 deletions
diff --git a/dev-libs/openct/ChangeLog b/dev-libs/openct/ChangeLog index 21311a3f50e9..2be005cd5966 100644 --- a/dev-libs/openct/ChangeLog +++ b/dev-libs/openct/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openct # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.40 2007/03/03 23:10:40 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/ChangeLog,v 1.41 2007/03/31 18:43:43 kaiowas Exp $ + + 31 Mar 2007; Petre Rodan <kaiowas@gentoo.org> + +files/openct-0.6.11-ifdhandlerv2.patch, openct-0.6.11-r1.ebuild: + added fix from bug #168446 03 Mar 2007; Marius Mauch <genone@gentoo.org> openct-0.5.0.ebuild, openct-0.6.6.ebuild, openct-0.6.8.ebuild, openct-0.6.9.ebuild, diff --git a/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch b/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch new file mode 100644 index 000000000000..7fb968b2a49f --- /dev/null +++ b/dev-libs/openct/files/openct-0.6.11-ifdhandlerv2.patch @@ -0,0 +1,39 @@ +diff -urNp openct-0.6.11.org/configure.ac openct-0.6.11/configure.ac +--- openct-0.6.11.org/configure.ac 2006-11-22 10:20:23.000000000 +0200 ++++ openct-0.6.11/configure.ac 2007-02-26 16:36:59.000000000 +0200 +@@ -104,6 +104,7 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET + AM_PROG_LEX ++AM_GNU_GETTEXT([external]) + AC_PATH_PROG(TEST_MINUS_S_SH, bash) + AC_PATH_PROG(TEST_MINUS_S_SH, ksh) + AC_PATH_PROG(TEST_MINUS_S_SH, sh) +diff -urNp openct-0.6.11.org/src/pcsc/Makefile.am openct-0.6.11/src/pcsc/Makefile.am +--- openct-0.6.11.org/src/pcsc/Makefile.am 2006-06-16 20:38:17.000000000 +0300 ++++ openct-0.6.11/src/pcsc/Makefile.am 2007-02-26 16:36:59.000000000 +0200 +@@ -11,11 +11,10 @@ lib_LTLIBRARIES = openct-ifd.la + endif + + openct_ifd_la_SOURCES = pcsc.c ++openct_ifd_la_CPPFLAGS = -DIFDHANDLERv2 + openct_ifd_la_LDFLAGS = -module -avoid-version + openct_ifd_la_LIBADD = ../ctapi/libopenctapi.la + +-noinst_HEADERS = ifdhandler.h +- + # Don't use HAVE_BUNDLES for this case, pcsc-lite loads + # USB drivers from MacOS X like bundles for all platforms + install-exec-local: install-libLTLIBRARIES +diff -urNp openct-0.6.11.org/src/pcsc/Makefile.in openct-0.6.11/src/pcsc/Makefile.in +--- openct-0.6.11.org/src/pcsc/Makefile.in 2006-11-22 10:22:09.000000000 +0200 ++++ openct-0.6.11/src/pcsc/Makefile.in 2007-02-26 16:37:09.000000000 +0200 +@@ -222,7 +222,7 @@ INCLUDES = -I$(top_srcdir)/src/ctapi $(C + openct_ifd_la_SOURCES = pcsc.c + openct_ifd_la_LDFLAGS = -module -avoid-version + openct_ifd_la_LIBADD = ../ctapi/libopenctapi.la +-noinst_HEADERS = ifdhandler.h ++noinst_HEADERS = + all: all-am + + .SUFFIXES: diff --git a/dev-libs/openct/openct-0.6.11-r1.ebuild b/dev-libs/openct/openct-0.6.11-r1.ebuild index 340915506ef0..12c4fcd51694 100644 --- a/dev-libs/openct/openct-0.6.11-r1.ebuild +++ b/dev-libs/openct/openct-0.6.11-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.11-r1.ebuild,v 1.4 2007/03/03 23:10:40 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.11-r1.ebuild,v 1.5 2007/03/31 18:43:43 kaiowas Exp $ -inherit eutils multilib +inherit flag-o-matic eutils multilib DESCRIPTION="library for accessing smart card terminals" HOMEPAGE="http://www.opensc-project.org/openct/" @@ -20,7 +20,18 @@ pkg_setup() { enewgroup openct } +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/${PN}-0.6.11-ifdhandlerv2.patch" + rm "src/pcsc/ifdhandler.h" +} + src_compile() { + # eautoreconf did not went so great... + # adding additions here. + append-flags "-DIFDHANDLERv2" + econf --localstatedir=/var || die emake || die } |