diff options
author | Sam Bingner <sam@bingner.com> | 2018-08-03 15:06:38 -1000 |
---|---|---|
committer | Sam Bingner <sam@bingner.com> | 2018-08-03 15:06:38 -1000 |
commit | 135b410607f008d3709a7b1374f3f37924eb9fe4 (patch) | |
tree | f4756ef3a354f6001360db894db010df85177f76 /data/vim/patches/8.1.0128 | |
parent | bd1eb51da0d3f250793e1868d73babdf495c921f (diff) |
Update vim
Diffstat (limited to 'data/vim/patches/8.1.0128')
-rw-r--r-- | data/vim/patches/8.1.0128 | 487 |
1 files changed, 487 insertions, 0 deletions
diff --git a/data/vim/patches/8.1.0128 b/data/vim/patches/8.1.0128 new file mode 100644 index 000000000..5b9907bda --- /dev/null +++ b/data/vim/patches/8.1.0128 @@ -0,0 +1,487 @@ +To: vim_dev@googlegroups.com +Subject: Patch 8.1.0128 +Fcc: outbox +From: Bram Moolenaar <Bram@moolenaar.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 8.1.0128 +Problem: Building with MinGW does not work out-of-the-box. +Solution: Add instructions for MSYS2. Set default WINVER. Add batch files + to set $PATH for MSYS2. +Files: src/Make_cyg_ming.mak, src/INSTALLpc.txt, src/msys32.bat, + src/msys64.bat, Filelist + + +*** ../vim-8.1.0127/src/Make_cyg_ming.mak 2018-06-19 18:58:04.006489842 +0200 +--- src/Make_cyg_ming.mak 2018-06-30 15:56:42.425768825 +0200 +*************** +*** 75,83 **** + # Set to yes to enable OLE support. + OLE=no + +! # Set the default $(WINVER) to make it work with WinXP. + ifndef WINVER +! WINVER = 0x0501 + endif + + # Set to yes to enable Cscope support. +--- 75,84 ---- + # Set to yes to enable OLE support. + OLE=no + +! # Set the default $(WINVER). Use 0x0501 to make it work with WinXP. + ifndef WINVER +! # WINVER = 0x0501 +! WINVER = 0x0600 + endif + + # Set to yes to enable Cscope support. +*** ../vim-8.1.0127/src/INSTALLpc.txt 2017-12-14 13:07:27.000000000 +0100 +--- src/INSTALLpc.txt 2018-06-30 16:08:36.949674031 +0200 +*************** +*** 22,44 **** + + Contents: + 1. Microsoft Visual C++ +! 2. Using MinGW +! 3. Cygwin +! 4. Borland +! 5. Cross compiling for Win32 from a Linux machine +! 6. Building with Python support +! 7. Building with Python3 support +! 8. Building with Racket or MzScheme support +! 9. Building with Lua support +! 10. Building with Perl support +! 11. Building with Ruby support +! 12. Building with Tcl support +! 13. Building with Terminal support +! 14. Building with DirectX (DirectWrite) support +! 15. Windows 3.1 +! 16. MS-DOS + +! 17. Installing after building from sources + + + The currently recommended way (that means it has been verified to work) is +--- 22,45 ---- + + Contents: + 1. Microsoft Visual C++ +! 2. Using MSYS2 with MinGW +! 3. Using MinGW +! 4. Cygwin +! 5. Borland +! 6. Cross compiling for Win32 from a Linux machine +! 7. Building with Python support +! 8. Building with Python3 support +! 9. Building with Racket or MzScheme support +! 10. Building with Lua support +! 11. Building with Perl support +! 12. Building with Ruby support +! 13. Building with Tcl support +! 14. Building with Terminal support +! 15. Building with DirectX (DirectWrite) support +! 16. Windows 3.1 +! 17. MS-DOS + +! 18. Installing after building from sources + + + The currently recommended way (that means it has been verified to work) is +*************** +*** 261,268 **** + http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx + + + +! 2. MinGW + ======== + + (written by Ron Aaron: <ronaharon@yahoo.com>) +--- 262,348 ---- + http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx + + ++ 2. MSYS2 with MinGW ++ =================== + +! 2.1. Setup the basic msys2 environment +! +! Go to the official page of MSYS2: https://www.msys2.org +! Download an installer: +! +! * msys2-x86_64-YYYYMMDD.exe for 64-bit Windows +! (Even if you want to build 32-bit Vim) +! * msys2-i686-YYYYMMDD.exe for 32-bit Windows +! +! Execute the installer and follow the instructions to update basic packages. +! At the end keep the checkbox checked to run msys2 now. If needed, you can +! open the window from the start menu, MSYS2 64 bit / MSYS2 MSYS +! +! Execute: +! $ pacman -Syu +! +! And restart MSYS2 window (select "MSYS2 MSYS" icon from the Start Menu). +! Then execute: +! $ pacman -Su +! +! If pacman complains that `catgets` and `libcatgets` conflict with another +! package, select `y` to remove them. +! +! +! 2.2. Install additional packages for building Vim +! +! The following package groups are required for building Vim: +! +! * base-devel +! * mingw-w64-i686-toolchain (for building 32-bit Vim) +! * mingw-w64-x86_64-toolchain (for building 64-bit Vim) +! +! Use the following command to install them: +! +! $ pacman -S base-devel mingw-w64-i686-toolchain mingw-w64-x86_64-toolchain +! +! Or you can use the `pacboy` command to avoid long package names: +! +! $ pacboy -S base-devel: toolchain:m +! +! (See `pacboy help` for the help.) +! +! +! 2.3. Keep the build environment up-to-date +! +! After you have installed the build environment, you may want to keep it +! up-to-date (E.g. always use the latest GCC). +! In that case, you just need to execute the command: +! $ pacman -Syu +! +! +! # Build Vim +! +! Select one of the following icon from the Start Menu: +! +! * MSYS2 MinGW 32-bit (To build 32-bit versions of Vim) +! * MSYS2 MinGW 64-bit (To build 64-bit versions of Vim) +! +! Go to the source directory of Vim, then execute the make command. E.g.: +! +! make -f Make_ming.mak +! make -f Make_ming.mak GUI=no +! make -f Make_ming.mak GUI=no DEBUG=yes +! +! NOTE: you can't execute the vim.exe in the MSYS console, open a normal Windows +! console for that. You need to set $PATH to be able to build there, e.g.: +! +! set PATH=c:\msys64\mingw32\bin;c:\msys64\usr\bin;%PATH% +! +! This command is in msys32.bat. Or or the 64 bit compiler use msys64.bat: +! +! set PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;%PATH% +! +! If you have msys64 in another location you will need to adjust the paths for +! that. +! +! +! 3. MinGW + ======== + + (written by Ron Aaron: <ronaharon@yahoo.com>) +*************** +*** 344,350 **** + You need to uncomment lines in Make_ming.mak to have NLS defined. + + +! 3. Cygwin + ========= + + Use Make_cyg.mak with Cygwin's GCC. See +--- 424,430 ---- + You need to uncomment lines in Make_ming.mak to have NLS defined. + + +! 4. Cygwin + ========= + + Use Make_cyg.mak with Cygwin's GCC. See +*************** +*** 356,369 **** + with the other makefiles). + + +! 4. Borland + =========== + + Use Make_bc5.mak with Borland C++ 5.x. See + http://users.skynet.be/antoine.mechelynck/vim/compile.htm + + +! 5. Cross compiling for Win32 from a Linux machine + ================================================= + + [Update of 1) needs to be verified] +--- 436,449 ---- + with the other makefiles). + + +! 5. Borland + =========== + + Use Make_bc5.mak with Borland C++ 5.x. See + http://users.skynet.be/antoine.mechelynck/vim/compile.htm + + +! 6. Cross compiling for Win32 from a Linux machine + ================================================= + + [Update of 1) needs to be verified] +*************** +*** 383,389 **** + Now you have created the Windows binary from your Linux box! Have fun... + + +! 6. Building with Python support + =============================== + + For building with MSVC 2008 the "Windows Installer" from www.python.org +--- 463,469 ---- + Now you have created the Windows binary from your Linux box! Have fun... + + +! 7. Building with Python support + =============================== + + For building with MSVC 2008 the "Windows Installer" from www.python.org +*************** +*** 435,441 **** + You will end up with a Python-enabled, Win32 version. Enjoy! + + +! 7. Building with Python3 support + ================================ + + For building with MSVC 2008 the "Windows Installer" from www.python.org +--- 515,521 ---- + You will end up with a Python-enabled, Win32 version. Enjoy! + + +! 8. Building with Python3 support + ================================ + + For building with MSVC 2008 the "Windows Installer" from www.python.org +*************** +*** 466,472 **** + (This is for 64-bit builds. For 32-bit builds, replace mingw64 with mingw32.) + + +! 8. Building with Racket or MzScheme support + ======================================== + + 1) Building with Racket support (newest) +--- 546,552 ---- + (This is for 64-bit builds. For 32-bit builds, replace mingw64 with mingw32.) + + +! 9. Building with Racket or MzScheme support + ======================================== + + 1) Building with Racket support (newest) +*************** +*** 556,562 **** + + + +! 9. Building with Lua support + ============================ + + Vim with Lua support can be built with either MSVC or MinGW (or maybe Cygwin). +--- 636,642 ---- + + + +! 10. Building with Lua support + ============================ + + Vim with Lua support can be built with either MSVC or MinGW (or maybe Cygwin). +*************** +*** 611,617 **** + LUA=/cygdrive/c/projects/lua53 DYNAMIC_LUA=yes LUA_VER=53 + + +! 10. Building with Perl support + ============================== + + Vim with Perl support can be built with either MSVC or MinGW (or Cygwin). +--- 691,697 ---- + LUA=/cygdrive/c/projects/lua53 DYNAMIC_LUA=yes LUA_VER=53 + + +! 11. Building with Perl support + ============================== + + Vim with Perl support can be built with either MSVC or MinGW (or Cygwin). +*************** +*** 637,643 **** + PERL=C:/Perl DYNAMIC_PERL=yes PERL_VER=522 + + +! 11. Building with Ruby support + ============================== + + Vim with Ruby support can be built with either MSVC or MinGW (or Cygwin). +--- 717,723 ---- + PERL=C:/Perl DYNAMIC_PERL=yes PERL_VER=522 + + +! 12. Building with Ruby support + ============================== + + Vim with Ruby support can be built with either MSVC or MinGW (or Cygwin). +*************** +*** 745,751 **** + + + +! 12. Building with Tcl support + ============================= + + Vim with Tcl support can be built with either MSVC or MinGW (or Cygwin). +--- 825,831 ---- + + + +! 13. Building with Tcl support + ============================= + + Vim with Tcl support can be built with either MSVC or MinGW (or Cygwin). +*************** +*** 777,783 **** + TCL=C:/Tcl86 DYNAMIC_TCL=yes TCL_VER=86 TCL_VER_LONG=8.6 + + +! 13. Building with Terminal support + ================================== + + Vim with Terminal support can be built with either MSVC, MinGW or Cygwin. +--- 857,863 ---- + TCL=C:/Tcl86 DYNAMIC_TCL=yes TCL_VER=86 TCL_VER_LONG=8.6 + + +! 14. Building with Terminal support + ================================== + + Vim with Terminal support can be built with either MSVC, MinGW or Cygwin. +*************** +*** 793,799 **** + mingw32-make -f Make_ming.mak TERMINAL=yes + + +! 14. Building with DirectX (DirectWrite) support + =============================================== + + Vim with DirectX (DirectWrite) support can be built with either MSVC or MinGW. +--- 873,879 ---- + mingw32-make -f Make_ming.mak TERMINAL=yes + + +! 15. Building with DirectX (DirectWrite) support + =============================================== + + Vim with DirectX (DirectWrite) support can be built with either MSVC or MinGW. +*************** +*** 827,846 **** + mingw32-make -f Make_ming.mak DIRECTX=yes + + +! 15. Windows 3.1x + ================ + + The Windows 3.1x support was removed in patch 7.4.1364. + + +! 16. MS-DOS + ========== + + The MS-DOS support was removed in patch 7.4.1399. Only very old Vim versions + work on MS-DOS because of the limited amount of memory available. + + +! 17. Installing after building from sources + ========================================== + + [provided by Michael Soyka, updated by Ken Takata] +--- 907,926 ---- + mingw32-make -f Make_ming.mak DIRECTX=yes + + +! 16. Windows 3.1x + ================ + + The Windows 3.1x support was removed in patch 7.4.1364. + + +! 17. MS-DOS + ========== + + The MS-DOS support was removed in patch 7.4.1399. Only very old Vim versions + work on MS-DOS because of the limited amount of memory available. + + +! 18. Installing after building from sources + ========================================== + + [provided by Michael Soyka, updated by Ken Takata] +*** ../vim-8.1.0127/src/msys32.bat 2018-06-30 16:24:02.228096012 +0200 +--- src/msys32.bat 2018-06-30 16:23:34.768256429 +0200 +*************** +*** 0 **** +--- 1,6 ---- ++ @echo off ++ rem To be used on MS-Windows for Msys2 with the 32 bit MinGW compiler. ++ rem Adjust the "c:\msys64" part to match your installation. ++ @echo on ++ ++ set PATH=c:\msys64\mingw32\bin;c:\msys64\usr\bin;%PATH% +*** ../vim-8.1.0127/src/msys64.bat 2018-06-30 16:24:02.236095965 +0200 +--- src/msys64.bat 2018-06-30 16:23:33.832261898 +0200 +*************** +*** 0 **** +--- 1,6 ---- ++ @echo off ++ rem To be used on MS-Windows for Msys2 with the 64 bit MinGW compiler. ++ rem Adjust the "c:\msys64" part to match your installation. ++ @echo on ++ ++ set PATH=c:\msys64\mingw64\bin;c:\msys64\usr\bin;%PATH% +*** ../vim-8.1.0127/Filelist 2018-06-24 15:56:20.602363176 +0200 +--- Filelist 2018-06-30 16:15:24.499158371 +0200 +*************** +*** 412,417 **** +--- 412,419 ---- + src/msvc2008.bat \ + src/msvc2010.bat \ + src/msvc2015.bat \ ++ src/msys32.bat \ ++ src/msys64.bat \ + src/dimm.idl \ + src/dlldata.c \ + src/dosinst.c \ +*** ../vim-8.1.0127/src/version.c 2018-06-29 20:28:27.505661796 +0200 +--- src/version.c 2018-06-30 16:24:09.380054257 +0200 +*************** +*** 791,792 **** +--- 791,794 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 128, + /**/ + +-- +Fingers not found - Pound head on keyboard to continue. + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ an exciting new programming language -- http://www.Zimbu.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |