summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
Diffstat (limited to 'source/x')
-rw-r--r--source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf93
-rwxr-xr-xsource/x/wqy-zenhei-font-ttf/wqy-zenhei-font-ttf.SlackBuild20
-rw-r--r--source/x/x11/build/xkbcomp2
3 files changed, 106 insertions, 9 deletions
diff --git a/source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf b/source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf
new file mode 100644
index 00000000..02b78527
--- /dev/null
+++ b/source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <match>
+ <test name="lang">
+ <string>zh-cn</string>
+ </test>
+ <test name="family">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <string>zh-sg</string>
+ </test>
+ <test name="family">
+ <string>monospace</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+
+ <alias>
+ <family>WenQuanYi Zen Hei Sharp</family>
+ <default>
+ <family>monospace</family>
+ </default>
+ </alias>
+
+ <match>
+ <test name="lang">
+ <string>zh-cn</string>
+ </test>
+ <test name="family">
+ <string>serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <string>zh-sg</string>
+ </test>
+ <test name="family">
+ <string>serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+
+ <alias>
+ <family>WenQuanYi Zen Hei Sharp</family>
+ <default>
+ <family>serif</family>
+ </default>
+ </alias>
+
+ <match>
+ <test name="lang">
+ <string>zh-cn</string>
+ </test>
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+ <match>
+ <test name="lang">
+ <string>zh-sg</string>
+ </test>
+ <test name="family">
+ <string>sans-serif</string>
+ </test>
+ <edit name="family" mode="prepend">
+ <string>WenQuanYi Zen Hei Sharp</string>
+ </edit>
+ </match>
+
+ <alias>
+ <family>WenQuanYi Zen Hei Sharp</family>
+ <default>
+ <family>sans-serif</family>
+ </default>
+ </alias>
+</fontconfig>
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 9f075e57..4a03f866 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
@@ -39,7 +39,7 @@ SRCNAM=wqy-zenhei
VERSION=${VERSION:-0.8.38}
SUB=${SUB:-1}
ARCH=noarch
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
@@ -52,7 +52,7 @@ fi
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
-SOURCE="$CWD/${SRCNAM}-${VERSION}-${SUB}.tar.bz2"
+SOURCE="$CWD/${SRCNAM}-${VERSION}-${SUB}.tar.lz"
rm -rf $PKG
mkdir -p $TMP $PKG
@@ -89,22 +89,26 @@ find . \
# 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 -a *.ttf *.ttc $PKG$FONTDIR/
+cp -a *.ttf *.ttc $PKG$FONTDIR/ 2> /dev/null
chmod 644 $PKG$FONTDIR/*
chown root:root $PKG$FONTDIR/*
-# Add the fontconfig file and symlink. Renaming this file to 64- to
-# avoid taking priority over the font list in 60-latin.conf.
+# Add the fontconfig file and symlink.
mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cp -a 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/64-wqy-zenhei.conf
+zcat $CWD/64-wqy-zenhei.conf.gz > $PKG/etc/fonts/conf.avail/64-wqy-zenhei.conf
( cd $PKG/etc/fonts/conf.d && \
ln -sf ../conf.avail/64-wqy-zenhei.conf
)
-# Two more fontconfig files which we do not activate by default:
-cp -a 66-wqy-zenhei-sharp.conf 66-wqy-zenhei-sharp-no13px.conf \
+
+# We install the upstream fontconfig files, but do not activate them with
+# symlinks.
+cp -a \
+ 44-wqy-zenhei.conf 66-wqy-zenhei-sharp.conf 66-wqy-zenhei-sharp-no13px.conf \
$PKG/etc/fonts/conf.avail/
chmod 644 $PKG/etc/fonts/conf.avail/*
chown root:root $PKG/etc/fonts/conf.avail/*
+# Rename this one to avoid confusion:
+mv $PKG/etc/fonts/conf.avail/44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/44-wqy-zenhei-upstream-orig.conf
# Add a shell script that can set the Zen Hei default display styles:
mkdir -p $PKG/usr/sbin
diff --git a/source/x/x11/build/xkbcomp b/source/x/x11/build/xkbcomp
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xkbcomp
+++ b/source/x/x11/build/xkbcomp
@@ -1 +1 @@
-2
+1