Date: Monday, September 26, 2022 @ 18:31:29
Author: polyzen
Revision: 1311519
upgpkg: ttf-nerd-fonts-symbols 2.2.2-2: Reduce conflicts
Fixes FS#68640 and FS#76022
Modified:
ttf-nerd-fonts-symbols/trunk/PKGBUILD
ttf-nerd-fonts-symbols/trunk/ttf-nerd-fonts-symbols.install
--------------------------------+
PKGBUILD | 28 +++++++++++++++++++---------
ttf-nerd-fonts-symbols.install | 4 ++++
2 files changed, 23 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-26 18:25:03 UTC (rev 1311518)
+++ PKGBUILD 2022-09-26 18:31:29 UTC (rev 1311519)
@@ -1,10 +1,12 @@
# Maintainer: Daniel M. Capella <poly...@archlinux.org>
# Contributor: Asger Hautop Drewsen <asgerdrew...@gmail.com>
-pkgname=('ttf-nerd-fonts-symbols-1000-em'
'ttf-nerd-fonts-symbols-1000-em-mono' 'ttf-nerd-fonts-symbols-2048-em'
'ttf-nerd-fonts-symbols-2048-em-mono')
+pkgname=('ttf-nerd-fonts-symbols-1000-em' 'ttf-nerd-fonts-symbols-1000-em-mono'
+ 'ttf-nerd-fonts-symbols-2048-em' 'ttf-nerd-fonts-symbols-2048-em-mono'
+ 'ttf-nerd-fonts-symbols-common')
pkgbase=ttf-nerd-fonts-symbols
pkgver=2.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="High number of extra glyphs from popular 'iconic fonts'"
arch=('any')
url=https://github.com/ryanoasis/nerd-fonts
@@ -28,7 +30,7 @@
case "$1" in
ttf-nerd-fonts-symbols-1000-em)
pkgdesc+=' (1000-em)'
- conflicts=('ttf-nerd-fonts-symbols-mono'
'ttf-nerd-fonts-symbols-1000-em-mono' 'ttf-nerd-fonts-symbols-2048-em'
'ttf-nerd-fonts-symbols-2048-em-mono')
+ conflicts=('ttf-nerd-fonts-symbols-mono'
'ttf-nerd-fonts-symbols-2048-em')
replaces=('ttf-nerd-fonts-symbols-mono')
install -Dm644 "Symbols-1000-em_Nerd_Font_Complete-$pkgver.ttf" \
@@ -36,7 +38,7 @@
;;
ttf-nerd-fonts-symbols-1000-em-mono)
pkgdesc+=' (1000-em monospace)'
- conflicts=('ttf-nerd-fonts-symbols-1000-em'
'ttf-nerd-fonts-symbols-2048-em' 'ttf-nerd-fonts-symbols-2048-em-mono')
+ conflicts=('ttf-nerd-fonts-symbols-2048-em-mono')
install -Dm644 "Symbols-1000-em_Nerd_Font_Complete_Mono-$pkgver.ttf" \
"$pkgdir/usr/share/fonts/TTF/Symbols-1000-em Nerd Font Complete
Mono.ttf"
@@ -43,7 +45,7 @@
;;
ttf-nerd-fonts-symbols-2048-em)
pkgdesc+=' (2048-em)'
- conflicts=('ttf-nerd-fonts-symbols' 'ttf-nerd-fonts-symbols-1000-em'
'ttf-nerd-fonts-symbols-1000-em-mono' 'ttf-nerd-fonts-symbols-2048-em-mono')
+ conflicts=('ttf-nerd-fonts-symbols' 'ttf-nerd-fonts-symbols-1000-em')
replaces=('ttf-nerd-fonts-symbols')
install -Dm644 "Symbols-2048-em_Nerd_Font_Complete-$pkgver.ttf" \
@@ -51,7 +53,7 @@
;;
ttf-nerd-fonts-symbols-2048-em-mono)
pkgdesc+=' (2048-em monospace)'
- conflicts=('ttf-nerd-fonts-symbols-1000-em'
'ttf-nerd-fonts-symbols-1000-em-mono' 'ttf-nerd-fonts-symbols-2048-em')
+ conflicts=('ttf-nerd-fonts-symbols-1000-em-mono')
install -Dm644 "Symbols-2048-em_Nerd_Font_Complete_Mono-$pkgver.ttf" \
"$pkgdir/usr/share/fonts/TTF/Symbols-2048-em Nerd Font Complete
Mono.ttf"
@@ -58,12 +60,20 @@
;;
esac
- install -Dm644 10-nerd-font-symbols-$pkgver.conf \
- "$pkgdir"/usr/share/fontconfig/conf.avail/10-nerd-font-symbols.conf
- install -Dm644 Nerd_Fonts-$pkgver-LICENSE \
+ depends=('ttf-nerd-fonts-symbols-common')
+
+ install -d "$pkgdir"/usr/share/licenses/"$1"
+ ln -s /usr/share/licenses/ttf-nerd-fonts-symbols-common/LICENSE \
"$pkgdir"/usr/share/licenses/"$1"/LICENSE
}
+package_ttf-nerd-fonts-symbols-common() {
+install -Dm644 10-nerd-font-symbols-$pkgver.conf \
+ "$pkgdir"/usr/share/fontconfig/conf.avail/10-nerd-font-symbols.conf
+install -Dm644 Nerd_Fonts-$pkgver-LICENSE \
+ "$pkgdir"/usr/share/licenses/ttf-nerd-fonts-symbols-common/LICENSE
+}
+
for _pkgname in "${pkgname[@]}"; do
eval "package_$_pkgname() { _package $_pkgname; }"
done
Modified: ttf-nerd-fonts-symbols.install
===================================================================
--- ttf-nerd-fonts-symbols.install 2022-09-26 18:25:03 UTC (rev 1311518)
+++ ttf-nerd-fonts-symbols.install 2022-09-26 18:31:29 UTC (rev 1311519)
@@ -1,5 +1,9 @@
post_install() {
cat << EOF
+
+Note: For the -mono packages, use the "Symbols Nerd Font Mono" family in your
+font config.
+
Symlink /usr/share/fontconfig/conf.avail/10-nerd-font-symbols.conf to
/etc/fonts/conf.d/, or see \`man 5 fonts-conf\` for other options.
EOF
