Browse Source

contribs: gpg-error: Fix winrt build

pull/46/head
Hugo Beauzée-Luyssen 10 years ago
parent
commit
ad234ac0c5
  1. 3
      contrib/src/gpg-error/rules.mak
  2. 29
      contrib/src/gpg-error/winrt.patch

3
contrib/src/gpg-error/rules.mak

@ -11,6 +11,9 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
$(UNPACK) $(UNPACK)
ifdef HAVE_WIN32 ifdef HAVE_WIN32
$(APPLY) $(SRC)/gpg-error/windres-make.patch $(APPLY) $(SRC)/gpg-error/windres-make.patch
ifdef HAVE_WINRT
$(APPLY) $(SRC)/gpg-error/winrt.patch
endif
endif endif
$(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch $(APPLY) $(SRC)/gpg-error/missing-unistd-include.patch
$(APPLY) $(SRC)/gpg-error/no-executable.patch $(APPLY) $(SRC)/gpg-error/no-executable.patch

29
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. */
Loading…
Cancel
Save