From ca39a93150ddf456962cb2aaaaf15ae5f74d156bb3f2211f954564c22708f443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 7 Feb 2014 09:57:20 +0000 Subject: [PATCH] - Updated to revision 169, fixes the following problems * Running tests in shadow dir doesn't work. * By default, after closing a buffer changes can't be undone. * Auto-loading a function for code that won't be executed. * Fixes are not tested. * Can't compile with Ruby 2.1.0. * ":sleep" puts cursor in the wrong column. (Liang Li) - Dropped vim-7.4-ruby21.patch, fixed upstream OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=188 --- vim-7.4-patches.tar.bz2 | 4 +-- vim-7.4-ruby21.patch | 57 ----------------------------------------- vim.changes | 12 +++++++++ vim.spec | 6 +---- 4 files changed, 15 insertions(+), 64 deletions(-) delete mode 100644 vim-7.4-ruby21.patch diff --git a/vim-7.4-patches.tar.bz2 b/vim-7.4-patches.tar.bz2 index 31650b1..54c0fe0 100644 --- a/vim-7.4-patches.tar.bz2 +++ b/vim-7.4-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18ffa58fb8ecf7048aa769117ada610fc9e64a7213edf0e870d60815414bb90b -size 133501 +oid sha256:0bc9db521ab0c5898329198f9b051b1e51b701f08f7c10aa6c586360d25de381 +size 136404 diff --git a/vim-7.4-ruby21.patch b/vim-7.4-ruby21.patch deleted file mode 100644 index d2fdad3..0000000 --- a/vim-7.4-ruby21.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-vim74/src/if_ruby.c ./src/if_ruby.c ---- ../orig-vim74/src/if_ruby.c 2013-05-20 12:47:48.000000000 +0200 -+++ ./src/if_ruby.c 2014-01-10 09:04:58.926094655 +0100 -@@ -96,6 +96,10 @@ - # define rb_num2int rb_num2int_stub - #endif - -+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER > 20 -+# define rb_gc_writebarrier_unprotect_promoted rb_gc_writebarrier_unprotect_promoted_stub -+# endif -+ - #include - #ifdef RUBY19_OR_LATER - # include -@@ -213,6 +217,9 @@ - # define rb_obj_alloc dll_rb_obj_alloc - # define rb_obj_as_string dll_rb_obj_as_string - # define rb_obj_id dll_rb_obj_id -+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER > 20 -+# define rb_gc_writebarrier_unprotect_promoted dll_rb_gc_writebarrier_unprotect_promoted -+# endif - # define rb_raise dll_rb_raise - # define rb_str_cat dll_rb_str_cat - # define rb_str_concat dll_rb_str_concat -@@ -317,6 +324,9 @@ - static VALUE (*dll_rb_obj_alloc) (VALUE); - static VALUE (*dll_rb_obj_as_string) (VALUE); - static VALUE (*dll_rb_obj_id) (VALUE); -+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER > 20 -+static void (*dll_rb_gc_writebarrier_unprotect_promoted) (VALUE); -+# endif - static void (*dll_rb_raise) (VALUE, const char*, ...); - # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 - static VALUE (*dll_rb_string_value) (volatile VALUE*); -@@ -393,6 +403,12 @@ - return dll_rb_num2int(x); - } - # endif -+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER > 20 -+void rb_gc_writebarrier_unprotect_promoted_stub(VALUE obj) -+{ -+ dll_rb_gc_writebarrier_unprotect_promoted(obj); -+} -+# endif - # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 20 - VALUE - rb_float_new_in_heap(double d) -@@ -462,6 +478,9 @@ - {"rb_obj_alloc", (RUBY_PROC*)&dll_rb_obj_alloc}, - {"rb_obj_as_string", (RUBY_PROC*)&dll_rb_obj_as_string}, - {"rb_obj_id", (RUBY_PROC*)&dll_rb_obj_id}, -+# if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER > 20 -+ {"dll_rb_gc_writebarrier_unprotect_promoted", (RUBY_PROC*)&dll_rb_gc_writebarrier_unprotect_promoted}, -+# endif - {"rb_raise", (RUBY_PROC*)&dll_rb_raise}, - # if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 18 - {"rb_string_value", (RUBY_PROC*)&dll_rb_string_value}, diff --git a/vim.changes b/vim.changes index 7c605fd..f118c9e 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 7 09:48:35 UTC 2014 - idonmez@suse.com + +- Updated to revision 169, fixes the following problems + * Running tests in shadow dir doesn't work. + * By default, after closing a buffer changes can't be undone. + * Auto-loading a function for code that won't be executed. + * Fixes are not tested. + * Can't compile with Ruby 2.1.0. + * ":sleep" puts cursor in the wrong column. (Liang Li) +- Dropped vim-7.4-ruby21.patch, fixed upstream + ------------------------------------------------------------------- Tue Feb 4 11:20:35 UTC 2014 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 51b6c45..2df7b6a 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 7.4 -%define official_ptchlvl 161 +%define official_ptchlvl 169 %define VIM_SUBDIR vim74 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} @@ -104,9 +104,6 @@ Patch21: %{name}-7.3-filetype_changes.patch Patch22: %{name}-7.4-filetype_mine.patch Patch100: vim-7.1.314-CVE-2009-0316-debian.patch Patch101: vim73-no-static-libpython.patch -# Ruby 2.1 calls rb_gc_writebarrier_unprotect_promoted in RARRAY_PTR, -# stub it for dynamic loading, kkaempf@suse.de -Patch102: vim-7.4-ruby21.patch %{perl_requires} %{?libperl_requires} @@ -195,7 +192,6 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch22 -p1 %patch100 -p1 %patch101 -%patch102 -p1 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # newer perl? ugly hack to fix build anyway.