Date: Sunday, December 27, 2020 @ 22:15:31 Author: eworm Revision: 793900
archrelease: copy trunk to community-any Added: terminus-font/repos/community-any/PKGBUILD (from rev 793899, terminus-font/trunk/PKGBUILD) terminus-font/repos/community-any/fix-75-yes-terminus.patch (from rev 793899, terminus-font/trunk/fix-75-yes-terminus.patch) Deleted: terminus-font/repos/community-any/PKGBUILD terminus-font/repos/community-any/fix-75-yes-terminus.patch ---------------------------+ PKGBUILD | 103 ++++++++++++++++++++++---------------------- fix-75-yes-terminus.patch | 22 ++++----- 2 files changed, 64 insertions(+), 61 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-12-27 22:15:28 UTC (rev 793899) +++ PKGBUILD 2020-12-27 22:15:31 UTC (rev 793900) @@ -1,50 +0,0 @@ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Alexander F Rødseth <xypr...@archlinux.org> -# Contributor: Vesa Kaihlavirta <ve...@iki.fi> -# Contributor: Kristoffer Fossgård <k...@online.no> -# Contributor: clonejo <clon...@shakik.de> -# Contributor: Daniel Micay <danielmi...@gmail.com> - -pkgname=terminus-font -pkgver=4.49 -pkgrel=1 - -pkgdesc='Monospace bitmap font (for X11 and console)' -url='http://terminus-font.sourceforge.net/' -arch=('any') -license=('GPL2' 'custom:OFL') -makedepends=('xorg-bdftopcf' 'python') -source=("https://downloads.sourceforge.net/project/terminus-font/terminus-font-$pkgver/terminus-font-$pkgver.tar.gz" - fix-75-yes-terminus.patch) -sha256sums=('db0a74551a23d2229db6ffea469ca8e390625ace4069dd1c1a3d05a16ed2634d' - 'ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5') - -prepare() { - cd "terminus-font-$pkgver" - patch -p1 <"$srcdir"/fix-75-yes-terminus.patch -} - -build() { - cd "terminus-font-$pkgver" - - ./configure \ - --prefix=/usr \ - --x11dir=/usr/share/fonts/misc \ - --psfdir=/usr/share/kbd/consolefonts - make -} - -package() { - make -C "terminus-font-$pkgver" DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/terminus-font-$pkgver/75-yes-terminus.conf" \ - "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf" - install -Dm644 "$srcdir/terminus-font-$pkgver/OFL.TXT" \ - "$pkgdir/usr/share/licenses/terminus-font/LICENSE" - install -d "$pkgdir/etc/fonts/conf.d" - - cd "$pkgdir/etc/fonts/conf.d" - ln -s ../conf.avail/75-yes-terminus.conf . -} - -# vim:set ts=2 sw=2 et: Copied: terminus-font/repos/community-any/PKGBUILD (from rev 793899, terminus-font/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-12-27 22:15:31 UTC (rev 793900) @@ -0,0 +1,53 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Vesa Kaihlavirta <ve...@iki.fi> +# Contributor: Kristoffer Fossgård <k...@online.no> +# Contributor: clonejo <clon...@shakik.de> +# Contributor: Daniel Micay <danielmi...@gmail.com> + +pkgname=terminus-font +pkgver=4.49 +pkgrel=2 + +pkgdesc='Monospace bitmap font (for X11 and console)' +url='http://terminus-font.sourceforge.net/' +arch=('any') +license=('GPL2' 'custom:OFL') +makedepends=('xorg-bdftopcf' 'python') +conflicts=('terminus-font-otb') +replaces=('terminus-font-otb') +source=("https://downloads.sourceforge.net/project/terminus-font/terminus-font-$pkgver/terminus-font-$pkgver.tar.gz" + fix-75-yes-terminus.patch) +sha256sums=('db0a74551a23d2229db6ffea469ca8e390625ace4069dd1c1a3d05a16ed2634d' + 'ddd86485cf6d54e020e36f1c38c56e8b21b57c23a5d76250e15c1d16fed9caa5') + +prepare() { + cd "terminus-font-$pkgver" + patch -p1 <"$srcdir"/fix-75-yes-terminus.patch +} + +build() { + cd "terminus-font-$pkgver" + + ./configure \ + --prefix=/usr \ + --x11dir=/usr/share/fonts/misc \ + --otbdir=/usr/share/fonts/misc \ + --psfdir=/usr/share/kbd/consolefonts + make all otb +} + +package() { + make -C "terminus-font-$pkgver" DESTDIR="$pkgdir" install install-otb + + install -Dm644 "$srcdir/terminus-font-$pkgver/75-yes-terminus.conf" \ + "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf" + install -Dm644 "$srcdir/terminus-font-$pkgver/OFL.TXT" \ + "$pkgdir/usr/share/licenses/terminus-font/LICENSE" + install -d "$pkgdir/etc/fonts/conf.d" + + cd "$pkgdir/etc/fonts/conf.d" + ln -s ../conf.avail/75-yes-terminus.conf . +} + +# vim:set ts=2 sw=2 et: Deleted: fix-75-yes-terminus.patch =================================================================== --- fix-75-yes-terminus.patch 2020-12-27 22:15:28 UTC (rev 793899) +++ fix-75-yes-terminus.patch 2020-12-27 22:15:31 UTC (rev 793900) @@ -1,11 +0,0 @@ ---- 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> Copied: terminus-font/repos/community-any/fix-75-yes-terminus.patch (from rev 793899, terminus-font/trunk/fix-75-yes-terminus.patch) =================================================================== --- fix-75-yes-terminus.patch (rev 0) +++ fix-75-yes-terminus.patch 2020-12-27 22:15:31 UTC (rev 793900) @@ -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>