From 304d48977653031a742c52c9273282358add4d15 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 18 Feb 2022 16:58:12 -0500 Subject: [PATCH] system/ttf-arphic-uming: Updated for version 0.2.20080216.2. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- .../25-ttf-arphic-uming-bitmaps.conf | 33 --- .../25-ttf-arphic-uming-render.conf | 12 - .../30-fix-fontconfig-syntax.patch | 218 ++++++++++++++++++ .../35-ttf-arphic-uming-aliases.conf | 13 -- .../ttf-arphic-uming/41-ttf-arphic-uming.conf | 41 ---- .../ttf-arphic-uming/64-ttf-arphic-uming.conf | 25 -- .../90-ttf-arphic-uming-embolden.conf | 21 -- system/ttf-arphic-uming/README | 28 +-- .../ttf-arphic-uming.SlackBuild | 40 ++-- system/ttf-arphic-uming/ttf-arphic-uming.info | 6 +- 10 files changed, 257 insertions(+), 180 deletions(-) delete mode 100644 system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf delete mode 100644 system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf create mode 100644 system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch delete mode 100644 system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf delete mode 100644 system/ttf-arphic-uming/41-ttf-arphic-uming.conf delete mode 100644 system/ttf-arphic-uming/64-ttf-arphic-uming.conf delete mode 100644 system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf diff --git a/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf b/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf deleted file mode 100644 index ad7a8c7525..0000000000 --- a/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - AR PL UMing CN - - - false - true - false - - - - - AR PL UMing CN - - - 17 - true - true - - - diff --git a/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf b/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf deleted file mode 100644 index f962c44551..0000000000 --- a/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - AR PL UMing - - false - 90 - false - - diff --git a/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch b/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch new file mode 100644 index 0000000000..10d16cb3d4 --- /dev/null +++ b/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch @@ -0,0 +1,218 @@ +From: Iain Lane +Date: Wed, 30 Oct 2013 22:17:18 +0100 +Subject: Use correct fontconfig syntax for disjunction and don't include + multiple elements in test/alias + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687043 +--- + 25-arphic-uming-bitmaps.conf | 44 ++++++++++++++++++++++++++++++++++++++++++-- + 41-arphic-uming.conf | 32 +++++++++++++++++++++++++++++++- + 64-arphic-uming.conf | 44 ++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 117 insertions(+), 3 deletions(-) + +diff --git a/25-arphic-uming-bitmaps.conf b/25-arphic-uming-bitmaps.conf +index c4e1da4..93d96c2 100644 +--- a/25-arphic-uming-bitmaps.conf ++++ b/25-arphic-uming-bitmaps.conf +@@ -5,25 +5,65 @@ + + + AR PL UMing CN ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing HK ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing TW ++ ++ false ++ true ++ false ++ ++ ++ + AR PL UMing TW MBE + + false + true + false + +- + + + AR PL UMing CN ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing HK ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing TW ++ ++ 17 ++ true ++ true ++ ++ ++ + AR PL UMing TW MBE + + 17 + true + true + +- + +diff --git a/41-arphic-uming.conf b/41-arphic-uming.conf +index 7e2f12b..4f91a4d 100644 +--- a/41-arphic-uming.conf ++++ b/41-arphic-uming.conf +@@ -7,22 +7,52 @@ + --> + + AR PL ShanHeiSun Uni ++ serif ++ ++ + AR PL ShanHeiSun Uni MBE ++ serif ++ ++ + AR PL UMing CN ++ serif ++ ++ + AR PL UMing HK ++ serif ++ ++ + AR PL UMing TW ++ serif ++ ++ + AR PL UMing TW MBE + serif + + +- ++ + AR PL ShanHeiSun Uni ++ monospace ++ ++ + AR PL ShanHeiSun Uni MBE ++ monospace ++ ++ + AR PL UMing CN ++ monospace ++ ++ + AR PL UMing HK ++ monospace ++ ++ + AR PL UMing TW ++ monospace ++ ++ + AR PL UMing TW MBE + monospace + +diff --git a/64-arphic-uming.conf b/64-arphic-uming.conf +index dd3ec7e..b20b2ad 100644 +--- a/64-arphic-uming.conf ++++ b/64-arphic-uming.conf +@@ -4,6 +4,17 @@ + + + zh-cn ++ ++ ++ serif ++ ++ ++ AR PL UMing CN ++ ++ ++ ++ ++ + zh-sg + + +@@ -17,6 +28,17 @@ + + + zh-cn ++ ++ ++ AR PL UMing CN ++ ++ ++ DejaVu Serif ++ ++ ++ ++ ++ + zh-sg + + +@@ -30,6 +52,17 @@ + + + zh-hk ++ ++ ++ serif ++ ++ ++ AR PL UMing HK ++ ++ ++ ++ ++ + zh-mo + + +@@ -43,6 +76,17 @@ + + + zh-hk ++ ++ ++ AR PL UMing HK ++ ++ ++ DejaVu Serif ++ ++ ++ ++ ++ + zh-mo + + diff --git a/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf b/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf deleted file mode 100644 index 2d803f708c..0000000000 --- a/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf +++ /dev/null @@ -1,13 +0,0 @@ - - - - - AR PL ShanHeiSun Uni - AR PL UMing HK - - - - AR PL ShanHeiSun Uni MBE - AR PL UMing TW MBE - - diff --git a/system/ttf-arphic-uming/41-ttf-arphic-uming.conf b/system/ttf-arphic-uming/41-ttf-arphic-uming.conf deleted file mode 100644 index f8273191ea..0000000000 --- a/system/ttf-arphic-uming/41-ttf-arphic-uming.conf +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - AR PL ShanHeiSun Uni - AR PL ShanHeiSun Uni MBE - AR PL UMing CN - AR PL UMing HK - AR PL UMing TW - AR PL UMing TW MBE - serif - - - - AR PL ShanHeiSun Uni - AR PL ShanHeiSun Uni MBE - AR PL UMing CN - AR PL UMing HK - AR PL UMing TW - AR PL UMing TW MBE - sans-serif - - - - AR PL ShanHeiSun Uni - AR PL ShanHeiSun Uni MBE - AR PL UMing CN - AR PL UMing HK - AR PL UMing TW - AR PL UMing TW MBE - monospace - - diff --git a/system/ttf-arphic-uming/64-ttf-arphic-uming.conf b/system/ttf-arphic-uming/64-ttf-arphic-uming.conf deleted file mode 100644 index f611d1034f..0000000000 --- a/system/ttf-arphic-uming/64-ttf-arphic-uming.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - - - serif - - AR PL UMing HK - AR PL UMing CN - - - - sans-serif - - AR PL UMing HK - AR PL UMing CN - - - - monospace - - AR PL UMing HK - AR PL UMing CN - - - diff --git a/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf b/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf deleted file mode 100644 index 30b19998bb..0000000000 --- a/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - AR PL UMing - - - - 100 - - - 180 - - - true - - - - diff --git a/system/ttf-arphic-uming/README b/system/ttf-arphic-uming/README index 4a848206b6..04b17c68d3 100644 --- a/system/ttf-arphic-uming/README +++ b/system/ttf-arphic-uming/README @@ -1,17 +1,19 @@ CJK Unicode font Ming style =========================== -This font was taken from the from the TrueType fonts generously released by -Arphic Technologies Taiwan under the Arphic Public License. -It was modified with Fontforge by Arne Goetje to contain -both Big5 and GB2312 charsets plus some European characters. +This font was taken from the from the TrueType fonts generously +released by Arphic Technologies Taiwan under the Arphic +Public License. It was modified with Fontforge by Arne Goetje + to contain both Big5 and GB2312 charsets plus some +European characters. Currently it fully supports the following charsets: -ISO8859-1,2,3,4,7,9,10,13,14,15 -Big5 -HKSCS-2004 -GB2312-80 -Bopomofo Extensions for Hakka, Minnan (Unicode 5.0) and their MBE variants. +- ISO8859-1,2,3,4,7,9,10,13,14,15 +- Big5 +- HKSCS-2004 +- GB2312-80 +- Bopomofo Extensions for Hakka, Minnan (Unicode 5.0) and their MBE + variants. Partly support is implemented for: CNS 11643 @@ -20,9 +22,9 @@ GB18030 Japanese Korean -This font is under development, new glyphs for the partly supported charsets -are constantly added. +This font is under development, new glyphs for the partly supported +charsets are constantly added. -This font is a TrueType Collection containing 4 flavors, namely -CN, HK, TW and TW MBE. Please see NEWS, KNOWN_ISSUES, FONTLOG and TODO for +This font is a TrueType Collection containing 4 flavors, namely CN, +HK, TW and TW MBE. Please see NEWS, KNOWN_ISSUES, FONTLOG and TODO for details. diff --git a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild index 8761a5c53f..e92201c0f8 100644 --- a/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild +++ b/system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild @@ -22,19 +22,23 @@ # 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 -# 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 @@ -49,35 +53,33 @@ 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 diff --git a/system/ttf-arphic-uming/ttf-arphic-uming.info b/system/ttf-arphic-uming/ttf-arphic-uming.info index 6d23a37756..282811b40a 100644 --- a/system/ttf-arphic-uming/ttf-arphic-uming.info +++ b/system/ttf-arphic-uming/ttf-arphic-uming.info @@ -1,8 +1,8 @@ PRGNAM="ttf-arphic-uming" -VERSION="0.2.20080216.1" +VERSION="0.2.20080216.2" HOMEPAGE="http://www.freedesktop.org/wiki/Software/CJKUnifonts/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/ttf-arphic-uming_0.2.20080216.1.orig.tar.gz" -MD5SUM="d219fcaf953f3eb1889399955a00379f" +DOWNLOAD="http://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.20080216.2.orig.tar.bz2" +MD5SUM="830e98afbc0644af1c365df5fd92cef0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""