From 4f8d39a99f4aabf9730f7e4a92df7b8259a05321407b16a2d9799d40f9801316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 12 Sep 2016 13:27:23 +0000 Subject: [PATCH] - Update to version 8.0 * Crash on exit when EXITFREE is defined. (Dominique Pelle) * Valgrind reports using uninitialzed memory. (Dominique Pelle) * Test 86 and 87 fail with some version of Python. * Netbeans test fails when run from unpacked MS-Windows sources. * Netbeans test fails in shadow directory. * Not enough test coverage for Normal mode commands. * The example that explains nested backreferences does not work properly with the new regexp engine. (Harm te Hennepe) * Regexp fails to match when using "\>\)\?". (Ramel) * Reading past end of line when using previous substitute pattern. (Dominique Pelle) * Attempt to read history entry while not initialized. * Compiler warnings with Solaris Studio when using GTK3. * Memory leak in timer_start(). * Invalid memory access when formatting. (Dominique Pelle) * Checking for last_timer_id to overflow is not reliable. (Ozaki Kiichi) * Illegal memory access with ":1@". (Dominique Pelle) * Superfluous function prototypes. * Sort test sometimes fails. * Needless line break. Confusing directory name. * MS-Windows gvim.exe does not have DirectX support. * Test runner misses a comma. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=382 --- v7.4.2347.tar.gz | 3 --- v8.0.0000.tar.gz | 3 +++ vim-7.3-filetype_changes.patch | 12 ++++++------ vim-7.3-filetype_ftl.patch | 16 +++++++++------- vim-7.3-filetype_spec.patch | 18 +++++++++--------- vim-7.3-gvimrc_fontset.patch | 11 ++++++----- vim-7.3-help_tags.patch | 10 +++++----- vim-7.3-name_vimrc.patch | 9 +++++---- vim-7.3-sh_is_bash.patch | 8 ++++---- vim-7.4-disable_lang_no.patch | 12 ++++++------ vim-7.4-filetype_apparmor.patch | 8 ++++---- vim-7.4-highlight_fstab.patch | 12 ++++++------ vim.changes | 27 +++++++++++++++++++++++++++ vim.spec | 8 ++++---- vim73-no-static-libpython.patch | 8 ++++---- 15 files changed, 98 insertions(+), 67 deletions(-) delete mode 100644 v7.4.2347.tar.gz create mode 100644 v8.0.0000.tar.gz diff --git a/v7.4.2347.tar.gz b/v7.4.2347.tar.gz deleted file mode 100644 index 28ffe27..0000000 --- a/v7.4.2347.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdb839502aac6c3ef99443bdfff90b899d3b0be831a4a8953d6782717a85fe66 -size 12914916 diff --git a/v8.0.0000.tar.gz b/v8.0.0000.tar.gz new file mode 100644 index 0000000..fff8ffa --- /dev/null +++ b/v8.0.0000.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88508a7823e7ae3e96f8b3d465eac8f6ca0f59196816d9d8e93f0bd55fd8d94d +size 12909227 diff --git a/vim-7.3-filetype_changes.patch b/vim-7.3-filetype_changes.patch index 57cae0d..859e906 100644 --- a/vim-7.3-filetype_changes.patch +++ b/vim-7.3-filetype_changes.patch @@ -1,8 +1,8 @@ -Index: vim-7.4.580.hg.6506/runtime/filetype.vim +Index: vim-8.0.0000/runtime/filetype.vim =================================================================== ---- vim-7.4.580.hg.6506.orig/runtime/filetype.vim -+++ vim-7.4.580.hg.6506/runtime/filetype.vim -@@ -407,6 +407,9 @@ au BufNewFile,BufRead *.css setf css +--- vim-8.0.0000.orig/runtime/filetype.vim ++++ vim-8.0.0000/runtime/filetype.vim +@@ -414,6 +414,9 @@ au BufNewFile,BufRead *.css setf css " Century Term Command Scripts (*.cmd too) au BufNewFile,BufRead *.con setf cterm @@ -12,10 +12,10 @@ Index: vim-7.4.580.hg.6506/runtime/filetype.vim " Changelog au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch \ setf debchangelog -Index: vim-7.4.580.hg.6506/runtime/syntax/changes.vim +Index: vim-8.0.0000/runtime/syntax/changes.vim =================================================================== --- /dev/null -+++ vim-7.4.580.hg.6506/runtime/syntax/changes.vim ++++ vim-8.0.0000/runtime/syntax/changes.vim @@ -0,0 +1,41 @@ +" Vim syntax file +" Filename: changes.vim diff --git a/vim-7.3-filetype_ftl.patch b/vim-7.3-filetype_ftl.patch index f4e5d42..f117ba3 100644 --- a/vim-7.3-filetype_ftl.patch +++ b/vim-7.3-filetype_ftl.patch @@ -1,7 +1,8 @@ -diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim ---- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200 -+++ vim73/runtime/filetype.vim 2010-11-21 05:13:00.462213463 +0100 -@@ -2512,3 +2512,7 @@ endfunc +Index: vim-8.0.0000/runtime/filetype.vim +=================================================================== +--- vim-8.0.0000.orig/runtime/filetype.vim ++++ vim-8.0.0000/runtime/filetype.vim +@@ -2770,3 +2770,7 @@ endfunc " Restore 'cpoptions' let &cpo = s:cpo_save unlet s:cpo_save @@ -9,9 +10,10 @@ diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim +" FreeMarker templates +au BufNewFile,BufRead *.ftl setf ftl + -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 +Index: vim-8.0.0000/runtime/syntax/ftl.vim +=================================================================== +--- /dev/null ++++ vim-8.0.0000/runtime/syntax/ftl.vim @@ -0,0 +1,36 @@ +" Vim syntax file +" Language: FreeMarker Template Language (FTL) diff --git a/vim-7.3-filetype_spec.patch b/vim-7.3-filetype_spec.patch index 3f5a930..2a3ae3b 100644 --- a/vim-7.3-filetype_spec.patch +++ b/vim-7.3-filetype_spec.patch @@ -1,8 +1,8 @@ -Index: vim-7.4.1938/runtime/filetype.vim +Index: vim-8.0.0000/runtime/filetype.vim =================================================================== ---- vim-7.4.1938.orig/runtime/filetype.vim -+++ vim-7.4.1938/runtime/filetype.vim -@@ -2065,7 +2065,7 @@ endfunc +--- vim-8.0.0000.orig/runtime/filetype.vim ++++ vim-8.0.0000/runtime/filetype.vim +@@ -2069,7 +2069,7 @@ endfunc " Spec (Linux RPM) @@ -11,11 +11,11 @@ Index: vim-7.4.1938/runtime/filetype.vim " Speedup (AspenTech plant simulator) au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup -Index: vim-7.4.1938/runtime/syntax/spec.vim +Index: vim-8.0.0000/runtime/syntax/spec.vim =================================================================== ---- vim-7.4.1938.orig/runtime/syntax/spec.vim -+++ vim-7.4.1938/runtime/syntax/spec.vim -@@ -105,7 +105,7 @@ syn case ignore +--- vim-8.0.0000.orig/runtime/syntax/spec.vim ++++ vim-8.0.0000/runtime/syntax/spec.vim +@@ -102,7 +102,7 @@ syn case ignore "%% PreAmble Section %% "Copyright and Serial were deprecated by License and Epoch syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier @@ -24,7 +24,7 @@ Index: vim-7.4.1938/runtime/syntax/spec.vim "%% Description Section %% syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment -@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou +@@ -111,7 +111,7 @@ syn region specDescriptionArea matchgrou syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment "%% Scripts Section %% diff --git a/vim-7.3-gvimrc_fontset.patch b/vim-7.3-gvimrc_fontset.patch index b720545..845901e 100644 --- a/vim-7.3-gvimrc_fontset.patch +++ b/vim-7.3-gvimrc_fontset.patch @@ -1,7 +1,8 @@ -diff -rup vim73.orig/runtime/gvimrc_example.vim vim73/runtime/gvimrc_example.vim ---- vim73.orig/runtime/gvimrc_example.vim 2010-05-15 13:03:31.000000000 +0200 -+++ vim73/runtime/gvimrc_example.vim 2010-11-21 04:47:29.891213689 +0100 -@@ -13,9 +13,6 @@ +Index: vim-8.0.0000/runtime/gvimrc_example.vim +=================================================================== +--- vim-8.0.0000.orig/runtime/gvimrc_example.vim ++++ vim-8.0.0000/runtime/gvimrc_example.vim +@@ -14,9 +14,6 @@ " Make external commands work through a pipe instead of a pseudo-tty "set noguipty @@ -11,7 +12,7 @@ diff -rup vim73.orig/runtime/gvimrc_example.vim vim73/runtime/gvimrc_example.vim set ch=2 " Make command line two lines high set mousehide " Hide the mouse when typing text -@@ -57,3 +54,29 @@ if version >= 500 +@@ -52,3 +49,29 @@ if version >= 500 highlight Special gui=NONE guibg=grey95 endif diff --git a/vim-7.3-help_tags.patch b/vim-7.3-help_tags.patch index c17f3eb..8b81480 100644 --- a/vim-7.3-help_tags.patch +++ b/vim-7.3-help_tags.patch @@ -1,7 +1,8 @@ -diff -rup vim73.orig/runtime/doc/Makefile vim73/runtime/doc/Makefile ---- vim73.orig/runtime/doc/Makefile 2010-07-21 20:38:06.000000000 +0200 -+++ vim73/runtime/doc/Makefile 2010-11-21 05:19:30.308088771 +0100 -@@ -310,6 +310,7 @@ all: tags vim.man evim.man vimdiff.man v +Index: vim-8.0.0000/runtime/doc/Makefile +=================================================================== +--- vim-8.0.0000.orig/runtime/doc/Makefile ++++ vim-8.0.0000/runtime/doc/Makefile +@@ -313,6 +313,7 @@ all: tags vim.man evim.man vimdiff.man v # Use Vim to generate the tags file. Can only be used when Vim has been # compiled and installed. Supports multiple languages. vimtags: $(DOCS) @@ -9,4 +10,3 @@ diff -rup vim73.orig/runtime/doc/Makefile vim73/runtime/doc/Makefile $(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit # Use "doctags" to generate the tags file. Only works for English! -Nur in vim73/runtime/doc: Makefile.orig. diff --git a/vim-7.3-name_vimrc.patch b/vim-7.3-name_vimrc.patch index 51b5929..ce086bb 100644 --- a/vim-7.3-name_vimrc.patch +++ b/vim-7.3-name_vimrc.patch @@ -1,7 +1,8 @@ -diff -rup vim73.orig/src/feature.h vim73/src/feature.h ---- vim73.orig/src/feature.h 2010-07-27 21:45:42.000000000 +0200 -+++ vim73/src/feature.h 2010-11-21 05:25:09.532342231 +0100 -@@ -936,12 +936,13 @@ +Index: vim-8.0.0000/src/feature.h +=================================================================== +--- vim-8.0.0000.orig/src/feature.h ++++ vim-8.0.0000/src/feature.h +@@ -934,12 +934,13 @@ * SYS_VIMRC_FILE Name of the system-wide .vimrc file. */ /* #define SYS_VIMRC_FILE "/etc/vimrc" */ diff --git a/vim-7.3-sh_is_bash.patch b/vim-7.3-sh_is_bash.patch index df64379..5deb59f 100644 --- a/vim-7.3-sh_is_bash.patch +++ b/vim-7.3-sh_is_bash.patch @@ -1,8 +1,8 @@ -Index: vim-7.4.930/runtime/syntax/sh.vim +Index: vim-8.0.0000/runtime/syntax/sh.vim =================================================================== ---- vim-7.4.930.orig/runtime/syntax/sh.vim -+++ vim-7.4.930/runtime/syntax/sh.vim -@@ -61,6 +61,13 @@ if !exists("b:is_kornshell") && !exists( +--- vim-8.0.0000.orig/runtime/syntax/sh.vim ++++ vim-8.0.0000/runtime/syntax/sh.vim +@@ -64,6 +64,13 @@ if !exists("b:is_kornshell") && !exists( endif endif diff --git a/vim-7.4-disable_lang_no.patch b/vim-7.4-disable_lang_no.patch index 2c41606..0e1effa 100644 --- a/vim-7.4-disable_lang_no.patch +++ b/vim-7.4-disable_lang_no.patch @@ -1,8 +1,8 @@ -Index: vim74/src/po/Makefile +Index: vim-8.0.0000/src/po/Makefile =================================================================== ---- vim74.orig/src/po/Makefile -+++ vim74/src/po/Makefile -@@ -21,7 +21,6 @@ LANGUAGES = \ +--- vim-8.0.0000.orig/src/po/Makefile ++++ vim-8.0.0000/src/po/Makefile +@@ -24,7 +24,6 @@ LANGUAGES = \ ko.UTF-8 \ nb \ nl \ @@ -10,7 +10,7 @@ Index: vim74/src/po/Makefile pl \ pt_BR \ ru \ -@@ -62,7 +61,6 @@ MOFILES = \ +@@ -65,7 +64,6 @@ MOFILES = \ ko.UTF-8.mo \ nb.mo \ nl.mo \ @@ -18,7 +18,7 @@ Index: vim74/src/po/Makefile pl.mo \ pt_BR.mo \ ru.mo \ -@@ -103,7 +101,6 @@ CHECKFILES = \ +@@ -106,7 +104,6 @@ CHECKFILES = \ ko.UTF-8.ck \ nb.ck \ nl.ck \ diff --git a/vim-7.4-filetype_apparmor.patch b/vim-7.4-filetype_apparmor.patch index 1a19661..6e21899 100644 --- a/vim-7.4-filetype_apparmor.patch +++ b/vim-7.4-filetype_apparmor.patch @@ -1,8 +1,8 @@ -Index: vim74/runtime/filetype.vim +Index: vim-8.0.0000/runtime/filetype.vim =================================================================== ---- vim74.orig/runtime/filetype.vim -+++ vim74/runtime/filetype.vim -@@ -112,6 +112,10 @@ au BufNewFile,BufRead proftpd.conf* cal +--- vim-8.0.0000.orig/runtime/filetype.vim ++++ vim-8.0.0000/runtime/filetype.vim +@@ -115,6 +115,10 @@ au BufNewFile,BufRead proftpd.conf* cal " Apache config file au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache diff --git a/vim-7.4-highlight_fstab.patch b/vim-7.4-highlight_fstab.patch index e8058e5..8f664e8 100644 --- a/vim-7.4-highlight_fstab.patch +++ b/vim-7.4-highlight_fstab.patch @@ -1,8 +1,8 @@ -Index: vim74/runtime/syntax/fstab.vim +Index: vim-8.0.0000/runtime/syntax/fstab.vim =================================================================== ---- vim74.orig/runtime/syntax/fstab.vim -+++ vim74/runtime/syntax/fstab.vim -@@ -36,7 +36,7 @@ syn match fsOperator /[,=:#]/ +--- vim-8.0.0000.orig/runtime/syntax/fstab.vim ++++ vim-8.0.0000/runtime/syntax/fstab.vim +@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/ " Device syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained @@ -11,7 +11,7 @@ Index: vim74/runtime/syntax/fstab.vim syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs -@@ -53,7 +53,7 @@ syn keyword fsMountPointKeyword containe +@@ -52,7 +52,7 @@ syn keyword fsMountPointKeyword containe " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown syn match fsTypeUnknown /\s\+\zs\w\+/ contained @@ -20,7 +20,7 @@ Index: vim74/runtime/syntax/fstab.vim " Options " ------- -@@ -65,7 +65,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] +@@ -64,7 +64,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-] syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 diff --git a/vim.changes b/vim.changes index d01f483..ab0efe5 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Mon Sep 12 13:09:03 UTC 2016 - idonmez@suse.com + +- Update to version 8.0 + * Crash on exit when EXITFREE is defined. (Dominique Pelle) + * Valgrind reports using uninitialzed memory. (Dominique Pelle) + * Test 86 and 87 fail with some version of Python. + * Netbeans test fails when run from unpacked MS-Windows sources. + * Netbeans test fails in shadow directory. + * Not enough test coverage for Normal mode commands. + * The example that explains nested backreferences does not work properly + with the new regexp engine. (Harm te Hennepe) + * Regexp fails to match when using "\>\)\?". (Ramel) + * Reading past end of line when using previous substitute pattern. + (Dominique Pelle) + * Attempt to read history entry while not initialized. + * Compiler warnings with Solaris Studio when using GTK3. + * Memory leak in timer_start(). + * Invalid memory access when formatting. (Dominique Pelle) + * Checking for last_timer_id to overflow is not reliable. (Ozaki Kiichi) + * Illegal memory access with ":1@". (Dominique Pelle) + * Superfluous function prototypes. + * Sort test sometimes fails. + * Needless line break. Confusing directory name. + * MS-Windows gvim.exe does not have DirectX support. + * Test runner misses a comma. + ------------------------------------------------------------------- Fri Sep 9 07:16:49 UTC 2016 - idonmez@suse.com diff --git a/vim.spec b/vim.spec index 00e3b2e..934ca0a 100644 --- a/vim.spec +++ b/vim.spec @@ -16,14 +16,14 @@ # -%define pkg_version 7.4 -%define patchlevel 2347 -%define VIM_SUBDIR vim74 +%define pkg_version 8.0 +%define patchlevel 0000 +%define VIM_SUBDIR vim80 %define site_runtimepath /usr/share/vim/site %define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags} Name: vim -Version: 7.4.%{patchlevel} +Version: 8.0.%{patchlevel} Release: 0 BuildRequires: autoconf BuildRequires: db-devel diff --git a/vim73-no-static-libpython.patch b/vim73-no-static-libpython.patch index 252b483..13bfb33 100644 --- a/vim73-no-static-libpython.patch +++ b/vim73-no-static-libpython.patch @@ -1,8 +1,8 @@ -Index: vim-7.4.676.hg.6704/src/configure.in +Index: vim-8.0.0000/src/configure.in =================================================================== ---- vim-7.4.676.hg.6704.orig/src/configure.in -+++ vim-7.4.676.hg.6704/src/configure.in -@@ -1143,7 +1143,7 @@ eof +--- vim-8.0.0000.orig/src/configure.in ++++ vim-8.0.0000/src/configure.in +@@ -1203,7 +1203,7 @@ eof if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else