[PR PATCH] terminus-font: bundled patches as build options

[PR PATCH] terminus-font: bundled patches as build options

[simvux]

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

There is a new pull request by simvux against master on the void-packages repository

https://github.com/simvux/void-packages terminus-font-build-options
https://github.com/void-linux/void-packages/pull/48157

terminus-font: bundled patches as build options
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

The source for terminus includes a couple of patches that can be applied. 

This PR also defaults to applying the centered `~` patch, instead of it being aligned to the top. This is something the creators of terminus themselves say maybe should've been the default. Since most other fonts use center-aligned tilde I took the liberty of applying this patch by default. 

A patch file from https://github.com/void-linux/void-packages/pull/48157.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-terminus-font-build-options-48157.patch --]
[-- Type: text/x-diff, Size: 1492 bytes --]

From f1e5e9b3b5815ffc19f4f5292c6479fdef918672 Mon Sep 17 00:00:00 2001
From: Simon Larsson <simon.larsson-general@protonmail.com>
Date: Wed, 10 Jan 2024 20:55:36 +0100
Subject: [PATCH] terminus-font: bundled patches as build options

---
 srcpkgs/terminus-font/template | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template
index f597fab66bef4..516e4d738eb8b 100644
--- a/srcpkgs/terminus-font/template
+++ b/srcpkgs/terminus-font/template
@@ -1,7 +1,7 @@
 # Template file for 'terminus-font'
 pkgname=terminus-font
 version=4.49.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--x11dir=/usr/share/fonts/X11/misc
  --psfdir=/usr/share/kbd/consolefonts"
@@ -15,6 +15,21 @@ homepage="http://terminus-font.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79
 font_dirs="/usr/share/fonts/X11/misc"
+build_options="ao2 br1 dv1 ge2 gq2 hi2 ij1 ll2 td1"
+build_options_default="td1"
+desc_option_ao2="variation of ascii a"
+desc_option_td1="center aligned tilde ~"
+desc_option_ll1="variation of ascii l"
+desc_option_hi1="higher upper case letters and digits"
+
+do_patch() {
+	for p in $build_options; do
+		if [ $(vopt_if $p true false) = true ]; then
+			echo "applying $p"
+			patch < "alt/$p.diff"
+		fi
+	done
+}
 
 post_install() {
 	vlicense OFL.TXT OFL.txt

Re: terminus-font: bundled patches as build options

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48157#issuecomment-1885649795

Comment:
Build options are a terrible user experience, especially for a font.

As for changing the default---if upstream expresses regret over their decisions, they can change the default. They can't regret their decision that much if they just fixing the glyph.

Re: terminus-font: bundled patches as build options

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48157#issuecomment-1885649795

Comment:
Build options are a terrible user experience, especially for a font.

As for changing the default---if upstream expresses regret over their decisions, they can change the default. They can't regret their decision that much if they aren't just fixing the glyph.

Re: terminus-font: bundled patches as build options

[simvux]

[-- Attachment #1: Type: text/plain, Size: 340 bytes --]

New comment by simvux on void-packages repository

https://github.com/void-linux/void-packages/pull/48157#issuecomment-1885798139

Comment:
what alternative do you propose to not using build options? 

copying the patches from the tar into the patches directory and letting `xbps` automatically apply them? 

this is a build-time patch

Re: terminus-font: bundled patches as build options

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/48157#issuecomment-1885832171

Comment:
The alternative I propose is the status quo. Alternatively, find a way to build the patched variants simultaneously with the original, in such a way that they can coexist, and either offer them all in one package or offer subpackages with the alternatives.

Re: terminus-font: bundled patches as build options

[simvux]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by simvux on void-packages repository

https://github.com/void-linux/void-packages/pull/48157#issuecomment-1885915486

Comment:
in the Arch world, there's numerous `AUR` packages that uses various combinations of these patches. That seemed rather hacky in comparison to just making the build configurable to me. 

Re: [PR PATCH] [Closed]: terminus-font: bundled patches as build options

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 723 bytes --]

There's a closed pull request on the void-packages repository

terminus-font: bundled patches as build options
https://github.com/void-linux/void-packages/pull/48157

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc

The source for terminus includes a couple of patches that can be applied. 

This PR also defaults to applying the centered `~` patch, instead of it being aligned to the top. This is something the creators of terminus themselves say maybe should've been the default. Since most other fonts use center-aligned tilde I took the liberty of applying this patch by default.