updating to v14.0.2

4 files changed, 28 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9ba5768c01a..22e0c8d58ec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ttf-twemoji-color
 	pkgdesc = A color and B&W emoji SVG-in-OpenType font by Twitter with support for ZWJ, skin tone modifiers and country flags.
-	pkgver = 13.1.0
+	pkgver = 14.0.2
 	pkgrel = 1
 	url = https://github.com/eosrei/twemoji-color-font
 	install = ttf-twemoji-color.install
@@ -13,7 +13,7 @@ pkgbase = ttf-twemoji-color
 	provides = emoji-font
 	conflicts = twemoji-color-font
 	replaces = twemoji-color-font
-	source = https://github.com/eosrei/twemoji-color-font/releases/download/v13.1.0/TwitterColorEmoji-SVGinOT-Linux-13.1.0.tar.gz
-	sha256sums = 57c0d651400af872c33dcab78b33ecd7be0f7d49da49e2c1c83a59c215085f94
+	source = https://github.com/eosrei/twemoji-color-font/releases/download/v14.0.2/TwitterColorEmoji-SVGinOT-Linux-14.0.2.tar.gz
+	b2sums = 43a4c3207cff2e8419c6fb7c0e5bcbe860a607757bc5a1d67c2cd49717eaf6fb259326a4a09b9bfb81b201b9f1ee97be2c3c39649a2d123a62333c7ff8c64241
 
 pkgname = ttf-twemoji-color
diff --git a/.gitignore b/.gitignore
index cf8342f7b26c..665307854be8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-*.zip
-*.xz
-pkg
+*.pkg.tar*
+*.src.tar*
+*.gz
 src
-LICENSE-CC-BY.txt
-README.md
-LICENSE.md
-LICENSE-MIT.txt
+pkg
diff --git a/PKGBUILD b/PKGBUILD
index b25a23850331..36ad30cc7913 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,30 @@
-# Maintainer: Thomas Wood <grand.edgemaster@gmail.com>
+# Maintainer: zoorat <zoorat [at] protonmail [dot] com>
+# Old Maintainer: Thomas Wood <grand.edgemaster@gmail.com>
+
 pkgname=ttf-twemoji-color
-pkgver=13.1.0
+pkgver=14.0.2
 pkgrel=1
+
 pkgdesc="A color and B&W emoji SVG-in-OpenType font by Twitter with support for ZWJ, skin tone modifiers and country flags."
 arch=('any')
 url="https://github.com/eosrei/twemoji-color-font"
 license=('custom:CCPL:by-4.0' 'MIT')
 
-# ttf-bitstream-vera is default font for bug-free font fallback with the provided fontconfig.
-# See: https://github.com/eosrei/emojione-color-font#why-bitstream-vera
-depends=(fontconfig)
+depends=('fontconfig')
 optdepends=('ttf-bitstream-vera: default fallback font used for configuration')
-
 replaces=('twemoji-color-font')
 conflicts=('twemoji-color-font')
 provides=('twemoji-color-font' 'emoji-font')
 
-_pkgver=${pkgver//_/-}
-_archive=TwitterColorEmoji-SVGinOT-Linux-${_pkgver}
+source=("${url}/releases/download/v${pkgver}/TwitterColorEmoji-SVGinOT-Linux-${pkgver}.tar.gz")
+b2sums=('43a4c3207cff2e8419c6fb7c0e5bcbe860a607757bc5a1d67c2cd49717eaf6fb259326a4a09b9bfb81b201b9f1ee97be2c3c39649a2d123a62333c7ff8c64241')
 
-source=(
-  "${url}/releases/download/v${_pkgver}/${_archive}.tar.gz"
-)
 install=$pkgname.install
 
-_srcdir=${pkgname}-${_pkgver}
-
 package() {
-  cd ${_archive}
-  install -Dm644 TwitterColorEmoji-SVGinOT.ttf -t "$pkgdir"/usr/share/fonts/"Twitter Color Emoji"/
-  install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname/
-  install -Dm644 README.md "$pkgdir"/usr/share/doc/$pkgname/README
-  install -Dm644 fontconfig/46-twemoji-color.conf "$pkgdir"/etc/fonts/conf.avail/46-$pkgname.conf
+	cd TwitterColorEmoji-SVGinOT-Linux-${pkgver}
+	install -Dm644 TwitterColorEmoji-SVGinOT.ttf -t "$pkgdir"/usr/share/fonts/twemoji-color-font/
+	install -Dm644 LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname/
+	install -Dm644 README.md "$pkgdir"/usr/share/doc/$pkgname/README
+	install -Dm644 fontconfig/46-twemoji-color.conf "$pkgdir"/usr/share/fontconfig/conf.avail/46-$pkgname.conf
 }
-
-sha256sums=('57c0d651400af872c33dcab78b33ecd7be0f7d49da49e2c1c83a59c215085f94')
diff --git a/ttf-twemoji-color.install b/ttf-twemoji-color.install
index de3295ddcecc..4f5d772af226 100644
--- a/ttf-twemoji-color.install
+++ b/ttf-twemoji-color.install
@@ -1,20 +1,14 @@
-config=46-ttf-twemoji-color.conf
-
 post_install() {
-  echo "To finish installation, update the default font in /etc/fonts/conf.avail/${config} to your system font,"
-  echo "and then copy or symlink the file into /etc/fonts/conf.d or ~/.config/fontconfig/conf.d"
-  echo
-  echo "SVG in OpenType (colour) fonts are currently only supported by Mozilla software. Other software will fallback to B&W glyphs."
-}
-
-post_upgrade() {
-  echo "NOTE: The fontconfig file has been renamed from 56-ttf-twemoji-color.conf to ${config}."
-  echo "You should ensure that you update any links or copies of this file in /etc/fonts/conf.d or ~/.config/fontconfig/conf.d"
+  echo "---"
+  echo " To finish installation, add this font configuration "
+  echo " sudo ln -sf /usr/share/fontconfig/conf.avail/46-ttf-twemoji-color.conf /etc/fonts/conf.d/46-ttf-twemoji-color.conf"
   echo
-  echo "You should now check the default system font is correct in /etc/fonts/conf.avail/${config}"
-  echo "and ensure a copy of or link to this file is present in /etc/fonts/conf.d, or ~/.config/fontconfig/conf.d."
+  echo " and install ttf-bitstream-vera"
+  echo " ttf-bitstream-vera is default font for bug-free font fallback with the provided fontconfig."
+  echo " See: https://github.com/eosrei/emojione-color-font#why-bitstream-vera"
+  echo "---"
 }
 
 post_remove() {
-  echo "To complete uninstallation, you should remove the manually installed ${config} from /etc/fonts/conf.d or ~/.config/fontconfig/conf.d"
+  echo " To complete uninstallation, you should remove /etc/fonts/conf.d/46-ttf-twemoji-color.conf"
 }