122 lines
3.9 KiB
Diff
122 lines
3.9 KiB
Diff
From d5a986f460019a924627d79350552f446505cffb Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Sun, 6 Dec 2020 21:11:31 +0100
|
|
Subject: [PATCH] patch 8.2.2104: build problem with Ruby 2.7
|
|
|
|
Problem: Build problem with Ruby 2.7.
|
|
Solution: Adjust function declarations. (Ozaki Kiichi, closes #7430)
|
|
---
|
|
src/auto/configure | 3 +--
|
|
src/configure.ac | 3 +--
|
|
src/if_ruby.c | 28 ++++++++++++++++++++--------
|
|
3 files changed, 22 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/auto/configure b/src/auto/configure
|
|
index c50f4bc..9a0c1e6 100755
|
|
--- a/src/auto/configure
|
|
+++ b/src/auto/configure
|
|
@@ -7590,8 +7590,7 @@ $as_echo "$rubyhdrdir" >&6; }
|
|
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBYARG'])"`
|
|
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['LIBRUBY_A'])"`
|
|
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
|
|
- if test -f "$rubylibdir/$librubya"; then
|
|
- librubyarg="$librubyarg"
|
|
+ if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
|
|
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
|
|
elif test "$librubyarg" = "libruby.a"; then
|
|
librubyarg="-lruby"
|
|
diff --git a/src/configure.ac b/src/configure.ac
|
|
index f0e8371..e796d0e 100644
|
|
--- a/src/configure.ac
|
|
+++ b/src/configure.ac
|
|
@@ -1932,8 +1932,7 @@ if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
|
|
librubyarg=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBYARG']])"`
|
|
librubya=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['LIBRUBY_A']])"`
|
|
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG[['libdir']])"`
|
|
- if test -f "$rubylibdir/$librubya"; then
|
|
- librubyarg="$librubyarg"
|
|
+ if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
|
|
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
|
|
elif test "$librubyarg" = "libruby.a"; then
|
|
dnl required on Mac OS 10.3 where libruby.a doesn't exist
|
|
diff --git a/src/if_ruby.c b/src/if_ruby.c
|
|
index 68d5582..d0f8acf 100644
|
|
--- a/src/if_ruby.c
|
|
+++ b/src/if_ruby.c
|
|
@@ -1296,13 +1296,19 @@ vim_blob(VALUE self UNUSED, VALUE str)
|
|
}
|
|
|
|
static VALUE
|
|
-buffer_s_current(void)
|
|
+buffer_s_current(VALUE self UNUSED)
|
|
{
|
|
return buffer_new(curbuf);
|
|
}
|
|
|
|
static VALUE
|
|
-buffer_s_count(void)
|
|
+buffer_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
|
|
+{
|
|
+ return buffer_new(curbuf);
|
|
+}
|
|
+
|
|
+ static VALUE
|
|
+buffer_s_count(VALUE self UNUSED)
|
|
{
|
|
buf_T *b;
|
|
int n = 0;
|
|
@@ -1562,7 +1568,13 @@ get_win(VALUE obj)
|
|
}
|
|
|
|
static VALUE
|
|
-window_s_current(void)
|
|
+window_s_current(VALUE self UNUSED)
|
|
+{
|
|
+ return window_new(curwin);
|
|
+}
|
|
+
|
|
+ static VALUE
|
|
+window_s_current_getter(ID id UNUSED, VALUE *x UNUSED)
|
|
{
|
|
return window_new(curwin);
|
|
}
|
|
@@ -1572,7 +1584,7 @@ window_s_current(void)
|
|
* SegPhault - 03/07/05
|
|
*/
|
|
static VALUE
|
|
-line_s_current(void)
|
|
+line_s_current(VALUE self UNUSED)
|
|
{
|
|
return get_buffer_line(curbuf, curwin->w_cursor.lnum);
|
|
}
|
|
@@ -1584,13 +1596,13 @@ set_current_line(VALUE self UNUSED, VALUE str)
|
|
}
|
|
|
|
static VALUE
|
|
-current_line_number(void)
|
|
+current_line_number(VALUE self UNUSED)
|
|
{
|
|
return INT2FIX((int)curwin->w_cursor.lnum);
|
|
}
|
|
|
|
static VALUE
|
|
-window_s_count(void)
|
|
+window_s_count(VALUE self UNUSED)
|
|
{
|
|
win_T *w;
|
|
int n = 0;
|
|
@@ -1790,8 +1802,8 @@ ruby_vim_init(void)
|
|
rb_define_method(cVimWindow, "cursor", window_cursor, 0);
|
|
rb_define_method(cVimWindow, "cursor=", window_set_cursor, 1);
|
|
|
|
- rb_define_virtual_variable("$curbuf", buffer_s_current, 0);
|
|
- rb_define_virtual_variable("$curwin", window_s_current, 0);
|
|
+ rb_define_virtual_variable("$curbuf", buffer_s_current_getter, 0);
|
|
+ rb_define_virtual_variable("$curwin", window_s_current_getter, 0);
|
|
}
|
|
|
|
void
|
|
--
|
|
2.13.7
|
|
|