diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-12-01 20:18:01 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-12-02 08:59:56 +0100 |
| commit | ca24bdf2171b8756a322c99932f890bd69bcd86c (patch) | |
| tree | c6c12f115015487c56365781e95395896227e44f /source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch | |
| parent | 153bd14cd07b76eca2248eb2224a5038969c474d (diff) | |
| download | current-ca24bdf2171b8756a322c99932f890bd69bcd86c.tar.gz current-ca24bdf2171b8756a322c99932f890bd69bcd86c.tar.xz | |
Tue Dec 1 20:18:01 UTC 202020201201201801
a/hwdata-0.342-noarch-1.txz: Upgraded.
a/pam-1.5.1-x86_64-1.txz: Upgraded.
ap/sqlite-3.34.0-x86_64-1.txz: Upgraded.
l/libarchive-3.5.0-x86_64-1.txz: Upgraded.
x/fontconfig-2.13.92-x86_64-1.txz: Upgraded.
I'm pretty sure there was a good reason to switch to 2.13.92 on the devel
release path, but I'm not sure the same can be said about 2.13.93. We'll
stick with this one for now until there's a stable release or another good
reason to bump it.
x/xorg-server-1.20.10-x86_64-1.txz: Upgraded.
x/xorg-server-xephyr-1.20.10-x86_64-1.txz: Upgraded.
x/xorg-server-xnest-1.20.10-x86_64-1.txz: Upgraded.
x/xorg-server-xvfb-1.20.10-x86_64-1.txz: Upgraded.
x/xorg-server-xwayland-1.20.10-x86_64-1.txz: Upgraded.
xap/gnuplot-5.4.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch')
| -rw-r--r-- | source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch b/source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch new file mode 100644 index 000000000..5ccaabafb --- /dev/null +++ b/source/x/fontconfig/fedora-patches/fontconfig-fix-test.patch @@ -0,0 +1,41 @@ +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 ] && [ 0 -eq 1 ]; then + dotest "MT-safe global config" + prep + curl -s -o $FONTDIR/noto.zip https://noto-website-2.storage.googleapis.com/pkgs/NotoSans-hinted.zip +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 e1ee6d0..9b2e54b 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.24.1 + |