Fix some wrong behavior with sysroot option.

Fix reading the outdated caches.
Apply a patch to make it MT-safe more.
This commit is contained in:
Akira TAGOH 2020-01-30 20:27:49 +09:00
parent 8c0db7dc0e
commit 9b91cf401d
3 changed files with 13 additions and 30 deletions

View File

@ -1,29 +0,0 @@
From 8bddcb113779178e5b5ed711db08d9bfbff924cc Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 5 Dec 2019 19:55:06 +0900
Subject: [PATCH] Fix a test fail when no bwrap was available
Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/201
---
test/run-test.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/test/run-test.sh b/test/run-test.sh
index e1ee6d00..9b2e54bb 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -40,9 +40,8 @@ ECHO=true
FCLIST="$LOG_COMPILER ../fc-list/fc-list$EXEEXT"
FCCACHE="$LOG_COMPILER ../fc-cache/fc-cache$EXEEXT"
-which bwrap > /dev/null 2>&1
-if [ $? -eq 0 ]; then
- BWRAP=`which bwrap`
+if [ -x "$(command -v bwrap)" ]; then
+ BWRAP="$(command -v bwrap)"
fi
FONT1=$TESTDIR/4x6.pcf
--
2.25.0

12
fontconfig-fix-test.patch Normal file
View File

@ -0,0 +1,12 @@
diff -pruN fontconfig-2.13.92.orig/test/run-test.sh fontconfig-2.13.92/test/run-test.sh
--- fontconfig-2.13.92.orig/test/run-test.sh 2020-01-30 20:19:55.148680493 +0900
+++ fontconfig-2.13.92/test/run-test.sh 2020-01-30 20:25:48.604550017 +0900
@@ -409,7 +409,7 @@ rm -rf $MYCACHEBASEDIR $MYCONFIG my-font
fi # if [ "x$EXEEXT" = "x" ]
-if [ -x $BUILDTESTDIR/test-crbug1004254 ]; then
+if [ -x $BUILDTESTDIR/test-crbug1004254 -a -x /usr/bin/curl ]; then
dotest "MT-safe global config"
prep
curl -s -o $FONTDIR/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip

View File

@ -26,7 +26,7 @@ Patch4: %{name}-drop-lang-from-pkgkit-format.patch
Patch5: %{name}-sysroot.patch
Patch6: %{name}-read-latest-cache.patch
Patch7: %{name}-mt.patch
Patch8: %{name}-fix-test-without-bwrap.patch
Patch8: %{name}-fix-test.patch
BuildRequires: expat-devel
BuildRequires: freetype-devel >= %{freetype_version}