summaryrefslogtreecommitdiffstats
path: root/source/x/fontconfig/fontconfig.SlackBuild
diff options
context:
space:
mode:
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
commitca24bdf2171b8756a322c99932f890bd69bcd86c (patch)
treec6c12f115015487c56365781e95395896227e44f /source/x/fontconfig/fontconfig.SlackBuild
parent153bd14cd07b76eca2248eb2224a5038969c474d (diff)
downloadcurrent-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/fontconfig.SlackBuild')
-rwxr-xr-xsource/x/fontconfig/fontconfig.SlackBuild28
1 files changed, 17 insertions, 11 deletions
diff --git a/source/x/fontconfig/fontconfig.SlackBuild b/source/x/fontconfig/fontconfig.SlackBuild
index 4948ed023..45382460b 100755
--- a/source/x/fontconfig/fontconfig.SlackBuild
+++ b/source/x/fontconfig/fontconfig.SlackBuild
@@ -26,9 +26,6 @@ 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
@@ -80,14 +77,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# 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
+# 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
# Hardcode the default font search path rather than having fontconfig figure
# it out (and possibly follow symlinks, or index ugly bitmapped fonts):
@@ -95,6 +89,18 @@ 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