mirror of
git://slackware.nl/current.git
synced 2024-12-25 09:58:55 +01:00
Thu Nov 28 04:21:57 UTC 2024
x/fontconfig-2.15.0-x86_64-2.txz: Rebuilt. Prefer Liberation for sans and serif (as usual). Thanks to Daedra. Migrate files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
This commit is contained in:
Patrick J Volkerding
Eric Hameleers
parent
6e6f0c6efb
commit
367b1180da
6 changed files with 92 additions and 28 deletions
|
|
@ -11,9 +11,22 @@
|
|||
<description>Tracking Slackware development in git.</description>
|
||||
<language>en-us</language>
|
||||
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
||||
<pubDate>Thu, 28 Nov 2024 00:18:02 GMT</pubDate>
|
||||
<lastBuildDate>Thu, 28 Nov 2024 01:04:16 GMT</lastBuildDate>
|
||||
<pubDate>Thu, 28 Nov 2024 04:21:57 GMT</pubDate>
|
||||
<lastBuildDate>Thu, 28 Nov 2024 04:58:09 GMT</lastBuildDate>
|
||||
<generator>maintain_current_git.sh v 1.17</generator>
|
||||
<item>
|
||||
<title>Thu, 28 Nov 2024 04:21:57 GMT</title>
|
||||
<pubDate>Thu, 28 Nov 2024 04:21:57 GMT</pubDate>
|
||||
<link>https://git.slackware.nl/current/tag/?h=20241128042157</link>
|
||||
<guid isPermaLink="false">20241128042157</guid>
|
||||
<description>
|
||||
<![CDATA[<pre>
|
||||
x/fontconfig-2.15.0-x86_64-2.txz: Rebuilt.
|
||||
Prefer Liberation for sans and serif (as usual). Thanks to Daedra.
|
||||
Migrate files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
|
||||
</pre>]]>
|
||||
</description>
|
||||
</item>
|
||||
<item>
|
||||
<title>Thu, 28 Nov 2024 00:18:02 GMT</title>
|
||||
<pubDate>Thu, 28 Nov 2024 00:18:02 GMT</pubDate>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
Thu Nov 28 04:21:57 UTC 2024
|
||||
x/fontconfig-2.15.0-x86_64-2.txz: Rebuilt.
|
||||
Prefer Liberation for sans and serif (as usual). Thanks to Daedra.
|
||||
Migrate files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
|
||||
+--------------------------+
|
||||
Thu Nov 28 00:18:02 UTC 2024
|
||||
a/tcsh-6.24.14-x86_64-1.txz: Upgraded.
|
||||
ap/sudo-1.9.16p2-x86_64-1.txz: Upgraded.
|
||||
|
|
|
|||
49
FILELIST.TXT
49
FILELIST.TXT
|
|
@ -1,20 +1,20 @@
|
|||
Thu Nov 28 00:44:28 UTC 2024
|
||||
Thu Nov 28 04:25:27 UTC 2024
|
||||
|
||||
Here is the file list for this directory. If you are using a
|
||||
mirror site and find missing or extra files in the disk
|
||||
subdirectories, please have the archive administrator refresh
|
||||
the mirror.
|
||||
|
||||
drwxr-xr-x 12 root root 4096 2024-11-28 00:22 .
|
||||
drwxr-xr-x 12 root root 4096 2024-11-28 04:21 .
|
||||
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
|
||||
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
|
||||
-rw-r--r-- 1 root root 1161404 2024-11-28 00:22 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 00:22 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 1160538 2024-11-28 03:39 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 03:39 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
|
||||
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
|
||||
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
|
||||
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
|
||||
-rw-r--r-- 1 root root 1253944 2024-11-28 00:18 ./ChangeLog.txt
|
||||
-rw-r--r-- 1 root root 1254196 2024-11-28 04:21 ./ChangeLog.txt
|
||||
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
|
||||
drwxr-xr-x 2 root root 4096 2024-11-22 22:03 ./EFI/BOOT
|
||||
-rw-r--r-- 1 root root 1200128 2024-09-12 20:40 ./EFI/BOOT/bootx64.efi
|
||||
|
|
@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-11-22 22:03 ./EFI/BOOT
|
|||
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
|
||||
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
|
||||
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
|
||||
-rw-r--r-- 1 root root 1524297 2024-11-28 00:22 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1522610 2024-11-28 03:38 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
|
||||
-rw-r--r-- 1 root root 914370 2024-11-28 00:21 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 914370 2024-11-28 04:24 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
|
||||
-rw-r--r-- 1 root root 2640 2024-11-22 21:41 ./README.initrd
|
||||
-rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT
|
||||
|
|
@ -662,11 +662,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
|
|||
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
|
||||
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
|
||||
drwxr-xr-x 17 root root 4096 2024-11-28 00:21 ./slackware64
|
||||
-rw-r--r-- 1 root root 356915 2024-11-28 00:21 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 00:21 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 441981 2024-11-28 00:20 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 4820789 2024-11-28 00:20 ./slackware64/MANIFEST.bz2
|
||||
drwxr-xr-x 17 root root 4096 2024-11-28 04:25 ./slackware64
|
||||
-rw-r--r-- 1 root root 356915 2024-11-28 04:25 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 04:25 ./slackware64/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 441981 2024-11-28 04:24 ./slackware64/FILE_LIST
|
||||
-rw-r--r-- 1 root root 4821840 2024-11-28 04:24 ./slackware64/MANIFEST.bz2
|
||||
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
|
||||
drwxr-xr-x 2 root root 32768 2024-11-28 00:20 ./slackware64/a
|
||||
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
|
||||
|
|
@ -4637,7 +4637,7 @@ drwxr-xr-x 2 root root 4096 2024-09-17 23:31 ./slackware64/tcl
|
|||
-rw-r--r-- 1 root root 227 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 1813700 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 195 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz.asc
|
||||
drwxr-xr-x 2 root root 65536 2024-11-28 00:20 ./slackware64/x
|
||||
drwxr-xr-x 2 root root 65536 2024-11-28 04:24 ./slackware64/x
|
||||
-rw-r--r-- 1 root root 440 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 649604 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 195 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz.asc
|
||||
|
|
@ -4824,9 +4824,9 @@ drwxr-xr-x 2 root root 65536 2024-11-28 00:20 ./slackware64/x
|
|||
-rw-r--r-- 1 root root 451 2023-02-28 18:14 ./slackware64/x/font-xfree86-type1-1.0.5-noarch-1.txt
|
||||
-rw-r--r-- 1 root root 39128 2023-02-28 18:14 ./slackware64/x/font-xfree86-type1-1.0.5-noarch-1.txz
|
||||
-rw-r--r-- 1 root root 163 2023-02-28 18:14 ./slackware64/x/font-xfree86-type1-1.0.5-noarch-1.txz.asc
|
||||
-rw-r--r-- 1 root root 385 2024-11-27 23:33 ./slackware64/x/fontconfig-2.15.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 344020 2024-11-27 23:33 ./slackware64/x/fontconfig-2.15.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 195 2024-11-27 23:33 ./slackware64/x/fontconfig-2.15.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 385 2024-11-28 04:09 ./slackware64/x/fontconfig-2.15.0-x86_64-2.txt
|
||||
-rw-r--r-- 1 root root 344244 2024-11-28 04:09 ./slackware64/x/fontconfig-2.15.0-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 04:09 ./slackware64/x/fontconfig-2.15.0-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 372 2024-10-13 18:29 ./slackware64/x/fonttosfnt-1.2.4-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 34528 2024-10-13 18:29 ./slackware64/x/fonttosfnt-1.2.4-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 195 2024-10-13 18:29 ./slackware64/x/fonttosfnt-1.2.4-x86_64-1.txz.asc
|
||||
|
|
@ -5801,11 +5801,11 @@ drwxr-xr-x 2 root root 4096 2024-11-10 20:41 ./slackware64/y
|
|||
-rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz
|
||||
-rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc
|
||||
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
|
||||
drwxr-xr-x 18 root root 4096 2024-11-28 00:44 ./source
|
||||
-rw-r--r-- 1 root root 625717 2024-11-28 00:44 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 00:44 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 876223 2024-11-28 00:44 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 30635496 2024-11-28 00:44 ./source/MANIFEST.bz2
|
||||
drwxr-xr-x 18 root root 4096 2024-11-28 04:25 ./source
|
||||
-rw-r--r-- 1 root root 625793 2024-11-28 04:25 ./source/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 195 2024-11-28 04:25 ./source/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 876316 2024-11-28 04:25 ./source/FILE_LIST
|
||||
-rw-r--r-- 1 root root 30667485 2024-11-28 04:25 ./source/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
|
||||
drwxr-xr-x 125 root root 4096 2024-11-26 19:11 ./source/a
|
||||
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
|
||||
|
|
@ -13934,13 +13934,14 @@ drwxr-xr-x 2 root root 4096 2024-10-09 17:26 ./source/x/fcitx5-unikey
|
|||
-rwxr-xr-x 1 root root 3568 2024-10-09 17:15 ./source/x/fcitx5/fcitx5.SlackBuild
|
||||
-rw-r--r-- 1 root root 45 2022-05-15 14:21 ./source/x/fcitx5/fcitx5.url
|
||||
-rw-r--r-- 1 root root 1002 2024-06-10 00:45 ./source/x/fcitx5/slack-desc
|
||||
drwxr-xr-x 3 root root 4096 2024-11-27 22:22 ./source/x/fontconfig
|
||||
-rw-r--r-- 1 root root 139 2013-02-28 21:07 ./source/x/fontconfig/doinst.sh.gz
|
||||
drwxr-xr-x 3 root root 4096 2024-11-28 04:06 ./source/x/fontconfig
|
||||
-rw-r--r-- 1 root root 498 2024-11-28 03:24 ./source/x/fontconfig/doinst.sh.gz
|
||||
-rw-r--r-- 1 root root 1447820 2024-11-27 19:55 ./source/x/fontconfig/fontconfig-2.15.0.tar.xz
|
||||
-rw-r--r-- 1 root root 2979 2024-11-27 22:25 ./source/x/fontconfig/fontconfig.70.no.bitmaps.conf.diff
|
||||
-rwxr-xr-x 1 root root 5697 2024-11-27 22:26 ./source/x/fontconfig/fontconfig.SlackBuild
|
||||
-rwxr-xr-x 1 root root 5833 2024-11-28 04:05 ./source/x/fontconfig/fontconfig.SlackBuild
|
||||
-rw-r--r-- 1 root root 1245 2024-11-22 22:09 ./source/x/fontconfig/fontconfig.font.dir.list.diff
|
||||
-rw-r--r-- 1 root root 2140 2024-11-27 22:25 ./source/x/fontconfig/fontconfig.hack.for.monospace.diff
|
||||
-rw-r--r-- 1 root root 765 2024-11-28 04:08 ./source/x/fontconfig/fontconfig.liberation.diff
|
||||
-rw-r--r-- 1 root root 57 2024-11-22 23:30 ./source/x/fontconfig/fontconfig.url
|
||||
drwxr-xr-x 2 root root 4096 2024-11-27 22:05 ./source/x/fontconfig/patches
|
||||
-rw-r--r-- 1 root root 1953 2024-03-08 12:20 ./source/x/fontconfig/patches/02_indic_names.patch
|
||||
|
|
|
|||
|
|
@ -4,3 +4,19 @@ if [ -x /usr/bin/fc-cache ]; then
|
|||
fi
|
||||
# else we'll catch it later with setup.fontconfig :-)
|
||||
|
||||
# With fontconfig-2.15.0 we use the default of /usr/share/fontconfig/conf.avail
|
||||
# so if we find any of "our" files in the old location, it's possible that they
|
||||
# rode the old symlink there prior to this package being installed. Let's make
|
||||
# sure that they get home OK.
|
||||
if [ -d etc/fonts/conf.avail ]; then
|
||||
grep usr/share/fontconfig/conf.avail/ var/lib/pkgtools/packages/* | cut -f 2 -d : | sort | uniq | grep -v "/$" | while read conf ; do
|
||||
etcconf="etc/fonts/$(echo $conf | cut -f 4- -d /)"
|
||||
if [ ! -r $conf -a -r $etcconf ]; then
|
||||
mv $etcconf $conf
|
||||
else
|
||||
rm -f $etcconf
|
||||
fi
|
||||
done
|
||||
fi
|
||||
# If we can, get rid of this. Could be held by third-party packages though.
|
||||
rmdir etc/fonts/conf.avail 2> /dev/null
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
|||
|
||||
PKGNAM=fontconfig
|
||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -97,6 +97,9 @@ cat $CWD/fontconfig.hack.for.monospace.diff | patch -p1 --verbose || exit 1
|
|||
# enabling them.
|
||||
cat $CWD/fontconfig.70.no.bitmaps.conf.diff | patch -p1 --verbose || exit 1
|
||||
|
||||
# Prefer Liberation for sans and serif, as we have for many years:
|
||||
cat $CWD/fontconfig.liberation.diff | patch -p1 --verbose || exit 1
|
||||
|
||||
export CFLAGS="$SLKCFLAGS"
|
||||
export CXXFLAGS="$SLKCFLAGS"
|
||||
mkdir meson-build
|
||||
|
|
|
|||
26
source/x/fontconfig/fontconfig.liberation.diff
Normal file
26
source/x/fontconfig/fontconfig.liberation.diff
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
--- ./conf.d/60-latin.conf.orig 2024-11-27 21:58:06.170032507 -0600
|
||||
+++ ./conf.d/60-latin.conf 2024-11-27 22:03:54.204040292 -0600
|
||||
@@ -5,6 +5,7 @@
|
||||
<alias>
|
||||
<family>serif</family>
|
||||
<prefer>
|
||||
+ <family>Liberation Serif</family>
|
||||
<family>Noto Serif</family>
|
||||
<family>DejaVu Serif</family>
|
||||
<family>Times New Roman</family>
|
||||
@@ -18,6 +19,7 @@
|
||||
<alias>
|
||||
<family>sans-serif</family>
|
||||
<prefer>
|
||||
+ <family>Liberation Sans</family>
|
||||
<family>Noto Sans</family>
|
||||
<family>DejaVu Sans</family>
|
||||
<family>Verdana</family>
|
||||
@@ -36,6 +38,7 @@
|
||||
<family>monospace</family>
|
||||
<prefer>
|
||||
<family>Hack</family>
|
||||
+ <family>Liberation Mono</family>
|
||||
<family>DejaVu Sans Mono</family>
|
||||
<family>Noto Mono</family>
|
||||
<family>Noto Sans Mono</family>
|
||||
Loading…
Reference in a new issue