patch 8.0.0410: newer gettext/iconv library has extra dll file

Problem:    Newer gettext/iconv library has extra dll file.
Solution:   Add the file to the Makefile and nsis script. (Christian Brabandt)

diff --git a/Makefile b/Makefile
index 9f48a3509ab7508764ebd425e56118991cafe453..d19831615bd521d13490f24b6c9ea01b1a57b2a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,9 @@ MINOR = 0
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get libintl-8.dll and libiconv-2.dll. E.g. from
+# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
+#   Use the "shared-32.zip file and extract the archive to get the files.
 #   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
@@ -468,6 +469,7 @@ dosrt_files: dist prepare no_title.vim
            done
        cp libintl-8.dll dist/vim/$(VIMRTDIR)/
        cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
+       cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
 
 
 # Used before uploading.  Don't delete the AAPDIR/sign files!

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 26d7aab8eeb7a3ea88571179e4db2db079d86731..74a54333a46c76794266c047d9be349899a5ddea 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -385,6 +385,7 @@ SectionEnd
                File ${VIMRT}\libintl-8.dll
                File ${VIMRT}\libiconv-2.dll
                File /nonfatal ${VIMRT}\libwinpthread-1.dll
+               File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
        SectionEnd
 !endif
 

diff --git a/src/version.c b/src/version.c
index 59ad156c3d6dc505242c681cf20c91bb8783c18c..1020bf96454a96461537810ec0e702e640491135 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    410,
 /**/
     409,
 /**/