summaryrefslogtreecommitdiff
path: root/user/terminus-font
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-04-26 06:51:32 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-04-26 06:51:32 +0000
commitc00548a6a6528351c222d79004fd627a557b4427 (patch)
tree68ebf1295d67f9f863ad328a544eebfe4bb21417 /user/terminus-font
parent125d9bdd41e1543b959baa9c23b8a036bb3a4791 (diff)
parentc9961e457ff471f211b057a649d1357fcb898658 (diff)
downloadpackages-c00548a6a6528351c222d79004fd627a557b4427.tar.gz
packages-c00548a6a6528351c222d79004fd627a557b4427.tar.bz2
packages-c00548a6a6528351c222d79004fd627a557b4427.tar.xz
packages-c00548a6a6528351c222d79004fd627a557b4427.zip
Merge branch 'bump.sroracle.20190417' into 'master'
bump.sroracle.20190417 See merge request !219
Diffstat (limited to 'user/terminus-font')
-rw-r--r--user/terminus-font/75-yes-terminus.conf17
-rw-r--r--user/terminus-font/APKBUILD16
2 files changed, 26 insertions, 7 deletions
diff --git a/user/terminus-font/75-yes-terminus.conf b/user/terminus-font/75-yes-terminus.conf
new file mode 100644
index 000000000..84b0a95a0
--- /dev/null
+++ b/user/terminus-font/75-yes-terminus.conf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Accept terminus font -->
+ <selectfont>
+ <acceptfont>
+ <pattern>
+ <patelt name="family"><string>Terminus</string></patelt>
+ </pattern>
+ </acceptfont>
+ </selectfont>
+ <alias>
+ <family>xos4 Terminus</family>
+ <prefer><family>Terminus</family></prefer>
+ <default><family>fixed</family></default>
+ </alias>
+</fontconfig>
diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD
index 10ebdd481..c3fc0fd6f 100644
--- a/user/terminus-font/APKBUILD
+++ b/user/terminus-font/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=terminus-font
-pkgver=4.46
-pkgrel=1
+pkgver=4.47
+pkgrel=0
pkgdesc="Monospace bitmap font (for X11 and console)"
url="http://terminus-font.sourceforge.net/" # No HTTPS
arch="noarch"
@@ -10,10 +10,10 @@ options="!check" # Fonts have no test suite
license="OFL-1.1"
depends=""
makedepends="bdftopcf python3"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+ 75-yes-terminus.conf"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--psfdir=/usr/share/consolefonts \
@@ -22,14 +22,16 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -Dm644 75-yes-terminus.conf \
+ # Use custom fontconfig since the shipped one doesn't provide
+ # a correct alias
+ install -Dm644 "$srcdir"/75-yes-terminus.conf \
"$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
install -d "$pkgdir/etc/fonts/conf.d"
cd "$pkgdir/etc/fonts/conf.d"
ln -s /etc/fonts/conf.avail/75-yes-terminus.conf .
}
-sha512sums="ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58 terminus-font-4.46.tar.gz"
+sha512sums="09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47 terminus-font-4.47.tar.gz
+ac7bdf367bbff1e5735b5bd65fc1bc06b55bcb72aaafeb08c7d8e969aabad863474b1104faa42ead7d838433c80cfc50f05578dad03c8081cd82cfda0af86a83 75-yes-terminus.conf"