From f8cdec1883e1f4fa915e62e2f90cc19c51278095 Mon Sep 17 00:00:00 2001
From: "U-YGGDRASIL\\ender" <X:\Stuff\Mail>
Date: Sun, 19 Dec 2021 18:59:02 +0100
Subject: [PATCH] Windows installer: drop codepage conversion, use UTF-8 for
 language files

---
 build/windows/installer/lang/Makefile.am | 73 ++++++++++++------------
 1 file changed, 36 insertions(+), 37 deletions(-)

diff --git a/build/windows/installer/lang/Makefile.am b/build/windows/installer/lang/Makefile.am
index dbcc0d236f..8fce8a8a61 100644
--- a/build/windows/installer/lang/Makefile.am
+++ b/build/windows/installer/lang/Makefile.am
@@ -8,51 +8,50 @@ stamp_files = \
 CLEANFILES = $(isl_files) $(stamp_files)
 
 languages = \
-	ca:[ca]:WINDOWS-1252		\
-	da:[da]:WINDOWS-1252		\
-	de:[de]:WINDOWS-1252		\
-	el:[el]:WINDOWS-1253		\
-	en::WINDOWS-1252		\
-	en_GB:[en_GB]:UTF-8		\
-	eo:[eo]:ISO-8859-3		\
-	es:[es]:WINDOWS-1252		\
-	eu:[eu]:WINDOWS-1252		\
-	fi:[fi]:WINDOWS-1252		\
-	fr:[fr]:WINDOWS-1252		\
-	hr:[hr]:WINDOWS-1250		\
-	hu:[hu]:WINDOWS-1250		\
-	id:[id]:ISO-8859-1		\
-	is:[is]:WINDOWS-1252		\
-	it:[it]:WINDOWS-1252		\
-	ja:[ja]:CP932			\
-	ko:[ko]:EUC-KR			\
-	lt:[lt]:ISO-8859-13		\
-	lv:[lv]:ISO-8859-13		\
-	mr:[mr]:UTF-8   		\
-	nl:[nl]:WINDOWS-1252		\
-	pl:[pl]:WINDOWS-1250		\
-	pt_BR:[pt_BR]:WINDOWS-1252	\
-	ro:[ro]:WINDOWS-1250		\
-	ru:[ru]:WINDOWS-1251		\
-	sk:[sk]:WINDOWS-1250		\
-	sl:[sl]:WINDOWS-1250		\
-	sv:[sv]:WINDOWS-1252		\
-	tr:[tr]:WINDOWS-1254		\
-	uk:[uk]:WINDOWS-1251		\
-	vi:[vi]:WINDOWS-1258		\
-	zh_CN:[zh_CN]:WINDOWS-936	\
-	zh_TW:[zh_TW]:CP950
+	ca:[ca]		\
+	da:[da]		\
+	de:[de]		\
+	el:[el]		\
+	en:		\
+	en_GB:[en_GB]		\
+	eo:[eo]		\
+	es:[es]		\
+	eu:[eu]		\
+	fi:[fi]		\
+	fr:[fr]		\
+	hr:[hr]		\
+	hu:[hu]		\
+	id:[id]		\
+	is:[is]		\
+	it:[it]		\
+	ja:[ja]			\
+	ko:[ko]			\
+	lt:[lt]		\
+	lv:[lv]		\
+	mr:[mr]   		\
+	nl:[nl]		\
+	pl:[pl]		\
+	pt_BR:[pt_BR]	\
+	ro:[ro]		\
+	ru:[ru]		\
+	sk:[sk]		\
+	sl:[sl]		\
+	sv:[sv]		\
+	tr:[tr]		\
+	uk:[uk]		\
+	vi:[vi]		\
+	zh_CN:[zh_CN]	\
+	zh_TW:[zh_TW]
 
 stamp-isl: setup.isl Makefile.am
 	@										\
 	for lang in $(languages); do							\
 		code=`echo $$lang | cut -d: -f1`;					\
 		prefix=`echo $$lang | cut -d: -f2 | sed 's/[][]/\\\\\\0/g'`;		\
-		encoding=`echo $$lang | cut -d: -f3`;					\
 		isl="$(srcdir)/$$code.setup.isl";					\
 		echo "  GEN      $$isl";						\
-		sed '/^\w\+'"$$prefix"'=/{s/\(.\)'"$$prefix"'/\1/;n};/^\w.*=/d' $< |	\
-		iconv -f UTF-8 -t $$encoding > "$$isl";					\
+		echo -ne "\\xEF\\xBB\\xBF" > "$$isl";				\
+		sed '/^\w\+'"$$prefix"'=/{s/\(.\)'"$$prefix"'/\1/;n};/^\w.*=/d' $<  >> "$$isl";	\
 	done &&										\
 	echo timestamp > stamp-isl