diff options
-rw-r--r-- | system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf | 33 | ||||
-rw-r--r-- | system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf | 12 | ||||
-rw-r--r-- | system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch | 218 | ||||
-rw-r--r-- | system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf | 13 | ||||
-rw-r--r-- | system/ttf-arphic-uming/41-ttf-arphic-uming.conf | 41 | ||||
-rw-r--r-- | system/ttf-arphic-uming/64-ttf-arphic-uming.conf | 25 | ||||
-rw-r--r-- | system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf | 21 | ||||
-rw-r--r-- | system/ttf-arphic-uming/README | 28 | ||||
-rw-r--r-- | system/ttf-arphic-uming/ttf-arphic-uming.SlackBuild | 40 | ||||
-rw-r--r-- | system/ttf-arphic-uming/ttf-arphic-uming.info | 6 |
10 files changed, 257 insertions, 180 deletions
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 ad7a8c75250a..000000000000 --- a/system/ttf-arphic-uming/25-ttf-arphic-uming-bitmaps.conf +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - - <match target="font"> - <test name="family"> - <string>AR PL UMing CN</string> -<!-- - <string>AR PL UMing HK</string> - <string>AR PL UMing TW</string> - <string>AR PL UMing TW MBE</string> ---> - </test> - <edit name="antialias"><bool>false</bool></edit> - <edit name="hinting"><bool>true</bool></edit> - <edit name="autohint"><bool>false</bool></edit> - </match> - - <match target="font"> - <test name="family"> - <string>AR PL UMing CN</string> -<!-- - <string>AR PL UMing HK</string> - <string>AR PL UMing TW</string> - <string>AR PL UMing TW MBE</string> ---> - </test> - <test name="pixelsize" compare="more_eq"><int>17</int></test> - <edit name="antialias" mode="assign"><bool>true</bool></edit> - <edit name="hinting" mode="assign"><bool>true</bool></edit> - </match> - -</fontconfig> 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 f962c44551dd..000000000000 --- a/system/ttf-arphic-uming/25-ttf-arphic-uming-render.conf +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <match target="font"> - <test name="family" compare="contains" > - <string>AR PL UMing</string> - </test> - <edit name="globaladvance"><bool>false</bool></edit> - <edit name="spacing"><int>90</int></edit> - <edit name="minspace"><bool>false</bool></edit> - </match> -</fontconfig> 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 000000000000..10d16cb3d405 --- /dev/null +++ b/system/ttf-arphic-uming/30-fix-fontconfig-syntax.patch @@ -0,0 +1,218 @@ +From: Iain Lane <iain.lane@canonical.com> +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 @@ + <match target="font"> + <test name="family"> + <string>AR PL UMing CN</string> ++ </test> ++ <edit name="antialias"><bool>false</bool></edit> ++ <edit name="hinting"><bool>true</bool></edit> ++ <edit name="autohint"><bool>false</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing HK</string> ++ </test> ++ <edit name="antialias"><bool>false</bool></edit> ++ <edit name="hinting"><bool>true</bool></edit> ++ <edit name="autohint"><bool>false</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing TW</string> ++ </test> ++ <edit name="antialias"><bool>false</bool></edit> ++ <edit name="hinting"><bool>true</bool></edit> ++ <edit name="autohint"><bool>false</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing TW MBE</string> + </test> + <edit name="antialias"><bool>false</bool></edit> + <edit name="hinting"><bool>true</bool></edit> + <edit name="autohint"><bool>false</bool></edit> + </match> +- + <match target="font"> + <test name="family"> + <string>AR PL UMing CN</string> ++ </test> ++ <test name="pixelsize" compare="more_eq"><int>17</int></test> ++ <edit name="antialias" mode="assign"><bool>true</bool></edit> ++ <edit name="hinting" mode="assign"><bool>true</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing HK</string> ++ </test> ++ <test name="pixelsize" compare="more_eq"><int>17</int></test> ++ <edit name="antialias" mode="assign"><bool>true</bool></edit> ++ <edit name="hinting" mode="assign"><bool>true</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing TW</string> ++ </test> ++ <test name="pixelsize" compare="more_eq"><int>17</int></test> ++ <edit name="antialias" mode="assign"><bool>true</bool></edit> ++ <edit name="hinting" mode="assign"><bool>true</bool></edit> ++ </match> ++ <match target="font"> ++ <test name="family"> + <string>AR PL UMing TW MBE</string> + </test> + <test name="pixelsize" compare="more_eq"><int>17</int></test> + <edit name="antialias" mode="assign"><bool>true</bool></edit> + <edit name="hinting" mode="assign"><bool>true</bool></edit> + </match> +- + </fontconfig> +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 @@ + --> + <alias> + <family>AR PL ShanHeiSun Uni</family> ++ <default><family>serif</family></default> ++ </alias> ++ <alias> + <family>AR PL ShanHeiSun Uni MBE</family> ++ <default><family>serif</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing CN</family> ++ <default><family>serif</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing HK</family> ++ <default><family>serif</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing TW</family> ++ <default><family>serif</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing TW MBE</family> + <default><family>serif</family></default> + </alias> + <!-- + Monospace faces + --> +- <alias> ++ <alias> + <family>AR PL ShanHeiSun Uni</family> ++ <default><family>monospace</family></default> ++ </alias> ++ <alias> + <family>AR PL ShanHeiSun Uni MBE</family> ++ <default><family>monospace</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing CN</family> ++ <default><family>monospace</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing HK</family> ++ <default><family>monospace</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing TW</family> ++ <default><family>monospace</family></default> ++ </alias> ++ <alias> + <family>AR PL UMing TW MBE</family> + <default><family>monospace</family></default> + </alias> +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 @@ + <match target="pattern"> + <test qual="any" name="lang" compare="contains"> + <string>zh-cn</string> ++ </test> ++ <test qual="any" name="family"> ++ <string>serif</string> ++ </test> ++ <edit name="family" mode="prepend" binding="strong"> ++ <string>AR PL UMing CN</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="lang" compare="contains"> + <string>zh-sg</string> + </test> + <test qual="any" name="family"> +@@ -17,6 +28,17 @@ + <match target="pattern"> + <test qual="any" name="lang" compare="contains"> + <string>zh-cn</string> ++ </test> ++ <test name="family"> ++ <string>AR PL UMing CN</string> ++ </test> ++ <edit name="family" mode="append" binding="strong"> ++ <string>DejaVu Serif</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="lang" compare="contains"> + <string>zh-sg</string> + </test> + <test name="family"> +@@ -30,6 +52,17 @@ + <match target="pattern"> + <test qual="any" name="lang" compare="contains"> + <string>zh-hk</string> ++ </test> ++ <test qual="any" name="family"> ++ <string>serif</string> ++ </test> ++ <edit name="family" mode="prepend" binding="strong"> ++ <string>AR PL UMing HK</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="lang" compare="contains"> + <string>zh-mo</string> + </test> + <test qual="any" name="family"> +@@ -43,6 +76,17 @@ + <match target="pattern"> + <test qual="any" name="lang" compare="contains"> + <string>zh-hk</string> ++ </test> ++ <test name="family"> ++ <string>AR PL UMing HK</string> ++ </test> ++ <edit name="family" mode="append" binding="strong"> ++ <string>DejaVu Serif</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="lang" compare="contains"> + <string>zh-mo</string> + </test> + <test name="family"> 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 2d803f708c1c..000000000000 --- a/system/ttf-arphic-uming/35-ttf-arphic-uming-aliases.conf +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias binding="same"> - <family>AR PL ShanHeiSun Uni</family> - <prefer><family>AR PL UMing HK</family></prefer> - </alias> - - <alias binding="same"> - <family>AR PL ShanHeiSun Uni MBE</family> - <prefer><family>AR PL UMing TW MBE</family></prefer> - </alias> -</fontconfig> 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 f8273191eaa6..000000000000 --- a/system/ttf-arphic-uming/41-ttf-arphic-uming.conf +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - -<!-- - Serif faces - --> - <alias> - <family>AR PL ShanHeiSun Uni</family> - <family>AR PL ShanHeiSun Uni MBE</family> - <family>AR PL UMing CN</family> - <family>AR PL UMing HK</family> - <family>AR PL UMing TW</family> - <family>AR PL UMing TW MBE</family> - <default><family>serif</family></default> - </alias> -<!-- - Sans-serif faces - --> - <alias> - <family>AR PL ShanHeiSun Uni</family> - <family>AR PL ShanHeiSun Uni MBE</family> - <family>AR PL UMing CN</family> - <family>AR PL UMing HK</family> - <family>AR PL UMing TW</family> - <family>AR PL UMing TW MBE</family> - <default><family>sans-serif</family></default> - </alias> -<!-- - Monospace faces - --> - <alias> - <family>AR PL ShanHeiSun Uni</family> - <family>AR PL ShanHeiSun Uni MBE</family> - <family>AR PL UMing CN</family> - <family>AR PL UMing HK</family> - <family>AR PL UMing TW</family> - <family>AR PL UMing TW MBE</family> - <default><family>monospace</family></default> - </alias> -</fontconfig> 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 f611d1034f09..000000000000 --- a/system/ttf-arphic-uming/64-ttf-arphic-uming.conf +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias> - <family>serif</family> - <prefer> - <family>AR PL UMing HK</family> - <family>AR PL UMing CN</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> - <family>AR PL UMing HK</family> - <family>AR PL UMing CN</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> - <family>AR PL UMing HK</family> - <family>AR PL UMing CN</family> - </prefer> - </alias> -</fontconfig> 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 30b19998bb48..000000000000 --- a/system/ttf-arphic-uming/90-ttf-arphic-uming-embolden.conf +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - - <match target="font" > - <test name="family" compare="contains" > - <string>AR PL UMing</string> - </test> - <!-- check to see if the font is just regular --> - <test name="weight" compare="less_eq"> - <int>100</int> - </test> - <test compare="more_eq" target="pattern" name="weight" > - <int>180</int> - </test> - <edit mode="assign" name="embolden" > - <bool>true</bool> - </edit> - </match> - -</fontconfig> diff --git a/system/ttf-arphic-uming/README b/system/ttf-arphic-uming/README index 4a848206b6d4..04b17c68d324 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 <arne@ubuntu.com> 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 +<arne@ubuntu.com> 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 8761a5c53f5e..e92201c0f8bf 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 6d23a3775635..282811b40a85 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="" |