summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO31
-rw-r--r--75-alibaba.conf8
-rw-r--r--PKGBUILD71
3 files changed, 79 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5d943f48839..7729877cbb9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,28 @@
pkgbase = alibaba-puhuiti
pkgdesc = Alibaba PuHuiTi fonts
- pkgver = 1.00
- pkgrel = 2
- url = https://alibabafont.taobao.com
+ pkgver = 2.0
+ pkgrel = 5
+ url = https://ics.alibaba.com/font/alibaba-sans
arch = any
license = custom
- depends = fontconfig
- depends = xorg-font-utils
- source = http://aifont.oss-cn-beijing.aliyuncs.com/Alibaba%20PuHuiTi/Alibaba%20PuHuiTi_AlibabaSans.zip
- sha512sums = 6e0119b1a4d50128bbe6dfbe38c13fc3490651aa706ff7b7773248bcb931bfad8fbb752b7883621fbcd53f757425e624b8f6d293fa1aac1685ead9bba03aca12
+ source = alibaba-puhuiti-2.0.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font2.0.zip
+ source = 75-alibaba.conf
+ sha512sums = b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47
+ sha512sums = f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6
-pkgname = alibaba-puhuiti
+pkgname = otf-alibaba-puhuiti
+ pkgdesc = Alibaba PuHuiTi fonts - OTF format
+ depends = alibaba-puhuiti-fontconfig
-pkgname = alibaba-sans
- pkgdesc = Alibaba Sans fonts
+pkgname = ttf-alibaba-puhuiti
+ pkgdesc = Alibaba PuHuiTi fonts - TTF format
+ depends = alibaba-puhuiti-fontconfig
+ provides = alibaba-puhuiti
+ provides = alibaba-sans
+ replaces = alibaba-puhuiti
+ replaces = alibaba-sans
+pkgname = alibaba-puhuiti-fontconfig
+ pkgdesc = Alibaba PuHuiTi fonts - Fontconfig configuration
+ conflicts = alibaba-puhuiti
+ conflicts = alibaba-sans
diff --git a/75-alibaba.conf b/75-alibaba.conf
new file mode 100644
index 000000000000..dc8bda235b1b
--- /dev/null
+++ b/75-alibaba.conf
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>Alibaba Sans</family>
+ <prefer><family>Alibaba PuHuiTi 2.0</family></prefer>
+ </alias>
+</fontconfig>
diff --git a/PKGBUILD b/PKGBUILD
index 6461c630c81a..df7ab0bca94b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,56 @@
-# Maintainer: Yangtse Su <yangtsesu@gmail.com>
+# Maintainer: Adrian Perez de Castro <aperez@igalia.com>
+# Contributor: Yangtse Su <yangtsesu@gmail.com>
-pkgname=(alibaba-puhuiti alibaba-sans)
-pkgver=1.00
-pkgrel=2
+pkgbase=alibaba-puhuiti
+pkgname=({otf,ttf}-alibaba-puhuiti alibaba-puhuiti-fontconfig)
+pkgver=2.0
+pkgrel=5
pkgdesc="Alibaba PuHuiTi fonts"
-arch=('any')
-license=('custom')
-url="https://alibabafont.taobao.com"
-depends=('fontconfig' 'xorg-font-utils')
-source=("http://aifont.oss-cn-beijing.aliyuncs.com/Alibaba%20PuHuiTi/Alibaba%20PuHuiTi_AlibabaSans.zip")
-sha512sums=('6e0119b1a4d50128bbe6dfbe38c13fc3490651aa706ff7b7773248bcb931bfad8fbb752b7883621fbcd53f757425e624b8f6d293fa1aac1685ead9bba03aca12')
-
-package_alibaba-puhuiti() {
- cd '阿里巴巴普惠体（中西文完整版）'
- install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
- install -Dm644 阿里巴巴普惠体/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+arch=(any)
+license=(custom)
+url=https://ics.alibaba.com/font/alibaba-sans
+source=("alibaba-puhuiti-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/alibaba_font${pkgver}.zip"
+ 75-alibaba.conf)
+sha512sums=('b4b9514375dd1a7717c675e87caaa87a8a9ebc549ba1275822cb0a7e3a8d0f62d3a793777467fffe1c98738a11f317c4cad2678703a74301dda0dd31892d3f47'
+ 'f05f3014ae38f4fb59d3bb06f52e05b8e122e5ba124bd166474231877346a7aeb107860a4b8304493197d43101b03a1bff6c1d79c7dc495377bb63a94cbb0be6')
+
+prepare () {
+ local winzipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Win 压缩.zip'
+ local maczipfile='阿里巴巴普惠体2(1).0字体包/PuHuiTi2.0 for Mac 压缩.zip'
+
+ mkdir ttf otf pdf
+ bsdtar -xf "$winzipfile" -C ttf --include '*.ttf' --strip-components=3
+ bsdtar -xf "$winzipfile" -C otf --include '*.otf' --strip-components=3
+ bsdtar -xf "$maczipfile" -C pdf --include '*.pdf' --strip-components=1
+ mv 'pdf/阿里巴巴普惠体2.0版法律声明.pdf' pdf/license.pdf
+}
+
+_package_common () {
+ install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -Dm644 pdf/license.pdf "${pkgdir}/usr/share/licenses/${pkgname}"
+
+ install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+ install -Dm644 "$@" "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+}
+
+package_otf-alibaba-puhuiti () {
+ pkgdesc="$pkgdesc - OTF format"
+ depends=(alibaba-puhuiti-fontconfig)
+ _package_common otf/*.otf
}
-package_alibaba-sans() {
- pkgver=1.01
- pkgdesc="Alibaba Sans fonts"
+package_ttf-alibaba-puhuiti () {
+ pkgdesc="$pkgdesc - TTF format"
+ provides=(alibaba-puhuiti alibaba-sans)
+ replaces=(alibaba-puhuiti alibaba-sans)
+ depends=(alibaba-puhuiti-fontconfig)
+ _package_common ttf/*.ttf
+}
- cd '阿里巴巴普惠体（中西文完整版）'
- install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
- install -Dm644 AlibabaSans/*/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+package_alibaba-puhuiti-fontconfig () {
+ pkgdesc="$pkgdesc - Fontconfig configuration"
+ conflicts=(alibaba-puhuiti alibaba-sans)
+ install -dm755 "${pkgdir}/usr/share/fontconfig/conf.default"
+ ln -nsf ../conf.avail/75-alibaba.conf \
+ "${pkgdir}/usr/share/fontconfig/conf.default/75-alibaba.conf"
}