aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-09 08:50:49 +0200
committermarha <marha@users.sourceforge.net>2012-10-09 08:50:49 +0200
commitc48e25635aaafefec0c7761d5310f7d2071fc50c (patch)
tree604f86c42565fb75b496b4748661b3f29fae95ca /fontconfig
parentde8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff)
downloadvcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.tar.gz
vcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.tar.bz2
vcxsrv-c48e25635aaafefec0c7761d5310f7d2071fc50c.zip
fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/fonts.dtd10
-rw-r--r--fontconfig/src/fcstr.c4
2 files changed, 9 insertions, 5 deletions
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd
index 782e59244..4a309a9d2 100644
--- a/fontconfig/fonts.dtd
+++ b/fontconfig/fonts.dtd
@@ -13,7 +13,7 @@
-->
<!ELEMENT dir (#PCDATA)>
<!ATTLIST dir
- prefix (#PCDATA) "default"
+ prefix CDATA "default"
xml:space (default|preserve) 'preserve'>
<!--
@@ -36,7 +36,7 @@
-->
<!ELEMENT cachedir (#PCDATA)>
<!ATTLIST cachedir
- prefix (#PCDATA) "default"
+ prefix CDATA "default"
xml:space (default|preserve) 'preserve'>
<!--
@@ -52,8 +52,8 @@
<!ELEMENT include (#PCDATA)>
<!ATTLIST include
ignore_missing (no|yes) "no"
- prefix (#PCDATA) "default"
- deprecated (#PCDATA) "no"
+ prefix CDATA "default"
+ deprecated (yes|no) "no"
xml:space (default|preserve) "preserve">
<!--
@@ -165,7 +165,7 @@
qual (any|all|first|not_first) "any"
name CDATA #REQUIRED
target (pattern|font|default) "default"
- ignore-blanks (#PCDATA) "false"
+ ignore-blanks (true|false) "false"
compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains) "eq">
<!--
diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c
index f505ea665..037960d2f 100644
--- a/fontconfig/src/fcstr.c
+++ b/fontconfig/src/fcstr.c
@@ -974,6 +974,10 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s)
FcMemAlloc (FC_MEM_STRING, size);
slash = NULL;
f = file;
+#ifdef _WIN32
+ if (*s == '/' && *(s+1) == '/') /* Network path, do not squash // */
+ *f++ = *s++;
+#endif
for (;;) {
if (*s == '/' || *s == '\0')
{