[Fontconfig] fontconfig: Branch 'master' - 5 commits

[GitLab Mirror]

 .gitlab-ci.yml           |    2 ++
 doc/fontconfig-user.sgml |    2 +-
 fonts.dtd                |    8 ++++++--
 src/fcxml.c              |    2 +-
 test/test-bz106632.c     |    4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 8badaae15b1225bbf200c46533b1761002c760de
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 4 08:30:33 2018 +0000

    CI: Add more logs

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1c5918..20ce601 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,8 @@ shared-build:
       - build-*/fontconfig*/_build/sub/test/*.log
       - build-*/fontconfig*/_build/sub/test/*.trs
       - build-*/*.log
+      - build-*/test/*.log
+      - build-*/test/*.trs
       - prefix-*
 static-build:
   stage: build
commit 5771c48863299c10a253cd4d885f41cae17377fb
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 4 08:20:45 2018 +0000

    Fix test case

diff --git a/test/test-bz106632.c b/test/test-bz106632.c
index 2d67c2e..c2edd72 100644
--- a/test/test-bz106632.c
+++ b/test/test-bz106632.c
@@ -215,7 +215,7 @@ main (void)
 	goto bail;
     }
     fprintf (stderr, "D: Removing %s\n", fontdir);
-    snprintf (cmd, 512, "rm -f %s%s*", fontdir, FC_DIR_SEPARATOR_S);
+    snprintf (cmd, 512, "rm -f %s%s*; sleep 1", fontdir, FC_DIR_SEPARATOR_S);
     system (cmd);
     fprintf (stderr, "D: Reinitializing\n");
     if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
@@ -254,7 +254,7 @@ main (void)
 	goto bail;
     }
     fprintf (stderr, "D: Copying %s to %s\n", FONTFILE, fontdir);
-    snprintf (cmd, 512, "cp -a %s %s", FONTFILE, fontdir);
+    snprintf (cmd, 512, "cp -a %s %s; sleep 1", FONTFILE, fontdir);
     system (cmd);
     fprintf (stderr, "D: Reinitializing\n");
     if (!FcConfigUptoDate (config) || !FcInitReinitialize ())
commit e4788c5a96e0f384ad5702ad8096b0e144613895
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 4 08:03:20 2018 +0000

    add missing the case of prefix="default" as documented

diff --git a/src/fcxml.c b/src/fcxml.c
index 9d75249..81f0cbc 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2085,7 +2085,7 @@ FcParseDir (FcConfigParse *parse)
 	    if (!prefix)
 		goto bail;
 	}
-	else if (FcStrCmp (attr, (const FcChar8 *)"cwd") == 0)
+	else if (FcStrCmp (attr, (const FcChar8 *)"default") == 0 || FcStrCmp (attr, (const FcChar8 *)"cwd") == 0)
 	{
 	}
 	else if (FcStrCmp (attr, (const FcChar8 *)"relative") == 0)
commit 942db25fbcee66cb8dded5cb06407cf556dc4eff
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 4 08:02:48 2018 +0000

    Update docs for 1aa8b700

diff --git a/doc/fontconfig-user.sgml b/doc/fontconfig-user.sgml
index 89df86e..458435f 100644
--- a/doc/fontconfig-user.sgml
+++ b/doc/fontconfig-user.sgml
@@ -312,7 +312,7 @@ This is the top level element for a font configuration and can contain
   </para></refsect2>
   <refsect2><title><literal><dir prefix="default"></literal></title><para>
 This element contains a directory name which will be scanned for font files
-to include in the set of available fonts. If 'prefix' is set to "xdg", the value in the XDG_DATA_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details.
+to include in the set of available fonts. If 'prefix' is set to "default" or "cwd", the current working directory will be added as the path prefix prior to the value. If 'prefix' is set to "xdg", the value in the XDG_DATA_HOME environment variable will be added as the path prefix. please see XDG Base Directory Specification for more details. If 'prefix' is set to "relative", the path of current file will be added prior to the value.
   </para></refsect2>
   <refsect2><title><literal><cachedir prefix="default"></literal></title><para>
 This element contains a directory name that is supposed to be stored or read
commit 67b4090321c0ec3cf3dc96f6d3cd7b9d03af0f25
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 4 08:02:18 2018 +0000

    Update fonts.dtd for last commit

diff --git a/fonts.dtd b/fonts.dtd
index 479f2c0..fb577ad 100644
--- a/fonts.dtd
+++ b/fonts.dtd
@@ -13,14 +13,18 @@
 -->
 <!ELEMENT dir (#PCDATA)>
 <!ATTLIST dir
-	  prefix    CDATA       "default"
-	  xml:space (default|preserve) 'preserve'>
+	  prefix    (default|xdg|relative|cwd)    "default"
+	  xml:space (default|preserve)            'preserve'>
 
 <!--
     Define the per-user file that holds cache font information.
 
     If the filename begins with '~', it is replaced with the users
     home directory path.
+
+    If 'prefix' is 'default' or 'cwd', then the current working directory will be added prior to the value.
+    If 'prefix' is 'xdg', then the value in the $XDG_DATA_HOME will be added prior to the value.
+    If 'prefix' is 'relative', then the path of curent file will be added prior to the value.
 -->
 <!ELEMENT cache (#PCDATA)>
 <!ATTLIST cache xml:space (default|preserve) 'preserve'>