[-- Attachment #1: Type: text/plain, Size: 325 bytes --] There is a new pull request by faulesocke against master on the void-packages repository https://github.com/faulesocke/void-packages terminus2 https://github.com/void-linux/void-packages/pull/25083 terminus-font: Include OTB files A patch file from https://github.com/void-linux/void-packages/pull/25083.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-terminus2-25083.patch --] [-- Type: text/x-diff, Size: 2604 bytes --] From 80a2273ec52d56106f28c75d3230f992c879e464 Mon Sep 17 00:00:00 2001 From: Urs Schulz <voidpkgs@ursschulz.de> Date: Thu, 24 Sep 2020 09:18:15 +0200 Subject: [PATCH] terminus-font: Include OTB files --- .../terminus-font-ll2-td1-otb/files/otbconvert.pe | 7 +++++++ srcpkgs/terminus-font/files/otbconvert.pe | 7 +++++++ srcpkgs/terminus-font/template | 15 ++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100755 srcpkgs/terminus-font-ll2-td1-otb/files/otbconvert.pe create mode 100755 srcpkgs/terminus-font/files/otbconvert.pe diff --git a/srcpkgs/terminus-font-ll2-td1-otb/files/otbconvert.pe b/srcpkgs/terminus-font-ll2-td1-otb/files/otbconvert.pe new file mode 100755 index 00000000000..2d26b344303 --- /dev/null +++ b/srcpkgs/terminus-font-ll2-td1-otb/files/otbconvert.pe @@ -0,0 +1,7 @@ +#!/usr/bin/fontforge +i=1 +while ( i<$argc ) + Open($argv[i]) + Generate($argv[i]:r + ".otb") + i = i+1 +endloop diff --git a/srcpkgs/terminus-font/files/otbconvert.pe b/srcpkgs/terminus-font/files/otbconvert.pe new file mode 100755 index 00000000000..2d26b344303 --- /dev/null +++ b/srcpkgs/terminus-font/files/otbconvert.pe @@ -0,0 +1,7 @@ +#!/usr/bin/fontforge +i=1 +while ( i<$argc ) + Open($argv[i]) + Generate($argv[i]:r + ".otb") + i = i+1 +endloop diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 4a296a8f0ce..a6ad0e7d82c 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -1,23 +1,32 @@ # Template file for 'terminus-font' pkgname=terminus-font version=4.48 -revision=2 +revision=4 archs=noarch build_style=gnu-configure configure_args="--x11dir=/usr/share/fonts/X11/misc --psfdir=/usr/share/kbd/consolefonts" make_install_args="install install-pcf-8bit" hostmakedepends="python3 bdftopcf font-util" +makedepends="fontforge" depends="font-util" short_desc="Clean, fixed width bitmap font" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Urs Schulz <voidpkgs@ursschulz.de>" license="OFL-1.1, GPL-2.0-or-later" homepage="http://terminus-font.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af -font_dirs="/usr/share/fonts/X11/misc" +font_dirs="/usr/share/fonts/X11/misc /usr/share/fonts/misc" + +post_build() { + $FILESDIR/otbconvert.pe *.bdf +} post_install() { vlicense OFL.TXT OFL.txt vinstall 75-yes-terminus.conf 644 etc/fonts/conf.avail + + for i in *.otb; do + vinstall $i 0644 /usr/share/fonts/misc + done }
[-- Attachment #1: Type: text/plain, Size: 235 bytes --] New comment by Chocimier on void-packages repository https://github.com/void-linux/void-packages/pull/25083#issuecomment-699130561 Comment: Can you ask upstream will they provide that variant as well? They release rarely but steady.
[-- Attachment #1: Type: text/plain, Size: 181 bytes --] New comment by leahneukirchen on void-packages repository https://github.com/void-linux/void-packages/pull/25083#issuecomment-702041324 Comment: fontforge must be hostmakedepends
[-- Attachment #1: Type: text/plain, Size: 330 bytes --] There is an updated pull request by faulesocke against master on the void-packages repository https://github.com/faulesocke/void-packages terminus2 https://github.com/void-linux/void-packages/pull/25083 terminus-font: Include OTB files A patch file from https://github.com/void-linux/void-packages/pull/25083.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-terminus2-25083.patch --] [-- Type: text/x-diff, Size: 2100 bytes --] From 99446ac512e9e4017c14ddeb4997f3c3844d4938 Mon Sep 17 00:00:00 2001 From: Urs Schulz <voidpkgs@ursschulz.de> Date: Thu, 24 Sep 2020 09:18:15 +0200 Subject: [PATCH] terminus-font: Include OTB files --- srcpkgs/terminus-font/files/otbconvert.pe | 7 +++++++ srcpkgs/terminus-font/template | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/terminus-font/files/otbconvert.pe diff --git a/srcpkgs/terminus-font/files/otbconvert.pe b/srcpkgs/terminus-font/files/otbconvert.pe new file mode 100755 index 00000000000..2d26b344303 --- /dev/null +++ b/srcpkgs/terminus-font/files/otbconvert.pe @@ -0,0 +1,7 @@ +#!/usr/bin/fontforge +i=1 +while ( i<$argc ) + Open($argv[i]) + Generate($argv[i]:r + ".otb") + i = i+1 +endloop diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 4a296a8f0ce..d479e215b64 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -1,23 +1,31 @@ # Template file for 'terminus-font' pkgname=terminus-font version=4.48 -revision=2 +revision=4 archs=noarch build_style=gnu-configure configure_args="--x11dir=/usr/share/fonts/X11/misc --psfdir=/usr/share/kbd/consolefonts" make_install_args="install install-pcf-8bit" -hostmakedepends="python3 bdftopcf font-util" +hostmakedepends="python3 bdftopcf font-util fontforge" depends="font-util" short_desc="Clean, fixed width bitmap font" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Urs Schulz <voidpkgs@ursschulz.de>" license="OFL-1.1, GPL-2.0-or-later" homepage="http://terminus-font.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af -font_dirs="/usr/share/fonts/X11/misc" +font_dirs="/usr/share/fonts/X11/misc /usr/share/fonts/misc" + +post_build() { + $FILESDIR/otbconvert.pe *.bdf +} post_install() { vlicense OFL.TXT OFL.txt vinstall 75-yes-terminus.conf 644 etc/fonts/conf.avail + + for i in *.otb; do + vinstall $i 0644 /usr/share/fonts/misc + done }
[-- Attachment #1: Type: text/plain, Size: 190 bytes --] New comment by faulesocke on void-packages repository https://github.com/void-linux/void-packages/pull/25083#issuecomment-712765782 Comment: Fixed this and cleaned the PR up a little bit.
[-- Attachment #1: Type: text/plain, Size: 330 bytes --] There is an updated pull request by faulesocke against master on the void-packages repository https://github.com/faulesocke/void-packages terminus2 https://github.com/void-linux/void-packages/pull/25083 terminus-font: Include OTB files A patch file from https://github.com/void-linux/void-packages/pull/25083.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-terminus2-25083.patch --] [-- Type: text/x-diff, Size: 2086 bytes --] From bfd58418e4a411b07d1021e19e2765f42c63786e Mon Sep 17 00:00:00 2001 From: Urs Schulz <voidpkgs@ursschulz.de> Date: Thu, 24 Sep 2020 09:18:15 +0200 Subject: [PATCH] terminus-font: Include OTB files --- srcpkgs/terminus-font/files/otbconvert.pe | 7 +++++++ srcpkgs/terminus-font/template | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/terminus-font/files/otbconvert.pe diff --git a/srcpkgs/terminus-font/files/otbconvert.pe b/srcpkgs/terminus-font/files/otbconvert.pe new file mode 100755 index 00000000000..2d26b344303 --- /dev/null +++ b/srcpkgs/terminus-font/files/otbconvert.pe @@ -0,0 +1,7 @@ +#!/usr/bin/fontforge +i=1 +while ( i<$argc ) + Open($argv[i]) + Generate($argv[i]:r + ".otb") + i = i+1 +endloop diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 92864dd6450..ec75818e7c0 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -1,22 +1,30 @@ # Template file for 'terminus-font' pkgname=terminus-font version=4.48 -revision=3 +revision=4 build_style=gnu-configure configure_args="--x11dir=/usr/share/fonts/X11/misc --psfdir=/usr/share/kbd/consolefonts" make_install_args="install install-pcf-8bit" -hostmakedepends="python3 bdftopcf font-util" +hostmakedepends="python3 bdftopcf font-util fontforge" depends="font-util" short_desc="Clean, fixed width bitmap font" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Urs Schulz <voidpkgs@ursschulz.de>" license="OFL-1.1, GPL-2.0-or-later" homepage="http://terminus-font.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af -font_dirs="/usr/share/fonts/X11/misc" +font_dirs="/usr/share/fonts/X11/misc /usr/share/fonts/misc" + +post_build() { + $FILESDIR/otbconvert.pe *.bdf +} post_install() { vlicense OFL.TXT OFL.txt vinstall 75-yes-terminus.conf 644 etc/fonts/conf.avail + + for i in *.otb; do + vinstall $i 0644 /usr/share/fonts/misc + done }
[-- Attachment #1: Type: text/plain, Size: 330 bytes --] There is an updated pull request by faulesocke against master on the void-packages repository https://github.com/faulesocke/void-packages terminus2 https://github.com/void-linux/void-packages/pull/25083 terminus-font: Include OTB files A patch file from https://github.com/void-linux/void-packages/pull/25083.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-terminus2-25083.patch --] [-- Type: text/x-diff, Size: 2351 bytes --] From 02ac9f67528abb406db1cccee413b1bd7829de74 Mon Sep 17 00:00:00 2001 From: Urs Schulz <voidpkgs@ursschulz.de> Date: Thu, 24 Sep 2020 09:18:15 +0200 Subject: [PATCH] terminus-font: Include OTB files. These are required since pango dropped support for non-opentype bitmap fonts. Without generating these OTB files many applications can't display the terminus font anymore. --- srcpkgs/terminus-font/files/otbconvert.pe | 9 +++++++++ srcpkgs/terminus-font/template | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/terminus-font/files/otbconvert.pe diff --git a/srcpkgs/terminus-font/files/otbconvert.pe b/srcpkgs/terminus-font/files/otbconvert.pe new file mode 100755 index 00000000000..290661924c1 --- /dev/null +++ b/srcpkgs/terminus-font/files/otbconvert.pe @@ -0,0 +1,9 @@ +#!/usr/bin/fontforge +# this file was stolen from +# https://aur.archlinux.org/packages/terminus-font-td1-otb/ +i=1 +while ( i<$argc ) + Open($argv[i]) + Generate($argv[i]:r + ".otb") + i = i+1 +endloop diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 92864dd6450..ec75818e7c0 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -1,22 +1,30 @@ # Template file for 'terminus-font' pkgname=terminus-font version=4.48 -revision=3 +revision=4 build_style=gnu-configure configure_args="--x11dir=/usr/share/fonts/X11/misc --psfdir=/usr/share/kbd/consolefonts" make_install_args="install install-pcf-8bit" -hostmakedepends="python3 bdftopcf font-util" +hostmakedepends="python3 bdftopcf font-util fontforge" depends="font-util" short_desc="Clean, fixed width bitmap font" -maintainer="Orphaned <orphan@voidlinux.org>" +maintainer="Urs Schulz <voidpkgs@ursschulz.de>" license="OFL-1.1, GPL-2.0-or-later" homepage="http://terminus-font.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=34799c8dd5cec7db8016b4a615820dfb43b395575afbb24fc17ee19c869c94af -font_dirs="/usr/share/fonts/X11/misc" +font_dirs="/usr/share/fonts/X11/misc /usr/share/fonts/misc" + +post_build() { + $FILESDIR/otbconvert.pe *.bdf +} post_install() { vlicense OFL.TXT OFL.txt vinstall 75-yes-terminus.conf 644 etc/fonts/conf.avail + + for i in *.otb; do + vinstall $i 0644 /usr/share/fonts/misc + done }
[-- Attachment #1: Type: text/plain, Size: 526 bytes --] New comment by ahesford on void-packages repository https://github.com/void-linux/void-packages/pull/25083#issuecomment-748564562 Comment: I believe you mentioned on IRC that you have requested that upstream either include the OTB files directly or provide a build target to convert other formats to OTB. If upstream obliges, a version bump will address this. If they refuse, I don't think Void should assume responsibility for converting font formats during packaging. Users can always convert fonts should the need arise.
[-- Attachment #1: Type: text/plain, Size: 166 bytes --] There's a closed pull request on the void-packages repository terminus-font: Include OTB files https://github.com/void-linux/void-packages/pull/25083 Description:
[-- Attachment #1: Type: text/plain, Size: 307 bytes --] New comment by faulesocke on void-packages repository https://github.com/void-linux/void-packages/pull/25083#issuecomment-748594231 Comment: Upstream replied yesterday and is aware of the problem. A new release offering multiple conversion methods was promised to come this year. I'll open a new PR then.