vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon May 9 17:36:42 2016 +0200| [ad234ac0c5d6fd0c05ad4a837605883120821fcd] | committer: Hugo Beauzée-Luyssen
contribs: gpg-error: Fix winrt build > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad234ac0c5d6fd0c05ad4a837605883120821fcd --- contrib/src/gpg-error/rules.mak | 3 +++ contrib/src/gpg-error/winrt.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak index 7ee67b6..c765d7e 100644 --- a/contrib/src/gpg-error/rules.mak +++ b/contrib/src/gpg-error/rules.mak @@ -11,6 +11,9 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error $(UNPACK) ifdef HAVE_WIN32 $(APPLY) $(SRC)/gpg-error/windres-make.patch +ifdef HAVE_WINRT + $(APPLY) $(SRC)/gpg-error/winrt.patch +endif endif $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch $(APPLY) $(SRC)/gpg-error/no-executable.patch diff --git a/contrib/src/gpg-error/winrt.patch b/contrib/src/gpg-error/winrt.patch new file mode 100644 index 0000000..4c11c71 --- /dev/null +++ b/contrib/src/gpg-error/winrt.patch @@ -0,0 +1,29 @@ +--- libgpg-error/src/w32-gettext.c.orig 2016-05-09 17:30:18.306788566 +0200 ++++ libgpg-error/src/w32-gettext.c 2016-05-09 17:32:19.830771580 +0200 +@@ -53,7 +53,7 @@ + #include "init.h" + #include "gpg-error.h" + +-#ifdef HAVE_W32CE_SYSTEM ++#if defined(HAVE_W32CE_SYSTEM) || WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) + /* Forward declaration. */ + static wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen); + +@@ -644,6 +644,7 @@ + static const char * + my_nl_locale_name (const char *categoryname) + { ++#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) + #ifndef HAVE_W32CE_SYSTEM + const char *retval; + #endif +@@ -1053,6 +1054,9 @@ + case LANG_ZULU: return "zu_ZA"; + default: return "C"; + } ++#else ++ return "C"; ++#endif + } + + /* localname.c from gettext END. */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
