diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2009-07-05 14:26:22 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-07-05 14:26:22 +0000 |
| commit | c5cc6926a017747683bb2d628b2a598080b1e6d0 (patch) | |
| tree | a3270bfb41a127dd9af9625bc92f3ed52aa73165 /net-misc/rdesktop | |
| parent | Version bump to 3.6.7, minor changes (diff) | |
| download | gentoo-2-c5cc6926a017747683bb2d628b2a598080b1e6d0.tar.gz gentoo-2-c5cc6926a017747683bb2d628b2a598080b1e6d0.tar.bz2 gentoo-2-c5cc6926a017747683bb2d628b2a598080b1e6d0.zip | |
Fix autoconf logic on enabling pcsc-lite, bug #275972
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/rdesktop')
| -rw-r--r-- | net-misc/rdesktop/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch | 22 | ||||
| -rw-r--r-- | net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild (renamed from net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild) | 4 |
3 files changed, 33 insertions, 2 deletions
diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog index b57f0a3ac0fd..988d84134ee9 100644 --- a/net-misc/rdesktop/ChangeLog +++ b/net-misc/rdesktop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/rdesktop # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.112 2009/06/30 09:43:15 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.113 2009/07/05 14:26:22 voyageur Exp $ + +*rdesktop-1.6.0-r3 (05 Jul 2009) + + 05 Jul 2009; Bernard Cafarelli <voyageur@gentoo.org> + -rdesktop-1.6.0-r2.ebuild, +rdesktop-1.6.0-r3.ebuild, + +files/rdesktop-1.6.0-smartcard_configure.patch: + Fix autoconf logic on enabling pcsc-lite, bug #275972 *rdesktop-1.6.0-r2 (30 Jun 2009) diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch new file mode 100644 index 000000000000..a23796694429 --- /dev/null +++ b/net-misc/rdesktop/files/rdesktop-1.6.0-smartcard_configure.patch @@ -0,0 +1,22 @@ +--- configure.ac.orig 2009-07-05 16:13:23.000000000 +0200 ++++ configure.ac 2009-07-05 16:19:39.000000000 +0200 +@@ -108,7 +108,10 @@ + AC_ARG_ENABLE(smartcard, + [ --enable-smartcard Enables smart-card support. + ], +- [ ++ [ ++ if test "$enableval" = no; then ++ WITH_SCARD=0 ++ else + case "$OSTYPE" in + darwin*) + AC_CHECK_HEADER(PCSC/pcsclite.h, [WITH_SCARD=1], [WITH_SCARD=0]) +@@ -143,6 +146,7 @@ + [AC_MSG_RESULT(yes) AC_DEFINE(WITH_PCSC120, 1, [old version of PCSC])], + [AC_MSG_RESULT(no)] + ) ++ fi + ]) + + AC_SUBST(SCARDOBJ) diff --git a/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild index 9da6b3967419..d9476cf71440 100644 --- a/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild +++ b/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r2.ebuild,v 1.1 2009/06/30 09:43:15 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.6.0-r3.ebuild,v 1.1 2009/07/05 14:26:22 voyageur Exp $ EAPI=2 @@ -39,6 +39,8 @@ src_prepare() { # Automagic dependency on libsamplerate epatch "${FILESDIR}"/${P}-sound_configure.patch + # Fix --enable-smartcard logic + epatch "${FILESDIR}"/${P}-smartcard_configure.patch eautoreconf } |