summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-03-15 16:50:15 -0400
committerMike Gilbert <floppym@gentoo.org>2014-03-15 17:23:21 -0400
commit621cde4cc83aed06d70de33e9dae8af2401c0d1f (patch)
tree0993dcdeddd9c785d88fcfa60668dd0fb8f8de3a
parentAdd 2.7.6 patches (diff)
downloadpython-gentoo-patches-621cde4cc83aed06d70de33e9dae8af2401c0d1f.tar.gz
python-gentoo-patches-621cde4cc83aed06d70de33e9dae8af2401c0d1f.tar.bz2
python-gentoo-patches-621cde4cc83aed06d70de33e9dae8af2401c0d1f.zip
Add upstream fix for bug 5031802.7.6-12.7.6
-rw-r--r--patches/81_all_use_new_readline_function_types__closes__20374_.patch28
-rw-r--r--patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch37
-rw-r--r--patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch37
3 files changed, 102 insertions, 0 deletions
diff --git a/patches/81_all_use_new_readline_function_types__closes__20374_.patch b/patches/81_all_use_new_readline_function_types__closes__20374_.patch
new file mode 100644
index 0000000..b63f4c7
--- /dev/null
+++ b/patches/81_all_use_new_readline_function_types__closes__20374_.patch
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Benjamin Peterson <benjamin@python.org>
+# Date 1390541532 18000
+# Fri Jan 24 00:32:12 2014 -0500
+# Branch 2.7
+# Node ID 79b82ebc4fd17fda401c32840da1da0577e3c73e
+# Parent f28b60141c5c417111670a22b223f0c411136c7b
+use new readline function types (closes #20374)
+
+diff --git a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -911,12 +911,12 @@
+ 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 =
diff --git a/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch b/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch
new file mode 100644
index 0000000..71ac4b1
--- /dev/null
+++ b/patches/82_all_new_plan__just_remove_typecasts__closes__20374_.patch
@@ -0,0 +1,37 @@
+# HG changeset patch
+# User Benjamin Peterson <benjamin@python.org>
+# Date 1390581856 18000
+# Fri Jan 24 11:44:16 2014 -0500
+# Branch 2.7
+# Node ID 5e42e5764ac6277d61c0af231d402f59c223c91a
+# Parent 79b82ebc4fd17fda401c32840da1da0577e3c73e
+new plan: just remove typecasts (closes #20374)
+
+diff --git a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -852,7 +852,7 @@
+ * 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 +911,12 @@
+ 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 = (rl_hook_func_t *)on_startup_hook;
++ rl_startup_hook = on_startup_hook;
+ #ifdef HAVE_RL_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 = (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 =
diff --git a/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch b/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch
new file mode 100644
index 0000000..9934b80
--- /dev/null
+++ b/patches/83_all_Issue__20374__Avoid_compiler_warnings_when_compiling_readline_with_libedit_.patch
@@ -0,0 +1,37 @@
+# HG changeset patch
+# User Ned Deily <nad@acm.org>
+# Date 1391647946 28800
+# Wed Feb 05 16:52:26 2014 -0800
+# Branch 2.7
+# Node ID 0b5b0bfcc7b1dba77ee70ec6abba9037abf93acb
+# Parent 48c5c18110ae810c09b176f4cedf228cc3487451
+Issue #20374: Avoid compiler warnings when compiling readline with libedit.
+
+diff --git a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -749,15 +749,24 @@
+ return result;
+ }
+
++
+ static int
++#if defined(_RL_FUNCTION_TYPEDEF)
+ on_startup_hook(void)
++#else
++on_startup_hook()
++#endif
+ {
+ return on_hook(startup_hook);
+ }
+
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+ static int
++#if defined(_RL_FUNCTION_TYPEDEF)
+ on_pre_input_hook(void)
++#else
++on_pre_input_hook()
++#endif
+ {
+ return on_hook(pre_input_hook);
+ }