summaryrefslogtreecommitdiffstats
path: root/src/fontconfig-1-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/fontconfig-1-fixes.patch')
-rw-r--r--src/fontconfig-1-fixes.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/src/fontconfig-1-fixes.patch b/src/fontconfig-1-fixes.patch
new file mode 100644
index 0000000..dc672d6
--- /dev/null
+++ b/src/fontconfig-1-fixes.patch
@@ -0,0 +1,62 @@
+This file is part of MXE.
+See index.html for further information.
+
+From a92a1d2fb38398601fedf1a29d4c9d9afde5cbf2 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Mon, 11 Jun 2012 12:38:33 +0200
+Subject: [PATCH] fix building for WIN32
+
+8c255fb185d5651b57380b0a9443001e8051b29d moved some code out of switch
+but did not declare 'buffer'. Also, replacing the "break" with
+"goto bail" neglected the WIN32 specific code.
+
+taken from
+http://lists.freedesktop.org/archives/fontconfig/2012-June/004113.html
+---
+ src/fcxml.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/fcxml.c b/src/fcxml.c
+index 5201b3c..be1a555 100644
+--- a/src/fcxml.c
++++ b/src/fcxml.c
+@@ -1850,6 +1850,9 @@ FcParseDir (FcConfigParse *parse)
+ {
+ const FcChar8 *attr, *data;
+ FcChar8 *prefix = NULL;
++#ifdef _WIN32
++ FcChar8 buffer[1000];
++#endif
+
+ attr = FcConfigGetAttribute (parse, "prefix");
+ if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
+@@ -1886,7 +1889,7 @@ FcParseDir (FcConfigParse *parse)
+ if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
+ {
+ FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
+- break;
++ goto bail;
+ }
+ /*
+ * Must use the multi-byte aware function to search
+@@ -1905,7 +1908,7 @@ FcParseDir (FcConfigParse *parse)
+ if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
+ {
+ FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
+- break;
++ goto bail;
+ }
+ p = _mbsrchr (data, '\\');
+ if (p) *p = '\0';
+@@ -1919,7 +1922,7 @@ FcParseDir (FcConfigParse *parse)
+ if (rc == 0 || rc > sizeof (buffer) - 20)
+ {
+ FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed");
+- break;
++ goto bail;
+ }
+ if (data [strlen (data) - 1] != '\\')
+ strcat (data, "\\");
+--
+1.7.10.3
+