Add fix from upstream for building w/readline-6.3 #503234 by Thomas D..

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

1 files changed, 48 insertions, 0 deletions

diff --git a/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch b/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
new file mode 100644
index 000000000000..c96b7ee67ac5
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.105-readline-6.3.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/503234
+
+From 216c57eed72fee52e99bb5d014c9de535e631f58 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Thu, 6 Mar 2014 16:04:19 +0100
+Subject: [PATCH] readline: switch to new-style readline typedef
+
+Based on patch:
+https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html
+
+The CPPFunction typedef (among others) have been deprecated in favour of
+specific prototyped typedefs since readline 4.2 (circa 2001).
+It's been working since because compatibility typedefs have been in
+place until they where removed in the recent readline 6.3 release.
+Switch to the new style to avoid build breakage.
+
+But also add full backward compatibility with define.
+
+Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar>
+---
+ WHATS_NEW   | 1 +
+ tools/lvm.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/lvm.c b/tools/lvm.c
+index 51e9293..f9ab438 100644
+--- a/tools/lvm.c
++++ b/tools/lvm.c
+@@ -27,6 +27,7 @@ int main(int argc, char **argv)
+ #  include <readline/history.h>
+ #  ifndef HAVE_RL_COMPLETION_MATCHES
+ #    define rl_completion_matches(a, b) completion_matches((char *)a, b)
++#    define rl_completion_func_t CPPFunction
+ #  endif
+ 
+ static struct cmdline_context *_cmdline;
+@@ -185,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
+ 	char *input = NULL, *args[MAX_ARGS], **argv;
+ 
+ 	rl_readline_name = "lvm";
+-	rl_attempted_completion_function = (CPPFunction *) _completion;
++	rl_attempted_completion_function = (rl_completion_func_t *) _completion;
+ 
+ 	_read_history(cmd);
+ 
+-- 
+1.9.0
+