From 4d772f3b16f0b83d13e954bf64005b21650e9deb Mon Sep 17 00:00:00 2001 From: Michael Limiero Date: Wed, 5 Mar 2014 12:35:36 -0500 Subject: [PATCH 1/2] Fix building ruby-2.1.0 on Arch Linux (Ruby bug #9578) --- patches/ruby/2.1.0/changeset_r45225.diff | 11 +++++++++++ patches/ruby/2.1.0/changeset_r45240.diff | 22 ++++++++++++++++++++++ patchsets/ruby/2.1.0/default | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 patches/ruby/2.1.0/changeset_r45225.diff create mode 100644 patches/ruby/2.1.0/changeset_r45240.diff diff --git a/patches/ruby/2.1.0/changeset_r45225.diff b/patches/ruby/2.1.0/changeset_r45225.diff new file mode 100644 index 0000000000..fa6e20f80b --- /dev/null +++ b/patches/ruby/2.1.0/changeset_r45225.diff @@ -0,0 +1,11 @@ +--- a/ext/readline/readline.c (revision 45224) ++++ b/ext/readline/readline.c (revision 45225) +@@ -1974,7 +1974,7 @@ + + rl_attempted_completion_function = readline_attempted_completion_function; + #if defined(HAVE_RL_PRE_INPUT_HOOK) +- rl_pre_input_hook = (Function *)readline_pre_input_hook; ++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook; + #endif + #ifdef HAVE_RL_CATCH_SIGNALS + rl_catch_signals = 0; diff --git a/patches/ruby/2.1.0/changeset_r45240.diff b/patches/ruby/2.1.0/changeset_r45240.diff new file mode 100644 index 0000000000..90c913d636 --- /dev/null +++ b/patches/ruby/2.1.0/changeset_r45240.diff @@ -0,0 +1,22 @@ +--- a/ext/readline/extconf.rb (revision 45239) ++++ b/ext/readline/extconf.rb (revision 45240) +@@ -19,6 +19,10 @@ + return super(func, headers) + end + ++def readline.have_type(type) ++ return super(type, headers) ++end ++ + dir_config('curses') + dir_config('ncurses') + dir_config('termcap') +@@ -94,4 +98,8 @@ + readline.have_func("rl_redisplay") + readline.have_func("rl_insert_text") + readline.have_func("rl_delete_text") ++unless readline.have_type("rl_hook_func_t") ++ $DEFS << "-Drl_hook_func_t=Function" ++end ++ + create_makefile("readline") diff --git a/patchsets/ruby/2.1.0/default b/patchsets/ruby/2.1.0/default index 89168ee418..cb2bdcaaeb 100644 --- a/patchsets/ruby/2.1.0/default +++ b/patchsets/ruby/2.1.0/default @@ -1,2 +1,4 @@ libyaml015 GH-488 +changeset_r45225 +changeset_r45240 From 53e5dfe11095bbcfe1f1e0d41c5697b341a44c71 Mon Sep 17 00:00:00 2001 From: Jeff Hube Date: Wed, 5 Mar 2014 18:24:15 -0500 Subject: [PATCH 2/2] Fix building ruby-2.1.1 on Arch Linux (Ruby bug #9578) --- patches/ruby/2.1.1/changeset_r45225.diff | 11 +++++++++++ patches/ruby/2.1.1/changeset_r45240.diff | 22 ++++++++++++++++++++++ patchsets/ruby/2.1.1/default | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 patches/ruby/2.1.1/changeset_r45225.diff create mode 100644 patches/ruby/2.1.1/changeset_r45240.diff create mode 100644 patchsets/ruby/2.1.1/default diff --git a/patches/ruby/2.1.1/changeset_r45225.diff b/patches/ruby/2.1.1/changeset_r45225.diff new file mode 100644 index 0000000000..fa6e20f80b --- /dev/null +++ b/patches/ruby/2.1.1/changeset_r45225.diff @@ -0,0 +1,11 @@ +--- a/ext/readline/readline.c (revision 45224) ++++ b/ext/readline/readline.c (revision 45225) +@@ -1974,7 +1974,7 @@ + + rl_attempted_completion_function = readline_attempted_completion_function; + #if defined(HAVE_RL_PRE_INPUT_HOOK) +- rl_pre_input_hook = (Function *)readline_pre_input_hook; ++ rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook; + #endif + #ifdef HAVE_RL_CATCH_SIGNALS + rl_catch_signals = 0; diff --git a/patches/ruby/2.1.1/changeset_r45240.diff b/patches/ruby/2.1.1/changeset_r45240.diff new file mode 100644 index 0000000000..90c913d636 --- /dev/null +++ b/patches/ruby/2.1.1/changeset_r45240.diff @@ -0,0 +1,22 @@ +--- a/ext/readline/extconf.rb (revision 45239) ++++ b/ext/readline/extconf.rb (revision 45240) +@@ -19,6 +19,10 @@ + return super(func, headers) + end + ++def readline.have_type(type) ++ return super(type, headers) ++end ++ + dir_config('curses') + dir_config('ncurses') + dir_config('termcap') +@@ -94,4 +98,8 @@ + readline.have_func("rl_redisplay") + readline.have_func("rl_insert_text") + readline.have_func("rl_delete_text") ++unless readline.have_type("rl_hook_func_t") ++ $DEFS << "-Drl_hook_func_t=Function" ++end ++ + create_makefile("readline") diff --git a/patchsets/ruby/2.1.1/default b/patchsets/ruby/2.1.1/default new file mode 100644 index 0000000000..5bda28982e --- /dev/null +++ b/patchsets/ruby/2.1.1/default @@ -0,0 +1,2 @@ +changeset_r45225 +changeset_r45240