From e1c3843fb0b20adff899ce9dd0888ef604c59b9f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Mon, 10 Mar 2014 20:40:49 +0100 Subject: [PATCH] Contribs: patch iconv for WinRT --- contrib/src/iconv/libiconv-winrt.patch | 11 +++++++++++ contrib/src/iconv/rules.mak | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 contrib/src/iconv/libiconv-winrt.patch diff --git a/contrib/src/iconv/libiconv-winrt.patch b/contrib/src/iconv/libiconv-winrt.patch new file mode 100644 index 000000000000..c40495d6d20c --- /dev/null +++ b/contrib/src/iconv/libiconv-winrt.patch @@ -0,0 +1,11 @@ +--- iconv/libcharset/lib/localcharset.c 2014-03-10 20:39:14.105914067 +0100 ++++ iconv/libcharset/lib/localcharset.c.new 2014-03-10 20:38:25.601822680 +0100 +@@ -465,7 +465,7 @@ + GetConsoleOutputCP() encoding if it is using a TrueType font. + But in GUI programs and for output sent to files and pipes, GetACP() + encoding is the best bet. */ +- sprintf (buf, "CP%u", GetACP ()); ++ sprintf (buf, "CP%u", 65001); + codeset = buf; + + #elif defined OS2 diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index 4b133f1ecbc6..e4e4d87738a0 100644 --- a/contrib/src/iconv/rules.mak +++ b/contrib/src/iconv/rules.mak @@ -30,6 +30,9 @@ ifdef HAVE_ANDROID endif ifdef HAVE_IOS $(APPLY) $(SRC)/iconv/libiconv-android-ios.patch +endif +ifdef HAVE_WINRT + $(APPLY) $(SRC)/iconv/libiconv-winrt.patch endif $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux