Fix dependencies, install license, update URLs

2 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 259c8fb57fea..4ec62ccc45d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = alibaba-puhuiti
 	pkgdesc = Alibaba PuHuiTi fonts
 	pkgver = 1.01
-	pkgrel = 2
-	url = https://alibabafont.taobao.com
+	pkgrel = 3
+	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
+	makedepends = unzip
+	source = alibaba-puhuiti-1.01.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/ucan_alibaba_font.zip?spm=0.font.0.0.e21dbbcfIGV8il&file=ucan_alibaba_font.zip
+	sha512sums = e2cac62e55a96cc641516f859ea4f613d5a976725362afc4a8483d767fb19a394b34d36565e2ddb264f3986b443b7827eb641051b54355e03061b86677a23fd8
 
 pkgname = alibaba-puhuiti
 
diff --git a/PKGBUILD b/PKGBUILD
index 39fccf92a473..3b65a47a24bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,25 +2,38 @@
 
 pkgname=(alibaba-puhuiti alibaba-sans)
 pkgver=1.01
-pkgrel=2
+pkgrel=3
 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')
+arch=(any)
+license=(custom)
+url=https://ics.alibaba.com/font/alibaba-sans
+makedepends=(unzip)
+source=("$pkgname-$pkgver.zip::https://ics-static.oss-cn-hangzhou.aliyuncs.com/static/ucan/ucan_alibaba_font.zip?spm=0.font.0.0.e21dbbcfIGV8il&file=ucan_alibaba_font.zip")
+sha512sums=('e2cac62e55a96cc641516f859ea4f613d5a976725362afc4a8483d767fb19a394b34d36565e2ddb264f3986b443b7827eb641051b54355e03061b86677a23fd8')
+
+prepare () {
+  cd '阿里巴巴集团字体'
+  unzip -q -o -j 'AlibabaSans.zip' '*.otf' -d ../sans
+  unzip -q -o -j '阿里巴巴普惠体.zip' '*.ttf' -d ../puhuiti
+}
+
+_install_license ()
+{
+  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -Dm644 '阿里巴巴集团字体/Law Policy for Alibaba Sans.pdf' \
+    "${pkgdir}/usr/share/licenses/${pkgname}"
+}
 
 package_alibaba-puhuiti() {
-  cd '阿里巴巴普惠体（中西文完整版）'
   install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  install -Dm644 阿里巴巴普惠体/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+  install -Dm644 puhuiti/*.ttf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+  _install_license
 }
 
 package_alibaba-sans() {
   pkgdesc="Alibaba Sans fonts"
 
-  cd '阿里巴巴普惠体（中西文完整版）'
   install -dm755 "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
-  install -Dm644 AlibabaSans/*/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+  install -Dm644 sans/*.otf "${pkgdir}/usr/share/fonts/alibaba/${pkgname}"
+  _install_license
 }