summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoroi_wtf2019-01-04 12:42:28 +0100
committeroi_wtf2019-01-04 12:42:28 +0100
commite14c569dd7d6d8513df90f164c26faccc7459c81 (patch)
tree8065819eaaae879cf25831a716ff28ba95e319d6
parent8f325fe1adeb982ecc90333cd8806261514f839d (diff)
downloadaur-e14c569dd7d6d8513df90f164c26faccc7459c81.tar.gz
upgpkg: terminus-font-td1 4.47-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD23
-rw-r--r--fix-75-yes-terminus.patch11
-rw-r--r--terminus-font-td1.install15
4 files changed, 32 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b6b6fb71326..56258544e97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = terminus-font-td1
pkgdesc = Monospace bitmap font (for X11 and console) with td1 patch (centered ascii tilde)
- pkgver = 4.46
+ pkgver = 4.47
pkgrel = 1
url = http://sourceforge.net/projects/terminus-font/
arch = any
@@ -17,8 +17,10 @@ pkgbase = terminus-font-td1
optdepends = xorg-fonts-alias
provides = terminus-font
conflicts = terminus-font
- source = http://downloads.sourceforge.net/project/terminus-font/terminus-font-4.46/terminus-font-4.46.tar.gz
- sha256sums = 4e29433e5699b76df1f5c9a96f1228cccf8ea8a16791cfef063f2b8506c75bcd
+ source = https://downloads.sourceforge.net/project/terminus-font/terminus-font-4.47/terminus-font-4.47.tar.gz
+ source = fix-75-yes-terminus.patch
+ sha256sums = 0f1b205888e4e26a94878f746b8566a65c3e3742b33cf9a4e6517646d5651297
+ sha256sums = ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5
pkgname = terminus-font-td1
diff --git a/PKGBUILD b/PKGBUILD
index d54baba0cab..ab6e8a22dca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Maintainer: oi_wtf <brainpower at mailbox dot org>
+# Maintainer: oi_wtf <brainpower at mailbox dot org>
+# Contributor: Johannes Löthberg <johannes@kyriasis.com>
# Contributor: Alexander F Rødseth <xyproto@archlinux.org>
# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Kristoffer Fossgård <kfs1@online.no>
@@ -7,22 +8,31 @@
_pkgname=terminus-font
pkgname=${_pkgname}-td1
-pkgver=4.46
+pkgver=4.47
pkgrel=1
+
pkgdesc='Monospace bitmap font (for X11 and console) with td1 patch (centered ascii tilde)'
-arch=('any')
url='http://sourceforge.net/projects/terminus-font/'
+arch=('any')
license=('GPL2' 'custom:OFL')
+
makedepends=('xorg-bdftopcf' 'fontconfig' 'xorg-mkfontscale' 'xorg-mkfontdir' 'python3')
optdepends=('xorg-fonts-alias')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
+
conflicts=('terminus-font')
provides=('terminus-font')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.gz")
-sha256sums=('4e29433e5699b76df1f5c9a96f1228cccf8ea8a16791cfef063f2b8506c75bcd')
+
+source=("https://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.gz"
+ fix-75-yes-terminus.patch)
+sha256sums=('0f1b205888e4e26a94878f746b8566a65c3e3742b33cf9a4e6517646d5651297'
+ 'ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5')
prepare() {
- chmod +x "${_pkgname}-${pkgver}/configure"
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ chmod +x configure
+ patch -p1 < "$srcdir"/fix-75-yes-terminus.patch
}
build() {
@@ -52,5 +62,4 @@ package() {
ln -s ../conf.avail/75-yes-terminus.conf
}
-# getver: terminus-font.sf.net
# vim:set ts=2 sw=2 et:
diff --git a/fix-75-yes-terminus.patch b/fix-75-yes-terminus.patch
new file mode 100644
index 00000000000..3447f5ba59f
--- /dev/null
+++ b/fix-75-yes-terminus.patch
@@ -0,0 +1,11 @@
+--- a/75-yes-terminus.conf 2019-01-01 19:32:47.000000000 +0100
++++ b/75-yes-terminus.conf 2019-01-01 19:41:28.323308293 +0100
+@@ -5,7 +5,7 @@
+ <selectfont>
+ <acceptfont>
+ <pattern>
+- <patelt name="family"><string>Terminus</string></patelt>
++ <patelt name="family"><string>xos4 Terminus</string></patelt>
+ </pattern>
+ </acceptfont>
+ </selectfont>
diff --git a/terminus-font-td1.install b/terminus-font-td1.install
deleted file mode 100644
index 3f5e3bbaaf0..00000000000
--- a/terminus-font-td1.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- fc-cache -s
- mkfontscale usr/share/fonts/misc
- mkfontdir usr/share/fonts/misc
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et: