* update ttf-dejavu to 2.37+18+g9b5d1b2f-4

This commit is contained in:
Alexander Baldeck 2023-07-02 10:36:36 +02:00
parent 924d913139
commit b55864bf18
2 changed files with 21 additions and 124 deletions

View File

@ -1,38 +1,37 @@
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Caleb Maclennan <caleb@alerque.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Michal Krenek <mikos@sg1.cz>
pkgname=ttf-dejavu
_commit=9b5d1b2ffeec20c7b46aa89c0223d783c02762cf # master
pkgver=2.37+18+g9b5d1b2f
pkgrel=3
pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
arch=('any')
url="https://dejavu-fonts.github.io/"
license=('custom')
makedepends=('git' 'fontforge' 'perl-font-ttf')
provides=('ttf-font')
_commit=9b5d1b2ffeec20c7b46aa89c0223d783c02762cf # master
pkgrel=4
pkgdesc='Font family based on the Bitstream Vera Fonts with a wider range of characters'
arch=(any)
url='https://dejavu-fonts.github.io'
license=(custom)
makedepends=(git fontforge perl-font-ttf)
provides=(ttf-font)
source=("git+https://github.com/dejavu-fonts/dejavu-fonts.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd dejavu-fonts
git describe --tags | sed 's/^version_//;s/_/./;s/-/+/g'
cd dejavu-fonts
git describe --tags | sed 's/^version_//;s/_/./;s/-/+/g'
}
build() {
cd dejavu-fonts
make full-ttf
cd dejavu-fonts
make full-ttf
}
package() {
cd dejavu-fonts
install -Dt "$pkgdir/usr/share/fonts/TTF" -m644 build/*.ttf
install -Dt "$pkgdir/usr/share/fontconfig/conf.avail" -m644 fontconfig/*.conf
mkdir "$pkgdir/usr/share/fontconfig/conf.default"
ln -srt "$pkgdir/usr/share/fontconfig/conf.default" \
"$pkgdir"/usr/share/fontconfig/conf.avail/*
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
cd dejavu-fonts
install -Dm0644 -t "$pkgdir/usr/share/fonts/TTF" build/*.ttf
install -Dm0644 -t "$pkgdir/usr/share/fontconfig/conf.avail" fontconfig/*.conf
mkdir -p "$pkgdir/usr/share/fontconfig/conf.default"
ln -srt "$pkgdir/usr/share/fontconfig/conf.default" \
"$pkgdir"/usr/share/fontconfig/conf.avail/*
install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE
}

View File

@ -1,102 +0,0 @@
From d9ee532b4f0a879372bdb006ac85d7807629ea98 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Mon, 15 May 2017 21:08:12 +0200
Subject: [PATCH] fontconfig: remove generic name assignment and aliasing
This removes the generic name assignment and the generic name aliasing
rules for the three standard DejaVu Sans, Sans-Mono and Serif fonts.
These rules are redundant as they are already in the fontconfig
upstream config files 45-latin.conf and 60-latin.conf, respectively,
for at least 10 years now, c.f.:
https://cgit.freedesktop.org/fontconfig/commit/conf.d/45-latin.conf?id=4b51f173c99152586db26b03752873a4b4020672
https://cgit.freedesktop.org/fontconfig/commit/conf.d/60-latin.conf?id=6c5619a08575943f75d2341e1a4931ec5faf716b
We have a bug report in Debian from a user who complains that he
changed the preference for the default sans-serif font in the expected
rule, i.e. 60-latin.conf, and was confused when his change was
overridden by fonts-dejavu's own rule in 57-dejavu-sans.conf:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=753401
The reporter confirms that removing the offending lines from the
config files in the fonts-dejavu package causes the intended changes
applied to the 60-latin.conf file to take effect.
Thanks for considering!
---
fontconfig/57-dejavu-sans-mono.conf | 14 --------------
fontconfig/57-dejavu-sans.conf | 14 --------------
fontconfig/57-dejavu-serif.conf | 14 --------------
3 files changed, 42 deletions(-)
diff --git a/fontconfig/57-dejavu-sans-mono.conf b/fontconfig/57-dejavu-sans-mono.conf
index cc42561e..2c75b5cf 100644
--- a/fontconfig/57-dejavu-sans-mono.conf
+++ b/fontconfig/57-dejavu-sans-mono.conf
@@ -45,18 +45,4 @@
<family>DejaVu Sans Mono</family>
</accept>
</alias>
- <!-- Generic name assignment -->
- <alias>
- <family>DejaVu Sans Mono</family>
- <default>
- <family>monospace</family>
- </default>
- </alias>
- <!-- Generic name aliasing -->
- <alias>
- <family>monospace</family>
- <prefer>
- <family>DejaVu Sans Mono</family>
- </prefer>
- </alias>
</fontconfig>
diff --git a/fontconfig/57-dejavu-sans.conf b/fontconfig/57-dejavu-sans.conf
index 565cab5f..cff7a842 100644
--- a/fontconfig/57-dejavu-sans.conf
+++ b/fontconfig/57-dejavu-sans.conf
@@ -70,18 +70,4 @@
<family>DejaVu Sans</family>
</accept>
</alias>
- <!-- Generic name assignment -->
- <alias>
- <family>DejaVu Sans</family>
- <default>
- <family>sans-serif</family>
- </default>
- </alias>
- <!-- Generic name aliasing -->
- <alias>
- <family>sans-serif</family>
- <prefer>
- <family>DejaVu Sans</family>
- </prefer>
- </alias>
</fontconfig>
diff --git a/fontconfig/57-dejavu-serif.conf b/fontconfig/57-dejavu-serif.conf
index a922e9b2..10ae70fd 100644
--- a/fontconfig/57-dejavu-serif.conf
+++ b/fontconfig/57-dejavu-serif.conf
@@ -52,18 +52,4 @@
<family>DejaVu Serif</family>
</accept>
</alias>
- <!-- Generic name assignment -->
- <alias>
- <family>DejaVu Serif</family>
- <default>
- <family>serif</family>
- </default>
- </alias>
- <!-- Generic name aliasing -->
- <alias>
- <family>serif</family>
- <prefer>
- <family>DejaVu Serif</family>
- </prefer>
- </alias>
</fontconfig>