From 689afa79f1966a9b27e8fb7c0ce33aebee33fa73 Mon Sep 17 00:00:00 2001
From: dholland <dholland@pkgsrc.org>
Date: Sat, 15 Mar 2014 05:38:14 +0000
Subject: Fix py-readline build with readline 6.3.

---
 lang/python27/distinfo                         |  3 ++-
 lang/python27/patches/patch-Modules_readline.c | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 lang/python27/patches/patch-Modules_readline.c

(limited to 'lang/python27')

diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index f2ed53ece6c..f437951fc4d 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2014/03/12 12:40:57 obache Exp $
+$NetBSD: distinfo,v 1.32 2014/03/15 05:38:14 dholland Exp $
 
 SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80
 RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a
@@ -8,6 +8,7 @@ SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
 SHA1 (patch-Modules___ssl.c) = aaddaea5bcd6c84d3d896c7c37f710933b8228bc
 SHA1 (patch-Modules_getpath.c) = f68b38eb90f974b67ceab3922ce7f92eb77f25c3
+SHA1 (patch-Modules_readline.c) = 8619f31249c3d7fc8fcb5f90c0fe30a80d16a490
 SHA1 (patch-Modules_socketmodule.c) = 07c76dcf6dc8605446bc8e01d80e1f1e30a5ebf7
 SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
 SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
diff --git a/lang/python27/patches/patch-Modules_readline.c b/lang/python27/patches/patch-Modules_readline.c
new file mode 100644
index 00000000000..473086fdc52
--- /dev/null
+++ b/lang/python27/patches/patch-Modules_readline.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-Modules_readline.c,v 1.1 2014/03/15 05:38:14 dholland Exp $
+
+Fix py-readline build with readline 6.3.
+
+--- Modules/readline.c~	2013-11-10 07:36:41.000000000 +0000
++++ Modules/readline.c
+@@ -911,12 +911,12 @@ setup_readline(void)
+     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+     /* Set our hook functions */
+-    rl_startup_hook = (Function *)on_startup_hook;
++    rl_startup_hook = (rl_hook_func_t *)on_startup_hook;
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-    rl_pre_input_hook = (Function *)on_pre_input_hook;
++    rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook;
+ #endif
+     /* Set our completion function */
+-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
++    rl_attempted_completion_function = (rl_completion_func_t *)flex_complete;
+     /* Set Python word break characters */
+     completer_word_break_characters =
+         rl_completer_word_break_characters =
-- 
cgit v1.2.3