K.Takata's patch queue for Vim
| Revision | c79028e3e9b4f221ea5dc2c6d3676ffb371eb0fb (tree) |
|---|---|
| Zeit | 2022-03-07 09:31:10 |
| Autor | K.Takata <kentkt@csc....> |
| Commiter | K.Takata |
Update for 8.2.4517
Remove a merged patch.
| @@ -1,70 +0,0 @@ | ||
| 1 | -# HG changeset patch | |
| 2 | -# Parent c589751ab8b02b2f771345ba233981eabfcf4d64 | |
| 3 | - | |
| 4 | -diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak | |
| 5 | ---- a/src/Make_cyg_ming.mak | |
| 6 | -+++ b/src/Make_cyg_ming.mak | |
| 7 | -@@ -32,30 +32,31 @@ | |
| 8 | - # Set to TINY to make minimal version (few features). | |
| 9 | - FEATURES=HUGE | |
| 10 | - | |
| 11 | --# set to yes for a debug build | |
| 12 | -+# Set to yes for a debug build. | |
| 13 | - DEBUG=no | |
| 14 | - | |
| 15 | --# set to yes to create a mapfile | |
| 16 | -+# Set to yes to create a mapfile. | |
| 17 | - #MAP=yes | |
| 18 | - | |
| 19 | --# set to yes to measure code coverage | |
| 20 | -+# Set to yes to measure code coverage. | |
| 21 | - COVERAGE=no | |
| 22 | - | |
| 23 | --# better encryption support using libsodium | |
| 24 | -+# Better encryption support using libsodium. | |
| 25 | -+# Set to yes or specify the path to the libsodium directory to enable it. | |
| 26 | - #SODIUM=yes | |
| 27 | - | |
| 28 | --# set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization | |
| 29 | -+# Set to SIZE for size, SPEED for speed, MAXSPEED for maximum optimization. | |
| 30 | - OPTIMIZE=MAXSPEED | |
| 31 | - | |
| 32 | --# set to yes to make gvim, no for vim | |
| 33 | -+# Set to yes to make gvim, no for vim. | |
| 34 | - GUI=yes | |
| 35 | - | |
| 36 | --# set to yes to enable the DLL support (EXPERIMENTAL). | |
| 37 | -+# Set to yes to enable the DLL support (EXPERIMENTAL). | |
| 38 | - # Creates vim{32,64}.dll, and stub gvim.exe and vim.exe. | |
| 39 | - # "GUI" should be also set to "yes". | |
| 40 | - #VIMDLL=yes | |
| 41 | - | |
| 42 | --# set to no if you do not want to use DirectWrite (DirectX) | |
| 43 | -+# Set to no if you do not want to use DirectWrite (DirectX). | |
| 44 | - # MinGW-w64 is needed, and ARCH should be set to i686 or x86-64. | |
| 45 | - DIRECTX=yes | |
| 46 | - | |
| 47 | -@@ -525,10 +526,6 @@ CXXFLAGS = -fasynchronous-unwind-tables | |
| 48 | - WINDRES_FLAGS = | |
| 49 | - EXTRA_LIBS = | |
| 50 | - | |
| 51 | --ifdef SODIUM | |
| 52 | --DEFINES += -DHAVE_SODIUM | |
| 53 | --endif | |
| 54 | -- | |
| 55 | - ifdef GETTEXT | |
| 56 | - DEFINES += -DHAVE_GETTEXT -DHAVE_LOCALE_H | |
| 57 | - GETTEXTINCLUDE = $(GETTEXT)/include | |
| 58 | -@@ -672,7 +669,11 @@ DEFINES += -DFEAT_DIRECTX_COLOR_EMOJI | |
| 59 | - endif | |
| 60 | - endif | |
| 61 | - | |
| 62 | --ifeq ($(SODIUM),yes) | |
| 63 | -+ifdef SODIUM | |
| 64 | -+DEFINES += -DHAVE_SODIUM | |
| 65 | -+ ifneq ($(SODIUM),yes) | |
| 66 | -+CFLAGS += -I $(SODIUM)/include | |
| 67 | -+ endif | |
| 68 | - ifndef DYNAMIC_SODIUM | |
| 69 | - DYNAMIC_SODIUM=yes | |
| 70 | - endif |
| @@ -30,5 +30,4 @@ | ||
| 30 | 30 | wip-win32-vimdir-encoding.patch #+wip |
| 31 | 31 | win32-directwrite-ambiwidth-auto.patch |
| 32 | 32 | suppress-warnings.patch |
| 33 | -mingw-enable-using-custom-libsodium.patch | |
| 34 | 33 | fix-config_cache-removal.patch #+rejected |
Fork
series