mirror of https://git.wownero.com/dsc/mxe.git
update package fontconfig
This commit is contained in:
parent
8aa2fcedbd
commit
0dbe16246d
|
@ -1065,7 +1065,7 @@ USE_OSGPLUGIN(<plugin2>)
|
|||
</tr>
|
||||
<tr>
|
||||
<td id="fontconfig-package">fontconfig</td>
|
||||
<td id="fontconfig-version">2.9.0</td>
|
||||
<td id="fontconfig-version">2.9.91</td>
|
||||
<td id="fontconfig-website"><a href="http://fontconfig.org/">fontconfig</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
@ -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
|
||||
|
|
@ -3,9 +3,9 @@
|
|||
|
||||
PKG := fontconfig
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_CHECKSUM := 1ab2f437c2261028ae7969892277af2d8d8db489
|
||||
$(PKG)_CHECKSUM := c85281c06ffe7db1676a107584bbeb7fd290cbcc
|
||||
$(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION)
|
||||
$(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.gz
|
||||
$(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2
|
||||
$(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE)
|
||||
$(PKG)_DEPS := gcc freetype expat
|
||||
|
||||
|
|
Loading…
Reference in New Issue