Skip to content

Commit a54d2fc

Browse files
committed
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)
1 parent 595297d commit a54d2fc

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ MINOR = 0
120120
#
121121
# MS-Windows:
122122
# - Run make on Unix to update the ".mo" files.
123-
# - Get libintl-8.dll and libiconv-2.dll. E.g. from
123+
# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
124124
# https://mlocati.github.io/gettext-iconv-windows/ .
125+
# Use the "shared-32.zip file and extract the archive to get the files.
125126
# Put them in the top directory, "make dosrt" uses them.
126127
# - > make dossrc
127128
# > make dosrt
@@ -468,6 +469,7 @@ dosrt_files: dist prepare no_title.vim
468469
done
469470
cp libintl-8.dll dist/vim/$(VIMRTDIR)/
470471
cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
472+
cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
471473

472474

473475
# Used before uploading. Don't delete the AAPDIR/sign files!

nsis/gvim.nsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ SectionEnd
385385
File ${VIMRT}\libintl-8.dll
386386
File ${VIMRT}\libiconv-2.dll
387387
File /nonfatal ${VIMRT}\libwinpthread-1.dll
388+
File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
388389
SectionEnd
389390
!endif
390391

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
410,
767769
/**/
768770
409,
769771
/**/

0 commit comments

Comments
 (0)