From 2c20c6847e0caa3b62f6e5a0506790393c141932 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 12 Jun 2018 05:02:45 +0000 Subject: Tue Jun 12 05:02:45 UTC 2018 a/kernel-firmware-20180606_d114732-noarch-1.txz: Upgraded. a/kernel-generic-4.14.49-x86_64-1.txz: Upgraded. a/kernel-huge-4.14.49-x86_64-1.txz: Upgraded. a/kernel-modules-4.14.49-x86_64-1.txz: Upgraded. a/libcgroup-0.41-x86_64-4.txz: Rebuilt. Apply all post 0.41 patches from git, including one for an infinite loop bug that causes 100% CPU usage on one core. Thanks to chris.willing. a/pkgtools-15.0-noarch-17.txz: Rebuilt. installpkg: Use terse mode if TERSE=0 is set in the environment (this already works for removepkg and upgradepkg). This allows using terse mode in other tools that use the pkgtools (such as slackpkg with: TERSE=0 slackpkg). Thanks to Xsane. ap/hplip-3.18.6-x86_64-1.txz: Upgraded. d/kernel-headers-4.14.49-x86-1.txz: Upgraded. k/kernel-source-4.14.49-noarch-1.txz: Upgraded. GPIO_AMDPT n -> m (thanks to walecha) NFSD_V3_ACL n -> y (thanks to Jonathan Woithe) NFS_V3_ACL n -> y (thanks to Jonathan Woithe) NFS_V4_2 n -> y +NFSD_V2_ACL y +NFS_ACL_SUPPORT y +NFS_V4_SECURITY_LABEL y l/LibRaw-0.18.12-x86_64-1.txz: Upgraded. This update fixes bugs and security issues, including: parse_qt: possible integer overflow reject broken/crafted NOKIARAW files recover read position if TIFF/EXIF tag is too long possible infinite loop in parse_minolta() possible stack overrun in X3F parser out of bounds read in X3F parser For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-13735 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14265 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10528 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-10529 (* Security fix *) l/dconf-0.26.1-x86_64-3.txz: Rebuilt. Eliminate install script noise. l/dconf-editor-3.26.2-x86_64-3.txz: Rebuilt. Eliminate install script noise. n/iproute2-4.17.0-x86_64-1.txz: Upgraded. x/wqy-zenhei-font-ttf-0.8.38_1-noarch-7.txz: Rebuilt. Try to avoid overriding other font choices unless lang = zh-cn or zh-sg. x/xkbcomp-1.4.2-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf | 93 ++++++++++++++++++++++ .../wqy-zenhei-font-ttf.SlackBuild | 20 +++-- source/x/x11/build/xkbcomp | 2 +- 3 files changed, 106 insertions(+), 9 deletions(-) create mode 100644 source/x/wqy-zenhei-font-ttf/64-wqy-zenhei.conf (limited to 'source/x') 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 @@ + + + + + + zh-cn + + + monospace + + + WenQuanYi Zen Hei Sharp + + + + + zh-sg + + + monospace + + + WenQuanYi Zen Hei Sharp + + + + + WenQuanYi Zen Hei Sharp + + monospace + + + + + + zh-cn + + + serif + + + WenQuanYi Zen Hei Sharp + + + + + zh-sg + + + serif + + + WenQuanYi Zen Hei Sharp + + + + + WenQuanYi Zen Hei Sharp + + serif + + + + + + zh-cn + + + sans-serif + + + WenQuanYi Zen Hei Sharp + + + + + zh-sg + + + sans-serif + + + WenQuanYi Zen Hei Sharp + + + + + WenQuanYi Zen Hei Sharp + + sans-serif + + + 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 -- cgit v1.2.3