Adding zcool xiaowei renaming, updated conflicts

2 files changed, 9 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9d5e22ebae0..91cb29091047 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ttf-google-fonts-git
 	pkgdesc = TrueType fonts from the Google Fonts project (git version)
-	pkgver = r1333.ef5baa48
+	pkgver = r1377.1ebe5dcf
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/google/fonts
@@ -70,6 +70,7 @@ pkgbase = ttf-google-fonts-git
 	conflicts = ttf-source-sans-pro-ibx
 	conflicts = ttf-vollkorn-ibx
 	conflicts = ttf-arabeyes-fonts
+	conflicts = ttf-google-fonts-typewolf
 	source = git+https://github.com/google/fonts.git
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a0721033706..b25f31f65370 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Alexander De Sousa <archaur.xandy21@spamgourmet.com>
 
 pkgname=ttf-google-fonts-git
-pkgver=r1333.ef5baa48
+pkgver=r1377.1ebe5dcf
 pkgrel=1
 epoch=1
 pkgdesc="TrueType fonts from the Google Fonts project (git version)"
@@ -58,7 +58,8 @@ conflicts=('adobe-source-code-pro-fonts'
            'ttf-source-code-pro-ibx'
            'ttf-source-sans-pro-ibx'
            'ttf-vollkorn-ibx'
-           'ttf-arabeyes-fonts')
+           'ttf-arabeyes-fonts'
+           'ttf-google-fonts-typewolf')
 provides=('adobe-source-code-pro-fonts'
           'adobe-source-sans-pro-fonts'
           'jsmath-fonts'
@@ -116,4 +117,8 @@ package() {
 
   done < <(find "$srcdir" -type f -iname \*.ttf -print0)
 
+  # NOTE: Since the zcool xiaowei chinese font has special characters. We need to change
+  # the folder name to prevent errors during package compression.
+  mv "$pkgdir"/usr/share/fonts/站酷小薇体 "$pkgdir"/usr/share/fonts/zcool-xiaowei-regular
+  mv "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.站酷小薇体 "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE.zcool-xiaowei-regular
 }