diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2013-11-04 17:08:47 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:57:36 +0200 |
| commit | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch) | |
| tree | 9b98e6e193c7870cb27ac861394c1c4592850922 /source/x/wqy-zenhei-font-ttf | |
| parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
| download | current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.xz | |
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!
It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system. Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'source/x/wqy-zenhei-font-ttf')
| -rw-r--r-- | source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff | 21 | ||||
| -rwxr-xr-x | source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild | 8 |
2 files changed, 28 insertions, 1 deletions
diff --git a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff new file mode 100644 index 000000000..6d8fa176f --- /dev/null +++ b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff @@ -0,0 +1,21 @@ +Since this fontconfig change [1], we get warnings in 44-wqy-zenhei.conf +like this: "Having multiple values in <test> isn't supported and may +not work as expected" - let's fix that... + +[1] http://cgit.freedesktop.org/fontconfig/commit/?id=2837c63876b9b + +diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf +--- wqy-zenhei.orig/44-wqy-zenhei.conf 2009-05-17 15:25:41.000000000 -0500 ++++ wqy-zenhei/44-wqy-zenhei.conf 2013-02-25 19:00:36.870491434 -0600 +@@ -6,7 +6,11 @@ + <match target="font"> + <test qual="any" name="family"> + <string>WenQuanYi Zen Hei</string> ++ </test> ++ <test qual="any" name="family"> + <string>文泉驿正黑</string> ++ </test> ++ <test qual="any" name="family"> + <string>文泉驛正黑</string> + </test> + <edit name="globaladvance"><bool>false</bool></edit> diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild index b9fb149da..ee34726bb 100755 --- a/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild +++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild @@ -38,7 +38,7 @@ SRCNAM=wqy-zenhei VERSION=${VERSION:-0.8.38} SUB=${SUB:-1} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -66,6 +66,9 @@ rm -rf ${PRGNAM}-${VERSION} tar -xvf ${SOURCE} || exit 1 mv ${SRCNAM} ${PRGNAM}-${VERSION} || exit 1 cd ${PRGNAM}-${VERSION} + +zcat $CWD/fixup-fontconfig-file.diff.gz | patch -p1 || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -73,6 +76,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# The following causes an error since the package no longer contains any ttf +# fonts, but it is harmless. It's probably safer to leave the cp command the +# way it is in case future versions include any ttf fonts. # Install font: cp *.ttf *.ttc $PKG$FONTDIR/ |