- patchlevel 384
This commit is contained in:
parent
0acd2c8226
commit
5b2cdc8304
59
7.2.384
Normal file
59
7.2.384
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
To: vim-dev@vim.org
|
||||||
|
Subject: Patch 7.2.384 (extra)
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.2.384 (extra)
|
||||||
|
Problem: Vim doesn't build properly with MSVC 2010.
|
||||||
|
Solution: Add the nmake version to the build file. (George Reilly)
|
||||||
|
Files: src/Make_mvc.mak, src/testdir/Make_dos.mak
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.2.383/src/Make_mvc.mak 2009-09-11 12:48:56.000000000 +0200
|
||||||
|
--- src/Make_mvc.mak 2010-03-02 17:44:22.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 361,366 ****
|
||||||
|
--- 361,369 ----
|
||||||
|
!if "$(_NMAKE_VER)" == "10.00.20506.01"
|
||||||
|
MSVCVER = 10.0
|
||||||
|
!endif
|
||||||
|
+ !if "$(_NMAKE_VER)" == "10.00.30128.01"
|
||||||
|
+ MSVCVER = 10.0
|
||||||
|
+ !endif
|
||||||
|
!endif
|
||||||
|
|
||||||
|
# Abort bulding VIM if version of VC is unrecognised.
|
||||||
|
*** ../vim-7.2.383/src/testdir/Make_dos.mak 2010-01-19 15:51:29.000000000 +0100
|
||||||
|
--- src/testdir/Make_dos.mak 2010-03-02 17:45:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 56,61 ****
|
||||||
|
--- 56,62 ----
|
||||||
|
-if exist small.vim del small.vim
|
||||||
|
-if exist tiny.vim del tiny.vim
|
||||||
|
-if exist mbyte.vim del mbyte.vim
|
||||||
|
+ -if exist mzscheme.vim del mzscheme.vim
|
||||||
|
-del X*
|
||||||
|
-if exist viminfo del viminfo
|
||||||
|
|
||||||
|
*** ../vim-7.2.383/src/version.c 2010-03-02 17:50:30.000000000 +0100
|
||||||
|
--- src/version.c 2010-03-02 17:59:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 683,684 ****
|
||||||
|
--- 683,686 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 384,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Yah, well, we had to carve our electrons out of driftwood we'd
|
||||||
|
find. In the winter. Uphill. Both ways.
|
||||||
|
|
||||||
|
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
||||||
|
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
||||||
|
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
||||||
|
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
@ -412,3 +412,6 @@ Individual patches for Vim 7.2:
|
|||||||
1758 7.2.379 'eventignore' is set to an invalid value inside ":doau"
|
1758 7.2.379 'eventignore' is set to an invalid value inside ":doau"
|
||||||
3699 7.2.380 (after 7.2.363) Perl builds with 5.10.1 but not with 5.10.0
|
3699 7.2.380 (after 7.2.363) Perl builds with 5.10.1 but not with 5.10.0
|
||||||
6835 7.2.381 no completion for :behave
|
6835 7.2.381 no completion for :behave
|
||||||
|
1766 7.2.382 close cmdline window when 'bufhide' is "wipe" uses freed mem
|
||||||
|
3021 7.2.383 Vim doesn't build cleanly with MSVC 2010
|
||||||
|
1849 7.2.384 (extra) Vim doesn't build properly with MSVC 2010
|
||||||
|
11
vim.spec
11
vim.spec
@ -18,7 +18,7 @@
|
|||||||
#used for pre-releases:
|
#used for pre-releases:
|
||||||
%define beta %{nil}
|
%define beta %{nil}
|
||||||
%define vimdir vim72%{?beta}
|
%define vimdir vim72%{?beta}
|
||||||
%define patchlevel 381
|
%define patchlevel 384
|
||||||
|
|
||||||
Summary: The VIM editor
|
Summary: The VIM editor
|
||||||
URL: http://www.vim.org/
|
URL: http://www.vim.org/
|
||||||
@ -447,6 +447,9 @@ Patch378: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.378
|
|||||||
Patch379: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.379
|
Patch379: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.379
|
||||||
Patch380: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.380
|
Patch380: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.380
|
||||||
Patch381: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.381
|
Patch381: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.381
|
||||||
|
Patch382: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.382
|
||||||
|
Patch383: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.383
|
||||||
|
Patch384: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.384
|
||||||
|
|
||||||
Patch3000: vim-7.0-syntax.patch
|
Patch3000: vim-7.0-syntax.patch
|
||||||
Patch3002: vim-7.1-nowarnings.patch
|
Patch3002: vim-7.1-nowarnings.patch
|
||||||
@ -966,6 +969,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
|||||||
%patch379 -p0
|
%patch379 -p0
|
||||||
%patch380 -p0
|
%patch380 -p0
|
||||||
%patch381 -p0
|
%patch381 -p0
|
||||||
|
%patch382 -p0
|
||||||
|
%patch383 -p0
|
||||||
|
%patch384 -p0
|
||||||
|
|
||||||
|
|
||||||
# install spell files
|
# install spell files
|
||||||
@ -1430,6 +1436,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/icons/hicolor/*/apps/*
|
%{_datadir}/icons/hicolor/*/apps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.384-1
|
||||||
|
- patchlevel 384
|
||||||
|
|
||||||
* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
|
* Tue Mar 02 2010 Karsten Hopp <karsten@redhat.com> 7.2.381-1
|
||||||
- patchlevel 381
|
- patchlevel 381
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user