summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2023-01-12 11:21:56 +0200
committerAdrian Perez de Castro2023-01-12 11:21:56 +0200
commit481d945fd0dbd47ae38a3340fd8d847320c1f475 (patch)
tree392b0daa5f3083766974f0c4441547437a5c9cdd
parentea473422e89d1867709870e256e25188ae2816a9 (diff)
downloadaur-alibaba-puhuiti.tar.gz
Fix dependencies of fontconfig subpackage
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 529794c1103f..7729877cbb9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = alibaba-puhuiti
pkgdesc = Alibaba PuHuiTi fonts
pkgver = 2.0
- pkgrel = 4
+ pkgrel = 5
url = https://ics.alibaba.com/font/alibaba-sans
arch = any
license = custom
@@ -24,3 +24,5 @@ pkgname = ttf-alibaba-puhuiti
pkgname = alibaba-puhuiti-fontconfig
pkgdesc = Alibaba PuHuiTi fonts - Fontconfig configuration
+ conflicts = alibaba-puhuiti
+ conflicts = alibaba-sans
diff --git a/PKGBUILD b/PKGBUILD
index 01bf50a7a808..df7ab0bca94b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=alibaba-puhuiti
pkgname=({otf,ttf}-alibaba-puhuiti alibaba-puhuiti-fontconfig)
pkgver=2.0
-pkgrel=4
+pkgrel=5
pkgdesc="Alibaba PuHuiTi fonts"
arch=(any)
license=(custom)
@@ -49,6 +49,7 @@ package_ttf-alibaba-puhuiti () {
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"