1 files changed, 31 insertions, 19 deletions
diff --git a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
index 988ad7de5b..e92201c0f8 100644
--- a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
+++ b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ttf-arphic-uming
 
@@ -22,14 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220218 bkw: Modified by SlackBuilds.org:
+# - update for v0.2.20080216.2 and apply a Debian patch that fixes the
+#   syntax in the .conf files. This was required because (a) every app
+#   that uses fontconfig was spewing a ton of warnings on startup
+#   (whether or not it actually used these fonts), and (b) the
+#   'convert' command from ImageMagick was aborting.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ttf-arphic-uming
-VERSION=${VERSION:-0.2.20080216.1}
+VERSION=${VERSION:-0.2.20080216.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 ARCH=noarch
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -39,39 +53,37 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-mkdir -p $PRGNAM
 rm -rf $PRGNAM-$VERSION
-
-tar xvf $CWD/$PRGNAM\_${VERSION}.orig.tar.gz -C $PRGNAM
-mv $PRGNAM $PRGNAM-$VERSION
+tar xvf $CWD/fonts-arphic-uming\_${VERSION}.orig.tar.bz2
 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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+
+# 20220218 bkw: patch from debian:
+# http://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.20080216.2-11.debian.tar.xz
+patch -p1 < $CWD/30-fix-fontconfig-syntax.patch
 
 mkdir -p $PKG/usr/share/fonts/TTF
 cp -a *.ttc $PKG/usr/share/fonts/TTF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CONTRIBUTERS FONTLOG Font_Comparison_ShanHeiSun_UMing.odt Font_Comparison_ShanHeiSun_UMing.pdf INSTALL \
-  KNOWN_ISSUES NEWS README README.Bitmap license $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTERS FONTLOG Font_Comparison_ShanHeiSun_UMing.odt \
+      Font_Comparison_ShanHeiSun_UMing.pdf INSTALL \
+      KNOWN_ISSUES NEWS README README.Bitmap license \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/etc/fonts/conf.{d,avail}
-cat $CWD/25-ttf-arphic-uming-bitmaps.conf > $PKG/etc/fonts/conf.avail/25-ttf-arphic-uming-bitmaps.conf
-cat $CWD/25-ttf-arphic-uming-render.conf > $PKG/etc/fonts/conf.avail/25-ttf-arphic-uming-render.conf
-cat $CWD/35-ttf-arphic-uming-aliases.conf > $PKG/etc/fonts/conf.avail/35-ttf-arphic-uming-aliases.conf
-cat $CWD/41-ttf-arphic-uming.conf > $PKG/etc/fonts/conf.avail/41-ttf-arphic-uming.conf
-cat $CWD/64-ttf-arphic-uming.conf > $PKG/etc/fonts/conf.avail/64-ttf-arphic-uming.conf
-cat $CWD/90-ttf-arphic-uming-embolden.conf > $PKG/etc/fonts/conf.avail/90-ttf-arphic-uming-embolden.conf
-cd $PKG/etc/fonts/conf.d && ln -sf ../conf.avail/25-ttf-arphic-uming-bitmaps.conf && ln -sf ../conf.avail/25-ttf-arphic-uming-render.conf && ln -sf ../conf.avail/35-ttf-arphic-uming-aliases.conf && ln -sf ../conf.avail/41-ttf-arphic-uming.conf && ln -sf ../conf.avail/64-ttf-arphic-uming.conf && ln -sf ../conf.avail/90-ttf-arphic-uming-embolden.conf
+cp -a *.conf $PKG/etc/fonts/conf.avail
+( cd $PKG/etc/fonts/conf.d && ln -s ../conf.avail/* .)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE