summaryrefslogtreecommitdiff
path: root/source/x/fontconfig/fontconfig.font.dir.list.diff
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-12-01 20:18:01 +0000
committerEric Hameleers <alien@slackware.com>2020-12-02 08:59:56 +0100
commitca24bdf2171b8756a322c99932f890bd69bcd86c (patch)
treec6c12f115015487c56365781e95395896227e44f /source/x/fontconfig/fontconfig.font.dir.list.diff
parent153bd14cd07b76eca2248eb2224a5038969c474d (diff)
downloadcurrent-ca24bdf2171b8756a322c99932f890bd69bcd86c.tar.gz
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.font.dir.list.diff')
-rw-r--r--source/x/fontconfig/fontconfig.font.dir.list.diff32
1 files changed, 17 insertions, 15 deletions
diff --git a/source/x/fontconfig/fontconfig.font.dir.list.diff b/source/x/fontconfig/fontconfig.font.dir.list.diff
index 143d2db5..63be22f5 100644
--- a/source/x/fontconfig/fontconfig.font.dir.list.diff
+++ b/source/x/fontconfig/fontconfig.font.dir.list.diff
@@ -1,11 +1,11 @@
---- ./fonts.conf.in.orig 2020-11-29 13:41:05.824118087 -0600
-+++ ./fonts.conf.in 2020-11-29 13:44:20.417122440 -0600
-@@ -23,12 +23,27 @@
+--- ./fonts.conf.in.orig 2012-07-23 21:01:32.000000000 -0500
++++ ./fonts.conf.in 2013-02-28 22:32:44.758585955 -0600
+@@ -22,13 +22,29 @@
-->
<!-- Font directory list -->
-
-- @FC_DEFAULT_FONTS@
+- <dir>@FC_DEFAULT_FONTS@</dir>
- @FC_FONTPATH@
+ <dir>/usr/share/fonts/OTF</dir>
+ <dir>/usr/share/fonts/TTF</dir>
@@ -16,18 +16,20 @@
<dir prefix="xdg">fonts</dir>
<!-- the following element will be removed in the future -->
<dir>~/.fonts</dir>
+
+<!-- Commented out font directories:
-+ These are not indexed by default, as fontconfig then seems
-+ to prefer bitmapped fonts in some cases...
-+ <dir>/usr/share/fonts/100dpi</dir>
-+ <dir>/usr/share/fonts/75dpi</dir>
-+ The top-level font directory should also not be indexed, as that
-+ will include the directories of bitmapped fonts:
-+ <dir>@FC_DEFAULT_FONTS@</dir>
-+ The empty line below is produced by the FC_FONTPATH macro.
-+ Moving it here so it doesn't become a problem in the future:
-+ @FC_FONTPATH@
++ These are not indexed by default, as fontconfig then seems
++ to prefer bitmapped fonts in some cases...
++ <dir>/usr/share/fonts/100dpi</dir>
++ <dir>/usr/share/fonts/75dpi</dir>
++ The top-level font directory should also not be indexed, as that
++ will include the directories of bitmapped fonts:
++ <dir>@FC_DEFAULT_FONTS@</dir>
++ The empty line below is produced by the FC_FONTPATH macro.
++ Moving it here so it doesn't become a problem in the future:
++ @FC_FONTPATH@
+-->
-
++
<!--
Accept deprecated 'mono' alias, replacing it with 'monospace'
+ -->