diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-08-04 19:10:31 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-08-04 19:10:31 +0000 |
| commit | 7fae3a371ee0e42134dd24df5167cbf0ae998237 (patch) | |
| tree | 185736e8d880b561f0205caa89e0e53d90c74986 /net-im/centerim | |
| parent | version bump (diff) | |
| download | gentoo-2-7fae3a371ee0e42134dd24df5167cbf0ae998237.tar.gz gentoo-2-7fae3a371ee0e42134dd24df5167cbf0ae998237.tar.bz2 gentoo-2-7fae3a371ee0e42134dd24df5167cbf0ae998237.zip | |
Add patch to fix error in configure.ac, bug #232312.
(Portage version: 2.2_rc6/cvs/Linux 2.6.27-rc1-00504-g2b12a4c x86_64)
Diffstat (limited to 'net-im/centerim')
| -rw-r--r-- | net-im/centerim/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/centerim/centerim-4.22.5.ebuild | 11 | ||||
| -rw-r--r-- | net-im/centerim/files/centerim-4.22.5-libotr-configure.patch | 32 |
3 files changed, 46 insertions, 3 deletions
diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog index 42c0565082c1..c3e333e1364e 100644 --- a/net-im/centerim/ChangeLog +++ b/net-im/centerim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/centerim # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.23 2008/07/19 10:38:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.24 2008/08/04 19:10:30 swegener Exp $ + + 04 Aug 2008; Sven Wegener <swegener@gentoo.org> + +files/centerim-4.22.5-libotr-configure.patch, centerim-4.22.5.ebuild: + Add patch to fix error in configure.ac, bug #232312. 19 Jul 2008; Alexis Ballier <aballier@gentoo.org> centerim-4.22.5.ebuild: keyword ~x86-fbsd thanks to Davide Italiano <dav_it@gentoo.org>, bug diff --git a/net-im/centerim/centerim-4.22.5.ebuild b/net-im/centerim/centerim-4.22.5.ebuild index d3d87e2a831c..07bf82294b88 100644 --- a/net-im/centerim/centerim-4.22.5.ebuild +++ b/net-im/centerim/centerim-4.22.5.ebuild @@ -1,8 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.5.ebuild,v 1.5 2008/07/19 10:38:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.5.ebuild,v 1.6 2008/08/04 19:10:30 swegener Exp $ -inherit eutils +WANT_AUTOMAKE="none" + +inherit eutils autotools PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo" IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr" @@ -86,6 +88,11 @@ pkg_setup() { src_unpack() { unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/centerim-4.22.5-libotr-configure.patch + + eautoconf # Don't execute git commands, bug #228151 cat >"${S}"/misc/git-version-gen <<-EOF diff --git a/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch b/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch new file mode 100644 index 000000000000..1d5cbff83699 --- /dev/null +++ b/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch @@ -0,0 +1,32 @@ +commit 42add0132dad8c32ec356d59d0f7daceb9d42ed8 +Author: Sven Wegener <sven.wegener@stealer.net> +Date: Tue Jul 22 02:18:03 2008 +0200 + + Fix configure.ac libotr error + + This fixes the following error: + + checking for otrl_init in -lotr... yes + checking libotr/context.h usability... yes + checking libotr/context.h presence... yes + checking for libotr/context.h... yes + ./configure: line 15006: libotr/userstate.h: No such file or directory + + Signed-off-by: Sven Wegener <sven.wegener@stealer.net> +--- + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 04ca231..56cf974 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -261,7 +261,7 @@ if test "x$with_libotr" != "xno"; then + + AC_CHECK_LIB(otr, otrl_init, + [ +- AC_CHECK_HEADERS(libotr/context.h, libotr/userstate.h ++ AC_CHECK_HEADERS(libotr/context.h libotr/userstate.h, + [ + AC_DEFINE(HAVE_LIBOTR, 1, [define if you have libotr]) + OTR_LIBS="-lotr $LIBS" |