[arch-commits] Commit in adobe-source-han-sans-fonts/trunk (3 files)
Felix Yan
fyan at archlinux.org
Sat Sep 13 11:56:20 UTC 2014
Date: Saturday, September 13, 2014 @ 13:56:20
Author: fyan
Revision: 118905
upgpkg: adobe-source-han-sans-fonts 1.001-1
Added:
adobe-source-han-sans-fonts/trunk/44-source-han-sans-tw.conf
(from rev 118761, adobe-source-han-sans-fonts/trunk/44-source-han-sans-twhk.conf)
Modified:
adobe-source-han-sans-fonts/trunk/PKGBUILD
Deleted:
adobe-source-han-sans-fonts/trunk/44-source-han-sans-twhk.conf
------------------------------+
44-source-han-sans-tw.conf | 18 +++++++++
44-source-han-sans-twhk.conf | 18 ---------
PKGBUILD | 80 ++++++++++++++++++-----------------------
3 files changed, 55 insertions(+), 61 deletions(-)
Copied: adobe-source-han-sans-fonts/trunk/44-source-han-sans-tw.conf (from rev 118761, adobe-source-han-sans-fonts/trunk/44-source-han-sans-twhk.conf)
===================================================================
--- 44-source-han-sans-tw.conf (rev 0)
+++ 44-source-han-sans-tw.conf 2014-09-13 11:56:20 UTC (rev 118905)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <!--
+ - Medium variant is used instead of Regular on Qt apps:
+ https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
+ - Medium and Bold looks the same in certain applications:
+ https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
+ -->
+ <match target="scan">
+ <test name="fullname" compare="eq">
+ <string>Source Han Sans TWHK Medium</string>
+ </test>
+ <edit name="weight" mode="assign">
+ <const>demibold</const>
+ </edit>
+ </match>
+</fontconfig>
Deleted: 44-source-han-sans-twhk.conf
===================================================================
--- 44-source-han-sans-twhk.conf 2014-09-13 11:37:21 UTC (rev 118904)
+++ 44-source-han-sans-twhk.conf 2014-09-13 11:56:20 UTC (rev 118905)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
- <!--
- - Medium variant is used instead of Regular on Qt apps:
- https://bugs.launchpad.net/ubuntu-font-family/+bug/744812
- - Medium and Bold looks the same in certain applications:
- https://bugs.launchpad.net/ubuntu/+source/gnome-specimen/+bug/813373
- -->
- <match target="scan">
- <test name="fullname" compare="eq">
- <string>Source Han Sans TWHK Medium</string>
- </test>
- <edit name="weight" mode="assign">
- <const>demibold</const>
- </edit>
- </match>
-</fontconfig>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-13 11:37:21 UTC (rev 118904)
+++ PKGBUILD 2014-09-13 11:56:20 UTC (rev 118905)
@@ -2,18 +2,20 @@
# Maintainer: Felix Yan <felixonmars at gmail.com>
# Contributor: Sascha Weaver <wzyboy at wzyboy.org>
-# This font has three versions:
+# This font has four versions:
#
-# * Multilingual versions with a default langauge:
+# * Multilingual versions with a default language: (OTF)
# (We do not package them)
# * Multilingual version with Japanese glyphs as default priority
# * Multilingual version with Korean glyphs as default priority
# * Multilingual version with Simplified Chinese glyphs as default priority
# * Multilingual version with Traditional Chinese glyphs as default priority
-# * Multilingual version combined the four versions above.
+# * Multilingual version combined the four versions above. (OTC)
# (This version is "the best of the worlds", but it cannot be used in Windows)
# -> adobe-source-han-sans-otc-fonts
-# * Regional subsets with only characters used in CN, JP, KR or TWHK:
+# * Multilingual version compressed the 7 files into a single ttc file. (SuperOTC)
+# (We do not package them, as there's no difference from the OTC version in use)
+# * Regional subsets with only characters used in CN, JP, KR or TW: (SubsetOTF)
# (This version is smaller and has better compatibility)
# * Regional subset with only Japanese glyphs + Latin
# -> adobe-source-han-sans-jp-fonts
@@ -22,36 +24,26 @@
# * Regional subset with only Simplified Chinese glyphs + Latin
# -> adobe-source-han-sans-cn-fonts
# * Regional subset with only Traditional Chinese glyphs + Latin
-# -> adobe-source-han-sans-twhk-fonts
+# -> adobe-source-han-sans-tw-fonts
_pkgbase=adobe-source-han-sans
pkgbase=$_pkgbase-fonts
-pkgname=($_pkgbase-jp-fonts $_pkgbase-kr-fonts $_pkgbase-cn-fonts $_pkgbase-twhk-fonts $_pkgbase-otc-fonts)
-pkgver=1.000
-pkgrel=2
+pkgname=($_pkgbase-jp-fonts $_pkgbase-kr-fonts $_pkgbase-cn-fonts $_pkgbase-tw-fonts $_pkgbase-otc-fonts)
+pkgver=1.001
+pkgrel=1
pkgdesc='Adobe Source Han Sans - A set of Pan-CJK fonts designed to complement Source Sans Pro'
arch=('any')
license=('Apache')
-url='http://sourceforge.net/adobe/source-han-sans'
+url='https://github.com/adobe-fonts/source-han-sans'
depends=('fontconfig')
-makedepends=('unzip')
install="fonts.install"
-source=("http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansJP-$pkgver.zip"
- "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansKR-$pkgver.zip"
- "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansCN-$pkgver.zip"
- "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansTWHK-$pkgver.zip"
- "http://sourceforge.net/projects/source-han-sans.adobe/files/SourceHanSansOTC-$pkgver.zip"
+source=("https://github.com/adobe-fonts/source-han-sans/archive/${pkgver}R.tar.gz"
44-source-han-sans-jp.conf
44-source-han-sans-kr.conf
44-source-han-sans-cn.conf
- 44-source-han-sans-twhk.conf
+ 44-source-han-sans-tw.conf
44-source-han-sans-otc.conf)
-noextract=(SourceHanSansJP-$pkgver.zip SourceHanSansKR-$pkgver.zip SourceHanSansCN-$pkgver.zip SourceHanSansTWHK-$pkgver.zip SourceHanSansOTC-$pkgver.zip)
-sha256sums=('c5930036660bea22ffceaa9e2df765776494800d330a59be7936ab3c763c4c82'
- '8eed4ad092fcf640e44f73ba510e0ed1c1cabf79776f68d02820734bbba21cf8'
- '88117aa8f8b4ab65d6f7a919a5e1b06d6c00f75b1abecccf120246536123754d'
- '2371a726757a51322243b1ed7a9fde562621b0813b5e6d6443e06847ad7bbd20'
- 'd6eb107eaf7f7b7e6b775905e2f5b335c989c7b06a46fc7286d3e71c4ffde4d8'
+sha256sums=('57d1de6cb853669f94970e2a2a8c5a52f3b703b4b0cbb58f02945925511b9f33'
'f0e87368ffa91ac76b253846836da05baa120ab4f8a7bfd90fded36f4988c9e0'
'fa8d487c7ba67489bde7b4d8558e07abb6d8bcb4d4e9db1bf454c2db23af9547'
'd42ed0092a47cee5c7ff3972c90676109212dafc2cffb3388a8b339788a6cdb5'
@@ -85,14 +77,14 @@
SourceHanSansCN-Normal.otf
SourceHanSansCN-Regular.otf
)
-_twhk=(
-SourceHanSansTWHK-Bold.otf
-SourceHanSansTWHK-ExtraLight.otf
-SourceHanSansTWHK-Heavy.otf
-SourceHanSansTWHK-Light.otf
-SourceHanSansTWHK-Medium.otf
-SourceHanSansTWHK-Normal.otf
-SourceHanSansTWHK-Regular.otf
+_tw=(
+SourceHanSansTW-Bold.otf
+SourceHanSansTW-ExtraLight.otf
+SourceHanSansTW-Heavy.otf
+SourceHanSansTW-Light.otf
+SourceHanSansTW-Medium.otf
+SourceHanSansTW-Normal.otf
+SourceHanSansTW-Regular.otf
)
_otc=(
SourceHanSans-Bold.ttc
@@ -105,32 +97,34 @@
)
function _package {
- cd "$srcdir"
+ cd "$srcdir/source-han-sans-${pkgver}R"
case "$1" in
$_pkgbase-jp-fonts)
fonts=(${_jp[@]})
- unzip -j SourceHanSansJP-$pkgver.zip
+ cd SubsetOTF/JP
_fontconfig_filename=44-source-han-sans-jp.conf
- pkgdesc="Adobe Source Han Sans - Japanese OpenType/CFF fonts";;
+ pkgdesc="Adobe Source Han Sans Subset OTF - Japanese OpenType/CFF fonts";;
$_pkgbase-kr-fonts)
fonts=(${_kr[@]})
- unzip -j SourceHanSansKR-$pkgver.zip
+ cd SubsetOTF/KR
_fontconfig_filename=44-source-han-sans-kr.conf
- pkgdesc="Adobe Source Han Sans - Korean OpenType/CFF fonts";;
+ pkgdesc="Adobe Source Han Sans Subset OTF - Korean OpenType/CFF fonts";;
$_pkgbase-cn-fonts)
fonts=(${_cn[@]})
- unzip -j SourceHanSansCN-$pkgver.zip
+ cd SubsetOTF/CN
_fontconfig_filename=44-source-han-sans-cn.conf
- pkgdesc="Adobe Source Han Sans - Simplified Chinese OpenType/CFF fonts";;
- $_pkgbase-twhk-fonts)
- fonts=(${_twhk[@]})
- unzip -j SourceHanSansTWHK-$pkgver.zip
- _fontconfig_filename=44-source-han-sans-twhk.conf
- pkgdesc="Adobe Source Han Sans - Traditional Chinese OpenType/CFF fonts";;
+ pkgdesc="Adobe Source Han Sans Subset OTF - Simplified Chinese OpenType/CFF fonts";;
+ $_pkgbase-tw-fonts)
+ fonts=(${_tw[@]})
+ cd SubsetOTF/TW
+ _fontconfig_filename=44-source-han-sans-tw.conf
+ conflicts=("$_pkgbase-twhk-fonts")
+ replaces=("$_pkgbase-twhk-fonts")
+ pkgdesc="Adobe Source Han Sans Subset OTF - Traditional Chinese OpenType/CFF fonts";;
$_pkgbase-otc-fonts)
fonts=(${_otc[@]})
- unzip -j SourceHanSansOTC-$pkgver.zip
+ cd OTC
_fontconfig_filename=44-source-han-sans-otc.conf
pkgdesc="Adobe Source Han Sans - Pan-CJK OpenType/CFF Collection fonts";;
esac
More information about the arch-commits
mailing list