fontconfig: Branch 'main' - 3 commits

[GitLab Mirror]

 .gitlab-ci/build.sh |   16 ++++++++--------
 src/fcxml.c         |   13 +++++++++++--
 2 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 22cbfff10da57dc56a497387d16478db064eb210
Merge: 86b48ec 5e8d33c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 6 07:24:29 2025 +0000

    Merge branch 'improve-errmsg-defaultconf' into 'main'
    
    Better error message when missing default config
    
    See merge request fontconfig/fontconfig!461

commit 5e8d33cd09bd202d980b61d540c947feee0ce64d
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 6 12:49:49 2025 +0900

    ci: install before test to avoid fontconfig error

diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 68a8cdf..3ca7857 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -155,14 +155,14 @@ if [ x"$buildsys" == "xautotools" ]; then
     ../autogen.sh --prefix="$PREFIX" --disable-cache-build ${buildopt[*]} 2>&1 | tee /tmp/fc-build.log
     TASK="make"
     $MAKE V=1 2>&1 | tee -a /tmp/fc-build.log
-    if [ $disable_check -eq 0 ]; then
-        TASK="make check"
-        $MAKE check V=1 2>&1 | tee -a /tmp/fc-build.log
-    fi
     if [ $enable_install -eq 1 ]; then
         TASK="make install"
         $MAKE install V=1 2>&1 | tee -a /tmp/fc-build.log
     fi
+    if [ $disable_check -eq 0 ]; then
+        TASK="make check"
+        $MAKE check V=1 2>&1 | tee -a /tmp/fc-build.log
+    fi
     if [ $distcheck -eq 1 ]; then
         TASK="make distcheck"
         $MAKE distcheck V=1 2>&1 | tee -a /tmp/fc-build.log
@@ -249,14 +249,14 @@ elif [ x"$buildsys" == "xmeson" ]; then
     meson setup --prefix="$PREFIX" -D${subprojectname}nls=enabled -D${subprojectname}cache-build=disabled -D${subprojectname}iconv=enabled ${buildopt[*]} "$BUILDDIR" 2>&1 | tee /tmp/fc-build.log
     TASK="meson compile"
     meson compile -v -C "$BUILDDIR" 2>&1 | tee -a /tmp/fc-build.log
-    if [ $disable_check -eq 0 ]; then
-        TASK="meson test"
-        meson test -v -C "$BUILDDIR" 2>&1 | tee -a /tmp/fc-build.log
-    fi
     if [ $enable_install -eq 1 ]; then
         TASK="meson install"
         meson install -C "$BUILDDIR" 2>&1 | tee -a /tmp/fc-build.log
     fi
+    if [ $disable_check -eq 0 ]; then
+        TASK="meson test"
+        meson test -v -C "$BUILDDIR" 2>&1 | tee -a /tmp/fc-build.log
+    fi
     if [ $distcheck -eq 1 ]; then
         TASK="meson dist"
         meson dist -C "$BUILDDIR" 2>&1 | tee -a /tmp/fc-build.log
commit 09505294546926f7e5dad4dbd1cba20f796b3d0b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 6 12:48:39 2025 +0900

    Better error message when missing default config
    
    Changelog: fixed

diff --git a/src/fcxml.c b/src/fcxml.c
index a84fdcd..c70d8cb 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3267,8 +3267,17 @@ _FcConfigParse (FcConfig      *config,
 
     filename = FcConfigGetFilename (config, name);
     if (!filename) {
-	FcStrBufString (&reason, (FcChar8 *)"No such file: ");
-	FcStrBufString (&reason, name ? name : (FcChar8 *)"(null)");
+	FcStrBufString (&reason, (FcChar8 *)"File not found");
+	if (name) {
+	    FcStrBufString (&reason, (FcChar8 *)": ");
+	    FcStrBufString (&reason, name);
+	} else {
+	    FcChar8 *e = (FcChar8 *)getenv ("FONTCONFIG_FILE");
+	    if (e) {
+	        FcStrBufString (&reason, (FcChar8 *)": ");
+	        FcStrBufString (&reason, e);
+	    }
+	}
 	goto bail0;
     }
     realfilename = FcConfigRealFilename (config, name);