diff options
| author | obache <obache@pkgsrc.org> | 2014-03-27 06:26:24 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-03-27 06:26:24 +0000 |
| commit | ccba3f598b2dd9efb8bddb2390254f86e0cf4341 (patch) | |
| tree | 55e9003e97fefaf535c2e9608984e5418c70098d /lang/python27 | |
| parent | 63bd6bef95a234feebba6afba231525fd9221987 (diff) | |
| download | pkgsrc-ccba3f598b2dd9efb8bddb2390254f86e0cf4341.tar.gz | |
Update readline-6.3 patch from upstream, for builtin GNU readline<4.2.
Diffstat (limited to 'lang/python27')
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-Modules_readline.c | 36 |
2 files changed, 31 insertions, 9 deletions
diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 4426ae150ed..a16ef5cadb4 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.34 2014/03/27 05:36:37 obache Exp $ +$NetBSD: distinfo,v 1.35 2014/03/27 06:26:24 obache Exp $ SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80 RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a @@ -8,7 +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_readline.c) = 0afcbd1c8bdf3648177bed760e6cccf54c857451 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 index 473086fdc52..b42c8fd9351 100644 --- a/lang/python27/patches/patch-Modules_readline.c +++ b/lang/python27/patches/patch-Modules_readline.c @@ -1,22 +1,44 @@ -$NetBSD: patch-Modules_readline.c,v 1.1 2014/03/15 05:38:14 dholland Exp $ +$NetBSD: patch-Modules_readline.c,v 1.2 2014/03/27 06:26:24 obache Exp $ -Fix py-readline build with readline 6.3. +* fixes for readline-6.3 + http://bugs.python.org/issue20374 ---- Modules/readline.c~ 2013-11-10 07:36:41.000000000 +0000 +--- Modules/readline.c.orig 2013-11-10 07:36:41.000000000 +0000 +++ Modules/readline.c -@@ -911,12 +911,12 @@ setup_readline(void) +@@ -750,7 +750,11 @@ on_hook(PyObject *func) + } + + static int ++#if defined(_RL_FUNCTION_TYPEDEF) + on_startup_hook(void) ++#else ++on_startup_hook() ++#endif + { + return on_hook(startup_hook); + } +@@ -852,7 +856,7 @@ on_completion(const char *text, int stat + * before calling the normal completer */ + + static char ** +-flex_complete(char *text, int start, int end) ++flex_complete(const char *text, int start, int end) + { + #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER + rl_completion_append_character ='\0'; +@@ -911,12 +915,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; ++ rl_startup_hook = 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; ++ rl_pre_input_hook = 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; ++ rl_attempted_completion_function = flex_complete; /* Set Python word break characters */ completer_word_break_characters = rl_completer_word_break_characters = |