From 6197f253291d1c362948925a865628ebd8673fdd Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Feb 04 2019 13:38:31 +0000
Subject: remove downstream fix for new ruby, upstream solved it different way


---

diff --git a/vim-ruby26.patch b/vim-ruby26.patch
deleted file mode 100644
index 30630a2..0000000
--- a/vim-ruby26.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
-+#  if 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);
- }
-+# if 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 3b64de2..9b4c575 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: 3%{?dist}
+Release: 4%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -66,15 +66,6 @@ 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
@@ -263,7 +254,6 @@ 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
@@ -809,6 +799,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Feb 04 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.847-4
+- remove downstream fix for new ruby, upstream solved it different way
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:8.1.847-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild