From 677f2ec6b0e79bba0fabd377f33832002d668aedafb5d2f0e6946e4f9e340791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 10 Jan 2014 10:07:05 +0000 Subject: [PATCH 1/4] Accepting request 213402 from openSUSE:Factory:Staging:Ruby21 - Fix dynamic loading of Ruby for Ruby 2.1 Add patch vim-7.4-ruby21.patch OBS-URL: https://build.opensuse.org/request/show/213402 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=179 --- vim-7.4-ruby21.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++ vim.changes | 6 +++++ vim.spec | 10 +++++++- 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 vim-7.4-ruby21.patch diff --git a/vim-7.4-ruby21.patch b/vim-7.4-ruby21.patch new file mode 100644 index 0000000..d2fdad3 --- /dev/null +++ b/vim-7.4-ruby21.patch @@ -0,0 +1,57 @@ +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 c12d9e6..7537895 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 10 08:10:52 UTC 2014 - kkaempf@suse.com + +- Fix dynamic loading of Ruby for Ruby 2.1 + Add patch vim-7.4-ruby21.patch + ------------------------------------------------------------------- Tue Dec 17 12:10:00 UTC 2013 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index b90a9cc..bc0545e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,7 +1,7 @@ # # spec file for package vim # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -104,6 +104,11 @@ 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 +%if 0%{?suse_version} > 1310 +# 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 +%endif %{perl_requires} %{?libperl_requires} @@ -192,6 +197,9 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch22 -p1 %patch100 -p1 %patch101 +%if 0%{?suse_version} > 1310 +%patch102 -p1 +%endif cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # newer perl? ugly hack to fix build anyway. From 80db8255cb1a845767404151357654ab5fc15e38e8174b780f6037b2fadf082a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 13 Jan 2014 10:30:14 +0000 Subject: [PATCH 2/4] =?UTF-8?q?-=20Updated=20to=20revision=20142,=20fixes?= =?UTF-8?q?=20the=20following=20problems=20=20=20*=20Clang=20warns=20for?= =?UTF-8?q?=20using=20NUL.=20=20=20*=20Spurious=20space=20in=20MingW=20Mak?= =?UTF-8?q?efile.=20=20=20*=20Directory=20change=20messages=20are=20not=20?= =?UTF-8?q?recognized.=20=20=20*=20Crash=20when=20using=20:cd=20in=20autoc?= =?UTF-8?q?ommand.=20(Fran=C3=A7ois=20Ingelrest)=20=20=20*=20Crash=20when?= =?UTF-8?q?=20wiping=20out=20buffer=20triggers=20autocommand=20that=20wipe?= =?UTF-8?q?s=20out=20=20=20=20=20only=20other=20buffer.=20=20=20*=20Proble?= =?UTF-8?q?ms=20when=20building=20with=20Borland:=20st=5Fmode=20is=20signe?= =?UTF-8?q?d=20short;=20=20=20=20=20can't=20build=20with=20Python;=20temp?= =?UTF-8?q?=20files=20not=20ignored=20by=20Mercurial;=20=20=20=20=20buildi?= =?UTF-8?q?ng=20with=20DEBUG=20doesn't=20define=20=5FDEBUG.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=180 --- vim-7.4-patches.tar.bz2 | 4 ++-- vim.changes | 14 ++++++++++++++ vim.spec | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/vim-7.4-patches.tar.bz2 b/vim-7.4-patches.tar.bz2 index 8a1169e..dae00d2 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:29447c54aec914b9eec52ffa14668ef5a74e36f2c2382b164ad2d391aa651081 -size 107303 +oid sha256:7af62fdee92fec794b49b1b8ef608d400cd658ec414ffee8f1afbc6abe17827a +size 112187 diff --git a/vim.changes b/vim.changes index 7537895..8ecaa69 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jan 13 10:23:03 UTC 2014 - idonmez@suse.com + +- Updated to revision 142, fixes the following problems + * Clang warns for using NUL. + * Spurious space in MingW Makefile. + * Directory change messages are not recognized. + * Crash when using :cd in autocommand. (François Ingelrest) + * Crash when wiping out buffer triggers autocommand that wipes out + only other buffer. + * Problems when building with Borland: st_mode is signed short; + can't build with Python; temp files not ignored by Mercurial; + building with DEBUG doesn't define _DEBUG. + ------------------------------------------------------------------- Fri Jan 10 08:10:52 UTC 2014 - kkaempf@suse.com diff --git a/vim.spec b/vim.spec index bc0545e..17e96dc 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 7.4 -%define official_ptchlvl 131 +%define official_ptchlvl 142 %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} From 18848ee16bbb560cf8db146531f072732cee1ec8c420186e5440d0005efc1455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 13 Jan 2014 11:25:05 +0000 Subject: [PATCH 3/4] - OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=181 --- vim.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vim.spec b/vim.spec index 17e96dc..b7e9c24 100644 --- a/vim.spec +++ b/vim.spec @@ -104,11 +104,9 @@ 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 -%if 0%{?suse_version} > 1310 # 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 -%endif %{perl_requires} %{?libperl_requires} @@ -197,9 +195,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim %patch22 -p1 %patch100 -p1 %patch101 -%if 0%{?suse_version} > 1310 %patch102 -p1 -%endif cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} . # newer perl? ugly hack to fix build anyway. From a166516138ba1b99c19f807111ee166438f7742710fdb379f300c60cdcd59c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 14 Jan 2014 14:14:08 +0000 Subject: [PATCH 4/4] - Use Unix line endings in vim-7.3-filetype_ftl.patch (bnc#815840) OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=182 --- vim-7.3-filetype_ftl.patch | 72 +++++++++++++++++++------------------- vim.changes | 5 +++ 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/vim-7.3-filetype_ftl.patch b/vim-7.3-filetype_ftl.patch index 799b328..f4e5d42 100644 --- a/vim-7.3-filetype_ftl.patch +++ b/vim-7.3-filetype_ftl.patch @@ -13,39 +13,39 @@ diff -rupN vim73.orig/runtime/syntax/ftl.vim vim73/runtime/syntax/ftl.vim --- vim73.orig/runtime/syntax/ftl.vim 1970-01-01 01:00:00.000000000 +0100 +++ vim73/runtime/syntax/ftl.vim 2010-11-21 05:13:00.462213463 +0100 @@ -0,0 +1,36 @@ -+" Vim syntax file -+" Language: FreeMarker Template Language (FTL) -+" Maintainer: Stephan Müller -+" Last Change: 2003 Oct 7 -+ -+syn case match -+ -+" directives and interpolations -+syn region ftlStartDirective start=+<#+ end=+>+ contains=ftlKeyword, ftlDirective, ftlString, ftlComment -+syn region ftlEndDirective start=++ contains=ftlDirective -+syn region ftlStartUserDirective start=+<@+ end=+>+ contains=ftlString, ftlComment -+syn region ftlEndUserDirective start=++ -+syn region ftlInterpolation start=+${+ end=+}+ -+syn region ftlInterpolation2 start=+#{+ end=+}+ -+syn region ftlString contained start=+"+ end=+"+ -+syn region ftlComment start=+<#--+ end=+-->+ -+ -+" keywords -+syn keyword ftlDirective contained list if else macro import include switch case break -+syn keyword ftlDirective contained assign local global nested recurse fallback visit -+syn keyword ftlDirective contained function return t rt lt nt ftl -+syn keyword ftlKeyword contained as in using -+ -+" highlighting -+highlight link ftlKeyword Statement -+highlight link ftlDirective Statement -+highlight link ftlStartDirective Function -+highlight link ftlEndDirective Function -+highlight link ftlStartUserDirective Function -+highlight link ftlEndUserDirective Function -+highlight link ftlInterpolation Constant -+highlight link ftlInterpolation2 Constant -+highlight link ftlString Constant -+highlight link ftlComment Comment -+ -+ ++" Vim syntax file ++" Language: FreeMarker Template Language (FTL) ++" Maintainer: Stephan Müller ++" Last Change: 2003 Oct 7 ++ ++syn case match ++ ++" directives and interpolations ++syn region ftlStartDirective start=+<#+ end=+>+ contains=ftlKeyword, ftlDirective, ftlString, ftlComment ++syn region ftlEndDirective start=++ contains=ftlDirective ++syn region ftlStartUserDirective start=+<@+ end=+>+ contains=ftlString, ftlComment ++syn region ftlEndUserDirective start=++ ++syn region ftlInterpolation start=+${+ end=+}+ ++syn region ftlInterpolation2 start=+#{+ end=+}+ ++syn region ftlString contained start=+"+ end=+"+ ++syn region ftlComment start=+<#--+ end=+-->+ ++ ++" keywords ++syn keyword ftlDirective contained list if else macro import include switch case break ++syn keyword ftlDirective contained assign local global nested recurse fallback visit ++syn keyword ftlDirective contained function return t rt lt nt ftl ++syn keyword ftlKeyword contained as in using ++ ++" highlighting ++highlight link ftlKeyword Statement ++highlight link ftlDirective Statement ++highlight link ftlStartDirective Function ++highlight link ftlEndDirective Function ++highlight link ftlStartUserDirective Function ++highlight link ftlEndUserDirective Function ++highlight link ftlInterpolation Constant ++highlight link ftlInterpolation2 Constant ++highlight link ftlString Constant ++highlight link ftlComment Comment ++ ++ diff --git a/vim.changes b/vim.changes index 8ecaa69..56f6011 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 14 14:13:34 UTC 2014 - idonmez@suse.com + +- Use Unix line endings in vim-7.3-filetype_ftl.patch (bnc#815840) + ------------------------------------------------------------------- Mon Jan 13 10:23:03 UTC 2014 - idonmez@suse.com