[packages/ruby/dev-2.0: 20/21] add patch to build with readline 6.3; update files
glen
glen at pld-linux.org
Fri Apr 18 02:24:58 CEST 2014
commit ed7247e08a098b1a3065e5ffe99740eb8357f8b3
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 5 16:33:33 2014 +0300
add patch to build with readline 6.3; update files
readline-6.3.patch | 14 ++++++++++++++
ruby.spec | 8 ++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index ed970e7..afeb0b2 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -73,6 +73,7 @@ Patch9: DESTDIR.patch
Patch10: empty-ruby-version.patch
Patch11: rubygems-2.0.0-binary-extensions.patch
Patch12: custom-rubygems-location.patch
+Patch13: readline-6.3.patch
URL: http://www.ruby-lang.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -437,6 +438,7 @@ Biblioteka JSON dla języka Ruby.
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
# must be regenerated with new bison
%{__rm} parse.{c,h}
@@ -692,8 +694,10 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_libdir}/tsort.rb
%{ruby_libdir}/[u-z]*.rb
%if %{with batteries}
-#%exclude %{ruby_libdir}/rubygems.rb
-#%exclude %{ruby_libdir}/ubygems.rb
+%exclude %{ruby_libdir}/rubygems.rb
+%exclude %{ruby_libdir}/ubygems.rb
+%exclude %{ruby_libdir}/rbconfig/datadir.rb
+%exclude %{ruby_libdir}/rbconfig/obsolete.rb
%endif
%exclude %{ruby_libdir}/irb.rb
%exclude %{ruby_libdir}/mkmf.rb
diff --git a/readline-6.3.patch b/readline-6.3.patch
new file mode 100644
index 0000000..e9b3f9b
--- /dev/null
+++ b/readline-6.3.patch
@@ -0,0 +1,14 @@
+readline 6.3 fix from upstream
+
+https://bugs.ruby-lang.org/issues/9578
+--- ./ext/readline/readline.c (revision 45224)
++++ ./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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/44b97f26f94a3604b2a6245c5945f5c385a54cb9
More information about the pld-cvs-commit
mailing list