[vlc-commits] contrib: iconv can use GetACP() that is simulated on WinRT builds

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Mon Sep 14 14:40:42 2015 +0200| [bd72d72cbed412fada4fd9524ddc54fd8b27697e] | committer: Jean-Baptiste Kempf

contrib: iconv can use GetACP() that is simulated on WinRT builds

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd72d72cbed412fada4fd9524ddc54fd8b27697e
---

 contrib/src/iconv/libiconv-winrt.patch |   11 -----------
 contrib/src/iconv/rules.mak            |    3 ---
 2 files changed, 14 deletions(-)

diff --git a/contrib/src/iconv/libiconv-winrt.patch b/contrib/src/iconv/libiconv-winrt.patch
deleted file mode 100644
index c40495d..0000000
--- a/contrib/src/iconv/libiconv-winrt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 3596463..176619f 100644
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -27,9 +27,6 @@ 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
 	$(MOVE)