From bda46b61da211d15cfba26a1f66d7ae8ce5cade0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jan 30 2019 09:32:46 +0000
Subject: FTBFS with new ruby-2.6


---

diff --git a/vim-ruby26.patch b/vim-ruby26.patch
new file mode 100644
index 0000000..da8d2e8
--- /dev/null
+++ b/vim-ruby26.patch
@@ -0,0 +1,28 @@
+diff --git a/src/if_ruby.c b/src/if_ruby.c
+index 9c91f31..e53e0ef 100644
+--- a/src/if_ruby.c
++++ b/src/if_ruby.c
+@@ -476,7 +476,11 @@ static void (*dll_ruby_init_stack)(VALUE*);
+ #  endif
+ # endif
+ # ifdef RUBY19_OR_LATER
++#  ifdef DYNAMIC_RUBY_VER >= 26
++static VALUE (*dll_rb_int2big)(intptr_t);
++#  else
+ static VALUE (*dll_rb_int2big)(SIGNED_VALUE);
++#  endif
+ # endif
+ 
+ # ifdef RUBY19_OR_LATER
+@@ -506,7 +510,11 @@ SIGNED_VALUE rb_num2long_stub(VALUE x)
+ {
+     return dll_rb_num2long(x);
+ }
++# ifdef DYNAMIC_RUBY_VER >= 26
++VALUE rb_int2big_stub(intptr_t x)
++# else
+ VALUE rb_int2big_stub(SIGNED_VALUE x)
++# endif
+ {
+     return dll_rb_int2big(x);
+ }
diff --git a/vim.spec b/vim.spec
index be5252d..2cd19c6 100644
--- a/vim.spec
+++ b/vim.spec
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -67,6 +67,15 @@ Patch3014: vim-7.4-releasestring-1318991.patch
 Patch3016: vim-8.0-copy-paste.patch
 # migrate shebangs in script to /usr/bin/python3 and use python2 when necessary
 Patch3017: vim-python3-tests.patch
+# Ruby 2.6 introduced API breakage in dll_rb_int2big() function - the function
+# had one parameter of SIGNED_VALUE type, but now it has one parameter of 
+# intptr_t type. It needed to be fixed in Vim, because it caused FTBFS on
+# i686 and armv7hl archs - the new type of parameter seems to be expanded
+# to the same amount of memory in 64b archs as the old type, but into different
+# on 32b archs.
+# Ruby upstream issue: https://bugs.ruby-lang.org/issues/15570
+# Vim upstream issue: will need to be reported
+Patch3018: vim-ruby26.patch
 
 # gcc is no longer in buildroot by default
 BuildRequires: gcc
@@ -255,6 +264,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3014 -p1
 %patch3016 -p1
 %patch3017 -p1
+%patch3018 -p1
 
 %build
 %if 0%{?rhel} > 7
@@ -802,6 +812,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Tue Jan 29 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.837-2
+- FTBFS with new ruby-2.6
+
 * Mon Jan 28 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.837-1
 - patchlevel 837