Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

4 files changed, 101 insertions, 32 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
index 6d8fa176f..99d6574f1 100644
--- a/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
+++ b/source/x/wqy-zenhei-font-ttf/fixup-fontconfig-file.diff
@@ -1,12 +1,5 @@
-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
+--- ./44-wqy-zenhei.conf.orig	2009-01-09 17:36:40.000000000 -0600
++++ ./44-wqy-zenhei.conf	2017-04-30 16:32:33.135746412 -0500
 @@ -6,7 +6,11 @@
    <match target="font">
          <test qual="any" name="family">
@@ -19,3 +12,34 @@ diff -Nur wqy-zenhei.orig/44-wqy-zenhei.conf wqy-zenhei/44-wqy-zenhei.conf
                  <string>文泉驛正黑</string>
          </test> 
          <edit name="globaladvance"><bool>false</bool></edit>
+@@ -22,24 +26,27 @@
+         <alias>
+                 <family>serif</family>
+                 <prefer>
+-                        <family>Bitstream Vera Serif</family>
++                        <family>Liberation Serif</family>
+                         <family>DejaVu Serif</family>
++                        <family>Bitstream Vera Serif</family>
+                         <family>WenQuanYi Zen Hei</family>
+                 </prefer>
+         </alias>
+         <alias>
+                 <family>sans-serif</family>
+                 <prefer>
+-                        <family>Bitstream Vera Sans</family>
++                        <family>Liberation Sans</family>
+                         <family>DejaVu Sans</family>
++                        <family>Bitstream Vera Sans</family>
+                         <family>WenQuanYi Zen Hei</family>
+                 </prefer>
+         </alias>
+         <alias>
+                 <family>monospace</family>
+                 <prefer>
+-                        <family>Bitstream Vera Sans Mono</family>
++                        <family>Liberation Sans Mono</family>
+                         <family>DejaVu Sans Mono</family>
++                        <family>Bitstream Vera Sans Mono</family>
+                         <family>WenQuanYi Zen Hei Mono</family>
+                 </prefer>
+         </alias>
diff --git a/source/x/wqy-zenhei-font-ttf/slack-desc b/source/x/wqy-zenhei-font-ttf/slack-desc
index cf1f04923..404b141ee 100644
--- a/source/x/wqy-zenhei-font-ttf/slack-desc
+++ b/source/x/wqy-zenhei-font-ttf/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
                    |-----handy-ruler------------------------------------------------------|
 wqy-zenhei-font-ttf: wqy-zenhei-font-ttf (Wen Quan Yi Zen Hei CJK Font)
 wqy-zenhei-font-ttf:
 wqy-zenhei-font-ttf: The WenQuanYi Zen Hei font is a Chinese (or CJK) outline font with
-wqy-zenhei-font-ttf: Hei Ti style (a sans-serif style) Hanzi glyphs.  This font is
+wqy-zenhei-font-ttf: Hei Ti style (a sans-serif style) Hanzi glyphs. This font is
 wqy-zenhei-font-ttf: developed for general purpose use of Chinese for formating, printing
-wqy-zenhei-font-ttf: and on-screen display.  This font is also targeted at platform
+wqy-zenhei-font-ttf: and on-screen display. This font is also targeted at platform
 wqy-zenhei-font-ttf: independence and the utility for document exchange between various
 wqy-zenhei-font-ttf: operating systems.
 wqy-zenhei-font-ttf:
-wqy-zenhei-font-ttf: wqy-zenhei-font-ttf home: http://wqy.sourceforge.net/en/
+wqy-zenhei-font-ttf: Homepage: http://wqy.sourceforge.net/en/
 wqy-zenhei-font-ttf:
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 ee34726bb..a61d6f0da 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
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright 2008, 2009  Eric Hameleers, Eindhoven, NL
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -32,17 +32,25 @@
 #
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
 
-PRGNAM=wqy-zenhei-font-ttf
+PKGNAM=wqy-zenhei-font-ttf
 SRCNAM=wqy-zenhei
 VERSION=${VERSION:-0.8.38}
 SUB=${SUB:-1}
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-5}
+
+# 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 "$PKGNAM-${VERSION}_${SUB}-$ARCH-$BUILD.txz"
+  exit 0
+fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PRGNAM
+PKG=$TMP/package-$PKGNAM
 
 SOURCE="$CWD/${SRCNAM}-${VERSION}-${SUB}.tar.bz2"
 
@@ -62,12 +70,13 @@ fi
 mkdir -p $PKG$FONTDIR
 
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
+rm -rf ${PKGNAM}-${VERSION}
 tar -xvf ${SOURCE} || exit 1
-mv ${SRCNAM} ${PRGNAM}-${VERSION} || exit 1
-cd ${PRGNAM}-${VERSION}
+mv ${SRCNAM} ${PKGNAM}-${VERSION} || exit 1
+cd ${PKGNAM}-${VERSION}
 
 zcat $CWD/fixup-fontconfig-file.diff.gz | patch -p1 || exit 1
+zcat $CWD/wqy-zenhei.fix.fontconfig.warning.diff.gz | patch -p1 || exit 1
 
 chown -R root:root .
 find . \
@@ -80,17 +89,22 @@ 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 *.ttf *.ttc $PKG$FONTDIR/
+cp -a *.ttf *.ttc $PKG$FONTDIR/
+chmod 644 $PKG$FONTDIR/*
+chown root:root $PKG$FONTDIR/*
 
-# Add the fontconfig file and symlink.
+# Add the fontconfig file and symlink. Renaming this file to 64- to
+# avoid taking priority over the font list in 60-latin.conf.
 mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cp 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/
+cp -a 44-wqy-zenhei.conf $PKG/etc/fonts/conf.avail/64-wqy-zenhei.conf
 ( cd $PKG/etc/fonts/conf.d && \
-  ln -sf ../conf.avail/44-wqy-zenhei.conf
+  ln -sf ../conf.avail/64-wqy-zenhei.conf
 )
 # Two more fontconfig files which we do not activate by default:
-cp 66-wqy-zenhei-sharp.conf 66-wqy-zenhei-sharp-no13px.conf \
+cp -a 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/*
 
 # Add a shell script that can set the Zen Hei default display styles:
 mkdir -p $PKG/usr/sbin
@@ -113,10 +127,10 @@ fi
 EOT
 
 # Add documentation:
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PKGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Add a package description:
@@ -125,5 +139,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 # Build the package:
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}_${SUB}-${ARCH}-${BUILD}.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}_${SUB}-${ARCH}-${BUILD}.txz
 
diff --git a/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff b/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff
new file mode 100644
index 000000000..25305e050
--- /dev/null
+++ b/source/x/wqy-zenhei-font-ttf/wqy-zenhei.fix.fontconfig.warning.diff
@@ -0,0 +1,31 @@
+--- ./66-wqy-zenhei-sharp-no13px.conf.orig	2009-02-16 12:45:58.000000000 -0600
++++ ./66-wqy-zenhei-sharp-no13px.conf	2018-03-07 17:22:30.603206663 -0600
+@@ -6,8 +6,6 @@
+   <match target="font">
+         <test qual="any" name="family">
+                 <string>WenQuanYi Zen Hei</string>
+-                <string>文泉驿正黑</string>
+-                <string>文泉驛正黑</string>
+         </test>
+         <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+         <test compare="less" name="pixelsize"><double>14.5</double></test>
+--- ./66-wqy-zenhei-sharp.conf.orig	2009-02-12 23:27:50.000000000 -0600
++++ ./66-wqy-zenhei-sharp.conf	2018-03-07 17:22:43.643207743 -0600
+@@ -5,8 +5,6 @@
+    <match target="font">
+         <test qual="any" name="family">
+                 <string>WenQuanYi Zen Hei</string>
+-                <string>文泉驿正黑</string>
+-                <string>文泉驛正黑</string>
+         </test>
+         <test compare="more_eq" name="pixelsize"><double>12</double></test>
+         <test compare="less_eq" name="pixelsize"><double>16</double></test>
+@@ -19,8 +17,6 @@
+   <match target="font">
+         <test qual="any" name="family">
+                 <string>WenQuanYi Zen Hei</string>
+-                <string>文泉驿正黑</string>
+-                <string>文泉驛正黑</string>
+         </test>
+         <test compare="more_eq" name="pixelsize"><double>13.5</double></test>
+         <test compare="less" name="pixelsize"><double>14.5</double></test>