[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcxml.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit dc56ff80408b16393d645a55788b023f1de27bc9
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sun Aug 13 16:18:35 2017 +0900

    Keep the same behavior to the return value of FcConfigParseAndLoad
    
    reverting the behavior accidentally changed by 12b750
    
    https://bugs.freedesktop.org/show_bug.cgi?id=102141

diff --git a/src/fcxml.c b/src/fcxml.c
index 3c18ced..9a061c8 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3368,7 +3368,10 @@ FcConfigParseAndLoad (FcConfig	    *config,
 
     f = FcConfigFilename (name);
     if (!f)
+    {
+	ret = FcTrue;
 	goto bail0;
+    }
     if (sysroot)
 	filename = FcStrBuildFilename (sysroot, f, NULL);
     else
@@ -3399,6 +3402,7 @@ FcConfigParseAndLoad (FcConfig	    *config,
     fd = FcOpen ((char *) filename, O_RDONLY);
     if (fd == -1) {
 	FcStrFree (filename);
+	ret = FcTrue;
 	goto bail1;
     }