Upgrade and sync with official build

5 files changed, 51 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a1be4492d76..cc250f9483f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,26 @@
 pkgbase = terminus-font-ll2
-	pkgdesc = A superb, monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test)
-	pkgver = 4.47
+	pkgdesc = Monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test)
+	pkgver = 4.48
 	pkgrel = 1
-	url = http://sourceforge.net/projects/terminus-font/
-	install = terminus-font.install
+	url = https://sourceforge.net/projects/terminus-font/
 	arch = any
 	license = GPL2
 	license = custom:OFL
+	makedepends = xorg-bdftopcf
+	makedepends = fontconfig
+	makedepends = xorg-mkfontscale
+	makedepends = xorg-mkfontdir
+	makedepends = python3
+	depends = fontconfig
 	depends = xorg-fonts-encodings
-	depends = xorg-fonts-alias
 	depends = xorg-font-utils
-	depends = fontconfig
+	optdepends = xorg-fonts-alias
 	provides = terminus-font
 	conflicts = terminus-font
-	source = http://downloads.sourceforge.net/project/terminus-font/terminus-font-4.47/terminus-font-4.47.tar.gz
-	md5sums = d95f0914e31b838bd54edf8389fdc6cd
+	source = https://downloads.sourceforge.net/project/terminus-font/terminus-font-4.48/terminus-font-4.48.tar.gz
+	source = fix-75-yes-terminus.patch
+	sha256sums = 34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af
+	sha256sums = 67ef6187106912f81208de39d791bf0ef45f7623c2dced36c99164f58654242b
 
 pkgname = terminus-font-ll2
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f436477e6ed6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg/
+src/
+*.tar.gz
+*.pkg.tar
diff --git a/PKGBUILD b/PKGBUILD
index 57a1b8ea1ea9..296226509ad1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,32 +4,43 @@
 
 _pkgname=terminus-font
 pkgname=${_pkgname}-ll2
-pkgver=4.47
+pkgver=4.48
 pkgrel=1
-pkgdesc='A superb, monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test)'
+pkgdesc='Monospace bitmap font (for X11 and console) with ll2 patch (pass the il1I test)'
 arch=(any)
-url=http://sourceforge.net/projects/terminus-font/
+url=https://sourceforge.net/projects/terminus-font/
 license=(GPL2 custom:OFL)
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
+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)
-install=terminus-font.install
-source=(http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('d95f0914e31b838bd54edf8389fdc6cd')
+source=(
+  https://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.gz
+  fix-75-yes-terminus.patch
+)
+sha256sums=(
+  34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af
+  67ef6187106912f81208de39d791bf0ef45f7623c2dced36c99164f58654242b
+)
 
-build() { 
+prepare() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+  patch < ../fix-75-yes-terminus.patch
   patch < alt/ll2.diff
+}
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
   ./configure --prefix=/usr --x11dir=/usr/share/fonts/misc --psfdir=/usr/share/kbd/consolefonts
   make
 }
 
-package()
-{
+package() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -Dm644 75-yes-terminus.conf "${pkgdir}/etc/fonts/conf.avail/75-yes-terminus.conf"
+  install -Dm644 OFL.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -dm755 "${pkgdir}/etc/fonts/conf.d"
   ln -sf -t "${pkgdir}/etc/fonts/conf.d" ../conf.avail/75-yes-terminus.conf
-  install -Dm644 OFL.TXT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/fix-75-yes-terminus.patch b/fix-75-yes-terminus.patch
new file mode 100644
index 000000000000..42b01ce53263
--- /dev/null
+++ b/fix-75-yes-terminus.patch
@@ -0,0 +1,11 @@
+--- ./75-yes-terminus.conf	2019-01-01 19:32:47.000000000 +0100
++++ ./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.install b/terminus-font.install
deleted file mode 100644
index cda58b10f546..000000000000
--- a/terminus-font.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  fc-cache -fs
-  mkfontscale usr/share/fonts/misc
-  mkfontdir usr/share/fonts/misc
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}