[PR PATCH] wezterm: default to system monospace font

[PR PATCH] wezterm: default to system monospace font

[jbenden]

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

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

https://github.com/jbenden/void-packages wezterm-monospace
https://github.com/void-linux/void-packages/pull/40741

wezterm: default to system monospace font
#### Details
This patches Wezterm to always select the `monospace` font; as opposed to requiring the `JetBrains Mono` font.

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

I tested the modifications on Void x86_64-musl, ensured no user fonts were installed - which by proxy include no `JetBrains Mono`.

#### References
See: #40736


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-monospace-40741.patch --]
[-- Type: text/x-diff, Size: 1699 bytes --]

From 76ba376c6431099c3bd0f7296cfc43b847f48da6 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 24 Nov 2022 13:50:16 -0700
Subject: [PATCH] wezterm: default to system monospace font

Fixes: #40736
Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/wezterm/patches/monospace.patch | 11 +++++++++++
 srcpkgs/wezterm/template                |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wezterm/patches/monospace.patch

diff --git a/srcpkgs/wezterm/patches/monospace.patch b/srcpkgs/wezterm/patches/monospace.patch
new file mode 100644
index 000000000000..ceebf0f83d8a
--- /dev/null
+++ b/srcpkgs/wezterm/patches/monospace.patch
@@ -0,0 +1,11 @@
+--- a/config/src/font.rs	2022-09-05 10:28:02.000000000 -0700
++++ b/config/src/font.rs	2022-11-24 11:27:15.115251410 -0700
+@@ -407,7 +407,7 @@
+ impl Default for FontAttributes {
+     fn default() -> Self {
+         Self {
+-            family: "JetBrains Mono".into(),
++            family: "monospace".into(),
+             weight: FontWeight::default(),
+             stretch: FontStretch::default(),
+             style: FontStyle::Normal,
diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
index 936f2051d4ee..5a390a313e53 100644
--- a/srcpkgs/wezterm/template
+++ b/srcpkgs/wezterm/template
@@ -27,7 +27,9 @@ do_check() {
 	cargo test --target ${RUST_TARGET} --workspace --locked -- \
 		--skip e2e::sftp \
 		--skip escape::action_size \
-		--skip surface::line::storage::test::memory_usage
+		--skip surface::line::storage::test::memory_usage \
+		--skip shapecache::test::ligatures_fira \
+		--skip shapecache::test::ligatures_jetbrains
 }
 
 do_install() {

Re: wezterm: default to system monospace font

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/40741#issuecomment-1326836547

Comment:
this should revbump the template

Re: [PR PATCH] [Updated] wezterm: default to system monospace font

[jbenden]

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

There is an updated pull request by jbenden against master on the void-packages repository

https://github.com/jbenden/void-packages wezterm-monospace
https://github.com/void-linux/void-packages/pull/40741

wezterm: default to system monospace font
#### Details
This patches Wezterm to always select the `monospace` font; as opposed to requiring the `JetBrains Mono` font.

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

I tested the modifications on Void x86_64-musl, ensured no user fonts were installed - which by proxy include no `JetBrains Mono`.

#### References
See: #40736


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-monospace-40741.patch --]
[-- Type: text/x-diff, Size: 1907 bytes --]

From 63f6b34b7d9037e3d44cca841152e798fcd19764 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 24 Nov 2022 13:50:16 -0700
Subject: [PATCH] wezterm: default to system monospace font

Fixes: #40736
Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/wezterm/patches/monospace.patch | 11 +++++++++++
 srcpkgs/wezterm/template                |  6 ++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wezterm/patches/monospace.patch

diff --git a/srcpkgs/wezterm/patches/monospace.patch b/srcpkgs/wezterm/patches/monospace.patch
new file mode 100644
index 000000000000..ceebf0f83d8a
--- /dev/null
+++ b/srcpkgs/wezterm/patches/monospace.patch
@@ -0,0 +1,11 @@
+--- a/config/src/font.rs	2022-09-05 10:28:02.000000000 -0700
++++ b/config/src/font.rs	2022-11-24 11:27:15.115251410 -0700
+@@ -407,7 +407,7 @@
+ impl Default for FontAttributes {
+     fn default() -> Self {
+         Self {
+-            family: "JetBrains Mono".into(),
++            family: "monospace".into(),
+             weight: FontWeight::default(),
+             stretch: FontStretch::default(),
+             style: FontStyle::Normal,
diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
index 936f2051d4ee..8c075920877c 100644
--- a/srcpkgs/wezterm/template
+++ b/srcpkgs/wezterm/template
@@ -1,7 +1,7 @@
 # Template file for 'wezterm'
 pkgname=wezterm
 version=20221119
-revision=1
+revision=2
 _srcver=${version}-145034-49b9839f
 archs="x86_64* i686* aarch64* arm*" # ring
 build_style=cargo
@@ -27,7 +27,9 @@ do_check() {
 	cargo test --target ${RUST_TARGET} --workspace --locked -- \
 		--skip e2e::sftp \
 		--skip escape::action_size \
-		--skip surface::line::storage::test::memory_usage
+		--skip surface::line::storage::test::memory_usage \
+		--skip shapecache::test::ligatures_fira \
+		--skip shapecache::test::ligatures_jetbrains
 }
 
 do_install() {

Re: wezterm: default to system monospace font

[jbenden]

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

New comment by jbenden on void-packages repository

https://github.com/void-linux/void-packages/pull/40741#issuecomment-1326837977

Comment:
@classabbyamp Thanks!

Re: [PR PATCH] [Merged]: wezterm: default to system monospace font

[classabbyamp]

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

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

wezterm: default to system monospace font
https://github.com/void-linux/void-packages/pull/40741

Description:
#### Details
This patches Wezterm to always select the `monospace` font; as opposed to requiring the `JetBrains Mono` font.

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

I tested the modifications on Void x86_64-musl, ensured no user fonts were installed - which by proxy include no `JetBrains Mono`.

#### References
See: #40736