aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/wqy-microhei-font-ttf/65-wqy-microhei.conf4
-rw-r--r--system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild15
2 files changed, 12 insertions, 7 deletions
diff --git a/system/wqy-microhei-font-ttf/65-wqy-microhei.conf b/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
index 37e15f1b908f..cbd97fff8bde 100644
--- a/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
+++ b/system/wqy-microhei-font-ttf/65-wqy-microhei.conf
@@ -6,7 +6,11 @@
<match target="font">
<test qual="any" name="family">
<string>WenQuanYi Micro 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/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
index df44fa09ee7d..cb6d8b8d4cae 100644
--- a/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
+++ b/system/wqy-microhei-font-ttf/wqy-microhei-font-ttf.SlackBuild
@@ -27,11 +27,15 @@
# SUCH DAMAGE.
# -----------------------------------------------------------------------------
+# 20220218 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - stop all fontconfig-using apps from spewing warnings about bad
+# syntax in 65-wqy-microhei.conf.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=wqy-microhei-font-ttf
VERSION=${VERSION:-0.2.0_beta}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,9 +44,6 @@ ARCH=noarch
SRCNAM=wqy-microhei
SRCVERSION=$(echo $VERSION | tr _ -)
-# 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
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -64,16 +65,16 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
+ -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
mkdir -p $PKG/usr/share/fonts/TTF
cp -a *.ttc $PKG/usr/share/fonts/TTF
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS.txt ChangeLog.txt INSTALL.txt LICENSE_Apache2.txt LICENSE_GPLv3.txt README.txt \
+ AUTHORS.txt ChangeLog.txt LICENSE_Apache2.txt LICENSE_GPLv3.txt README.txt \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild