- patchlevel 377
This commit is contained in:
parent
44ad545d3b
commit
6f1d280abf
66
7.2.377
Normal file
66
7.2.377
Normal file
@ -0,0 +1,66 @@
|
||||
To: vim-dev@vim.org
|
||||
Subject: Patch 7.2.377 (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.377 (extra, after 7.2.372)
|
||||
Problem: Misplaced assignment. Duplicate build line for gvimext.dll.
|
||||
Solution: Move setting CROSS_COMPILE to before ifneq. Remove the wrong
|
||||
build line. (Markus Heidelberg)
|
||||
Files: src/Make_ming.mak
|
||||
|
||||
|
||||
*** ../vim-7.2.376/src/Make_ming.mak 2010-02-24 15:07:45.000000000 +0100
|
||||
--- src/Make_ming.mak 2010-02-26 22:01:07.000000000 +0100
|
||||
***************
|
||||
*** 248,255 ****
|
||||
DIRSLASH = /
|
||||
else
|
||||
# normal (Windows) compilation:
|
||||
- ifneq (sh.exe, $(SHELL))
|
||||
CROSS_COMPILE =
|
||||
DEL = rm
|
||||
MKDIR = mkdir -p
|
||||
DIRSLASH = /
|
||||
--- 248,255 ----
|
||||
DIRSLASH = /
|
||||
else
|
||||
# normal (Windows) compilation:
|
||||
CROSS_COMPILE =
|
||||
+ ifneq (sh.exe, $(SHELL))
|
||||
DEL = rm
|
||||
MKDIR = mkdir -p
|
||||
DIRSLASH = /
|
||||
***************
|
||||
*** 553,559 ****
|
||||
$(MAKE) -C xxd -f Make_cyg.mak CC=$(CC)
|
||||
|
||||
GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
|
||||
- $(MAKE) -C GvimExt -f Make_ming.mak
|
||||
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE)
|
||||
|
||||
clean:
|
||||
--- 553,558 ----
|
||||
*** ../vim-7.2.376/src/version.c 2010-02-24 17:22:14.000000000 +0100
|
||||
--- src/version.c 2010-02-26 22:01:45.000000000 +0100
|
||||
***************
|
||||
*** 683,684 ****
|
||||
--- 683,686 ----
|
||||
{ /* Add new patch number below this line */
|
||||
+ /**/
|
||||
+ 377,
|
||||
/**/
|
||||
|
||||
--
|
||||
FIRST HEAD: All right! All right! We'll kill him first and then have tea and
|
||||
biscuits.
|
||||
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||
|
||||
/// 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 ///
|
@ -407,3 +407,4 @@ Individual patches for Vim 7.2:
|
||||
4434 7.2.374 Ruby eval() doesn't understand Vim types
|
||||
1794 7.2.375 ml_get errors when using ":bprevious" in a BufEnter autocmd
|
||||
1577 7.2.376 ml_get error when using SiSU syntax
|
||||
1983 7.2.377 (extra, after 7.2.372) small mistakes in Ming build file
|
||||
|
7
vim.spec
7
vim.spec
@ -18,7 +18,7 @@
|
||||
#used for pre-releases:
|
||||
%define beta %{nil}
|
||||
%define vimdir vim72%{?beta}
|
||||
%define patchlevel 376
|
||||
%define patchlevel 377
|
||||
|
||||
Summary: The VIM editor
|
||||
URL: http://www.vim.org/
|
||||
@ -442,6 +442,7 @@ Patch373: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.373
|
||||
Patch374: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.374
|
||||
Patch375: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.375
|
||||
Patch376: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.376
|
||||
Patch377: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.377
|
||||
|
||||
Patch3000: vim-7.0-syntax.patch
|
||||
Patch3002: vim-7.1-nowarnings.patch
|
||||
@ -956,6 +957,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
|
||||
%patch374 -p0
|
||||
%patch375 -p0
|
||||
%patch376 -p0
|
||||
%patch377 -p0
|
||||
|
||||
|
||||
# install spell files
|
||||
@ -1420,6 +1422,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_datadir}/icons/hicolor/*/apps/*
|
||||
|
||||
%changelog
|
||||
* Sat Feb 27 2010 Karsten Hopp <karsten@redhat.com> 7.2.377-1
|
||||
- patchlevel 377
|
||||
|
||||
* Wed Feb 24 2010 Karsten Hopp <karsten@redhat.com> 7.2.376-1
|
||||
- patchlevel 376
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user