make-file-list: work around a libunistring version problem of gnupg

As of yesterday's big MSYS2 i686 sync, there is no longer an
`msys-unistring-2.dll` but an `msys-unistring-5.dll`.

However, gnupg (e.g. `dirmngr.exe`, via `msys-gnutls-30.dll`) depends on
the former file to be present.

Since the full i686 variant of Git for Windows is on its way out (we'll
be dropping the installer/portable Git builds for i686 after one last
full i686 release with Git for Windows v2.48.1, and MinGit does not
include gnupg), it isn't worth fretting too much about this; Simply
copying the latter to the former seems to work just fine.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

make-file-list.sh

@@ -404,10 +404,22 @@ usr/bin/dash.exe
 usr/bin/getopt.exe
 EOF
 
+EXTRA_DLL_FILES=
 case $MSYSTEM_LOWER in
 mingw*)
 	PDFTOTEXT_FILES="$MSYSTEM_LOWER/bin/pdftotext.exe
 $MSYSTEM_LOWER/bin/libstdc++-6.dll"
+	if test i686 = "$ARCH" &&
+		grep msys-unistring-2 /usr/bin/msys-gnutls-30.dll 2>&1 >/dev/null &&
+		test ! -d /var/lib/pacman/local/libunistring-0*-1
+	then
+		# Utter hack: i686 gnupg might still link to msys-unistring-2.dll
+		test -f /usr/bin/msys-unistring-2.dll ||
+		cp /usr/bin/msys-unistring-5.dll /usr/bin/msys-unistring-2.dll ||
+		die "Could not fudge msys-unistring-2.dll"
+		EXTRA_DLL_FILES='
+usr/bin/msys-unistring-2.dll'
+	fi
 	;;
 *)
 	# In the clang version, we do not need the libstdc++ DLL
@@ -421,7 +433,7 @@ etc/post-install/01-devices.post
 etc/post-install/03-mtab.post
 etc/post-install/06-windows-files.post
 usr/bin/start
-$PDFTOTEXT_FILES
+$PDFTOTEXT_FILES$EXTRA_DLL_FILES
 usr/bin/column.exe
 EOF