diff --git a/fontconfig-fix-test-without-bwrap.patch b/fontconfig-fix-test-without-bwrap.patch new file mode 100644 index 0000000..53c6bb1 --- /dev/null +++ b/fontconfig-fix-test-without-bwrap.patch @@ -0,0 +1,29 @@ +From 8bddcb113779178e5b5ed711db08d9bfbff924cc Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +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 + diff --git a/fontconfig.spec b/fontconfig.spec index c4435f7..d13fe7a 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -26,6 +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 BuildRequires: expat-devel BuildRequires: freetype-devel >= %{freetype_version}