summaryrefslogtreecommitdiffstats
path: root/source/x/fontconfig/fontconfig.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-11-29 20:52:56 +0000
committer Eric Hameleers <alien@slackware.com>2020-11-30 08:59:53 +0100
commitec5f74cb449f4175c028cd8bca5592d7672b2e0c (patch)
treeba84c57380a02e9ecff5e3ca72b4dfcf2f24fd8f /source/x/fontconfig/fontconfig.SlackBuild
parent6d1a4c21901f1ffa1b3ac962c0bcc5d182c58bfe (diff)
downloadcurrent-b98d41baa9cf0b9db29902d24e5f87f9857cdbfb.tar.gz
current-b98d41baa9cf0b9db29902d24e5f87f9857cdbfb.tar.xz
Sun Nov 29 20:52:56 UTC 202020201129205256
ap/vim-8.2.2069-x86_64-1.txz: Upgraded. e/emacspeak-53.0-x86_64-1.txz: Upgraded. x/fontconfig-2.13.93-x86_64-1.txz: Upgraded. xap/vim-gvim-8.2.2069-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/x/fontconfig/fontconfig.SlackBuild')
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild28
1 files changed, 11 insertions, 17 deletions
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 45382460b..4948ed023 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -26,6 +26,9 @@ PKGNAM=fontconfig
VERSION=${VERSION:-$(echo fontconfig-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
+# Set this to liberation, dejavu, or noto:
+PREFERRED_FONT=${PREFERRED_FONT:-liberation}
+
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -77,11 +80,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Prefer DejaVu fonts in 60-latin.conf:
-#zcat $CWD/fontconfig.dejavu.diff.gz | patch -p1 --verbose || exit 1
-
-# Prefer Liberation fonts in 60-latin.conf (these work better with hinting):
-zcat $CWD/fontconfig.liberation.diff.gz | patch -p1 --verbose || exit 1
+# Set preferred system font:
+if [ ! -r $CWD/fontconfig.$PREFERRED_FONT.diff.gz ]; then
+ echo "ERROR: $CWD/fontconfig.$PREFERRED_FONT.diff.gz patch not found."
+ exit 1
+else
+ echo "Using preferred font patch: $CWD/fontconfig.$PREFERRED_FONT.diff.gz"
+ zcat $CWD/fontconfig.$PREFERRED_FONT.diff.gz | patch -p1 --verbose || exit 1
+fi
# Hardcode the default font search path rather than having fontconfig figure
# it out (and possibly follow symlinks, or index ugly bitmapped fonts):
@@ -89,18 +95,6 @@ zcat $CWD/fontconfig.font.dir.list.diff.gz | patch -p1 --verbose --backup --suff
# Add some patches from the Fedora SRPM:
zcat $CWD/fedora-patches/fontconfig-sleep-less.patch.gz | patch -p1 --verbose || exit 1
-#zcat $CWD/fedora-patches/fontconfig-required-freetype-version.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-score-hint-on-match.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-fix-1744377.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-drop-lang-from-pkgkit-format.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-sysroot.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-read-latest-cache.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-mt.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-fix-test.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-fix-assertion.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-fix-dtd.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-fix-dtd-id.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/fedora-patches/fontconfig-0-timestamp-dir-on-sb.patch.gz | patch -p1 --verbose || exit 1
autoreconf -vif