diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-03-13 22:37:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-03-13 22:37:54 +0000 |
| commit | ce33633f819edf6487bb9d7b0d1315b56d4552a3 (patch) | |
| tree | fc6be0574391ad9263bc2799d0ff83ba3226202b /sys-fs | |
| parent | Upgrade to EAPI=4 and rewrite the whole ebuild in the process. (diff) | |
| download | gentoo-2-ce33633f819edf6487bb9d7b0d1315b56d4552a3.tar.gz gentoo-2-ce33633f819edf6487bb9d7b0d1315b56d4552a3.tar.bz2 gentoo-2-ce33633f819edf6487bb9d7b0d1315b56d4552a3.zip | |
Fix building w/readline-6.3 #504472 by Kobboi.
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/reiser4progs/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch | 16 | ||||
| -rw-r--r-- | sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild | 5 |
3 files changed, 25 insertions, 4 deletions
diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index f3f34807ee7e..f7ed584a484b 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/reiser4progs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.42 2012/05/24 02:54:11 vapier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.43 2014/03/13 22:37:54 vapier Exp $ + + 13 Mar 2014; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.7.ebuild, + +files/reiser4progs-1.0.7-readline-6.3.patch: + Fix building w/readline-6.3 #504472 by Kobboi. 24 May 2012; Mike Frysinger <vapier@gentoo.org> reiser4progs-1.0.7.ebuild: Inherit toolchain-funcs for gen_usr_ldscript. diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch new file mode 100644 index 000000000000..9de53bd41203 --- /dev/null +++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/504472 + +fix building w/readline-6.3 -- the old CPPFunction define has been deleted + +--- a/libmisc/ui.c ++++ b/libmisc/ui.c +@@ -256,8 +256,7 @@ static void _init(void) { + + #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H) + rl_initialize(); +- rl_attempted_completion_function = +- (CPPFunction *)misc_complete; ++ rl_attempted_completion_function = misc_complete; + #endif + + aal_exception_set_handler(misc_exception_handler); diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild index 2595cb2b4c0c..b8e8b882ed7b 100644 --- a/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild +++ b/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.8 2012/05/24 02:54:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.9 2014/03/13 22:37:54 vapier Exp $ inherit multilib eutils toolchain-funcs @@ -23,6 +23,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240 + epatch "${FILESDIR}"/${P}-readline-6.3.patch #504472 printf '#!/bin/sh\ntrue\n' > run-ldconfig } |