pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/wezterm
Module Name: pkgsrc
Committed By: ktnb
Date: Sat Apr 18 14:56:36 UTC 2026
Modified Files:
pkgsrc/x11/wezterm: Makefile distinfo
Added Files:
pkgsrc/x11/wezterm/patches: patch-async__ossl_Cargo.toml
patch-config_src_font.rs patch-wezterm-font_Cargo.toml
patch-wezterm-font_src_lib.rs patch-wezterm-font_src_locator_mod.rs
Log Message:
wezterm: added Darwin support
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/wezterm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/wezterm/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/wezterm/patches/patch-async__ossl_Cargo.toml \
pkgsrc/x11/wezterm/patches/patch-config_src_font.rs \
pkgsrc/x11/wezterm/patches/patch-wezterm-font_Cargo.toml \
pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_lib.rs \
pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_locator_mod.rs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/wezterm/Makefile
diff -u pkgsrc/x11/wezterm/Makefile:1.10 pkgsrc/x11/wezterm/Makefile:1.11
--- pkgsrc/x11/wezterm/Makefile:1.10 Fri Apr 3 15:39:49 2026
+++ pkgsrc/x11/wezterm/Makefile Sat Apr 18 14:56:36 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2026/04/03 15:39:49 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2026/04/18 14:56:36 ktnb Exp $
# VERSION must match the output of:
# git -c "core.abbrev=8" show -s "--format=%cd-%h" "--date=format:%Y%m%d-%H%M%S"
@@ -94,12 +94,16 @@ do-install:
.include "cargo-depends.mk"
.include "../../lang/rust/cargo.mk"
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND:tl} == yes
.include "../../devel/wayland/buildlink3.mk"
+.endif
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/harfbuzz/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+#.include "../../lang/libunwind/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxkbcommon/buildlink3.mk"
Index: pkgsrc/x11/wezterm/distinfo
diff -u pkgsrc/x11/wezterm/distinfo:1.6 pkgsrc/x11/wezterm/distinfo:1.7
--- pkgsrc/x11/wezterm/distinfo:1.6 Fri Apr 3 15:37:48 2026
+++ pkgsrc/x11/wezterm/distinfo Sat Apr 18 14:56:36 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2026/04/03 15:37:48 wiz Exp $
+$NetBSD: distinfo,v 1.7 2026/04/18 14:56:36 ktnb Exp $
BLAKE2s (addr2line-0.25.1.crate) = cc5c422ec48ccef5c2c46379d2f600644609490afafea5020f2020815d1146e6
SHA512 (addr2line-0.25.1.crate) = c400f3b6ccaff8a1c0d7d82c708a1784b8fd5ba64b6e420e85819d59b1cadb55fa59c852925093b921469f272d1d5140cf12f013ae75d1e1bc85021097df8fc2
@@ -2197,5 +2197,10 @@ BLAKE2s (zvariant_utils-2.1.0.crate) = b
SHA512 (zvariant_utils-2.1.0.crate) = 345b70d1106b37df41426efdb1ba49bf270e00898381c2a8021b5761c59efdea55def45cb2e2598b130b6cba8733503f3997a55578bca90867ab3e8f2346f80e
Size (zvariant_utils-2.1.0.crate) = 7043 bytes
SHA1 (patch-Cargo.toml) = 8dc1fdccd70431cfd3950c0326236e243432a19d
+SHA1 (patch-async__ossl_Cargo.toml) = 5aca84ebb0cf82014278e22f7263f54171bd0c2d
+SHA1 (patch-config_src_font.rs) = 30d81cff72a0aa6e839642c11543f998feed3d60
SHA1 (patch-deps_freetype_build.rs) = 1f5d4ab3aba583e4ed5912e316948a6d3e2f68f3
SHA1 (patch-deps_harfbuzz_build.rs) = 6b77be70aa4ffb975ffd55488fb2b02032091f10
+SHA1 (patch-wezterm-font_Cargo.toml) = 2354517d3857b7650a2c3660c870bc22c84d1df7
+SHA1 (patch-wezterm-font_src_lib.rs) = 355b94198b195bf807f80680d2f0b90b1470cdfa
+SHA1 (patch-wezterm-font_src_locator_mod.rs) = 93b31e9dc5fbc5c1f6bc485fbed3b111e62ac025
Added files:
Index: pkgsrc/x11/wezterm/patches/patch-async__ossl_Cargo.toml
diff -u /dev/null pkgsrc/x11/wezterm/patches/patch-async__ossl_Cargo.toml:1.1
--- /dev/null Sat Apr 18 14:56:37 2026
+++ pkgsrc/x11/wezterm/patches/patch-async__ossl_Cargo.toml Sat Apr 18 14:56:36 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-async__ossl_Cargo.toml,v 1.1 2026/04/18 14:56:36 ktnb Exp $
+
+Don't use vendored OpenSSL on Darwin
+
+--- async_ossl/Cargo.toml.orig 2026-01-17 15:44:28.000000000 +0000
++++ async_ossl/Cargo.toml
+@@ -11,9 +11,9 @@ publish = false
+ [dependencies]
+ async-io.workspace = true
+
+-[target.'cfg(not(any(windows, target_os="macos")))'.dependencies]
++[target.'cfg(not(windows))'.dependencies]
+ openssl.workspace = true
+
+-[target.'cfg(any(windows, target_os="macos"))'.dependencies]
++[target.'cfg(windows)'.dependencies]
+ openssl = { workspace = true, features=["vendored"] }
+
Index: pkgsrc/x11/wezterm/patches/patch-config_src_font.rs
diff -u /dev/null pkgsrc/x11/wezterm/patches/patch-config_src_font.rs:1.1
--- /dev/null Sat Apr 18 14:56:37 2026
+++ pkgsrc/x11/wezterm/patches/patch-config_src_font.rs Sat Apr 18 14:56:36 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-config_src_font.rs,v 1.1 2026/04/18 14:56:36 ktnb Exp $
+
+Use fontconfig unless distro-defaults is disabled on Darwin
+
+--- config/src/font.rs.orig 2026-01-17 15:44:28.000000000 +0000
++++ config/src/font.rs
+@@ -678,7 +678,7 @@ impl Default for FontLocatorSelection {
+ fn default() -> Self {
+ if cfg!(windows) {
+ FontLocatorSelection::Gdi
+- } else if cfg!(target_os = "macos") {
++ } else if cfg!(all(target_os = "macos", not(feature = "distro-defaults"))) {
+ FontLocatorSelection::CoreText
+ } else {
+ FontLocatorSelection::FontConfig
Index: pkgsrc/x11/wezterm/patches/patch-wezterm-font_Cargo.toml
diff -u /dev/null pkgsrc/x11/wezterm/patches/patch-wezterm-font_Cargo.toml:1.1
--- /dev/null Sat Apr 18 14:56:37 2026
+++ pkgsrc/x11/wezterm/patches/patch-wezterm-font_Cargo.toml Sat Apr 18 14:56:36 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-wezterm-font_Cargo.toml,v 1.1 2026/04/18 14:56:36 ktnb Exp $
+
+Always use fontconfig, even on Darwin
+
+--- wezterm-font/Cargo.toml.orig 2026-04-15 15:27:09.918072082 +0000
++++ wezterm-font/Cargo.toml
+@@ -40,7 +40,7 @@ wezterm-input-types.workspace = true
+ wezterm-term = { workspace=true, features=["use_serde"] }
+ wezterm-toast-notification.workspace = true
+
+-[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
++[target.'cfg(unix)'.dependencies]
+ fontconfig.workspace = true
+
+ [target."cfg(windows)".dependencies]
Index: pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_lib.rs
diff -u /dev/null pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_lib.rs:1.1
--- /dev/null Sat Apr 18 14:56:37 2026
+++ pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_lib.rs Sat Apr 18 14:56:36 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-wezterm-font_src_lib.rs,v 1.1 2026/04/18 14:56:36 ktnb Exp $
+
+Use fontconfig on Darwin as well
+
+--- wezterm-font/src/lib.rs.orig 2026-01-17 15:44:28.000000000 +0000
++++ wezterm-font/src/lib.rs
+@@ -32,7 +32,7 @@ pub mod rasterizer;
+ pub mod shaper;
+ pub mod units;
+
+-#[cfg(all(unix, not(target_os = "macos")))]
++#[cfg(unix)]
+ pub mod fcwrap;
+
+ pub use crate::rasterizer::RasterizedGlyph;
Index: pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_locator_mod.rs
diff -u /dev/null pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_locator_mod.rs:1.1
--- /dev/null Sat Apr 18 14:56:37 2026
+++ pkgsrc/x11/wezterm/patches/patch-wezterm-font_src_locator_mod.rs Sat Apr 18 14:56:36 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-wezterm-font_src_locator_mod.rs,v 1.1 2026/04/18 14:56:36 ktnb Exp $
+
+Use fontconfig on Darwin as well.
+
+--- wezterm-font/src/locator/mod.rs.orig 2026-01-17 15:44:28.000000000 +0000
++++ wezterm-font/src/locator/mod.rs
+@@ -8,7 +8,7 @@ use std::path::PathBuf;
+ use std::sync::Arc;
+
+ pub mod core_text;
+-#[cfg(all(unix, not(target_os = "macos")))]
++#[cfg(unix)]
+ pub mod font_config;
+ pub mod gdi;
+
+@@ -222,9 +222,9 @@ pub trait FontLocator {
+ pub fn new_locator(locator: FontLocatorSelection) -> Arc<dyn FontLocator + Send + Sync> {
+ match locator {
+ FontLocatorSelection::FontConfig => {
+- #[cfg(all(unix, not(target_os = "macos")))]
++ #[cfg(unix)]
+ return Arc::new(font_config::FontConfigFontLocator {});
+- #[cfg(not(all(unix, not(target_os = "macos"))))]
++ #[cfg(not(unix))]
+ panic!("fontconfig not compiled in");
+ }
+ FontLocatorSelection::CoreText => {
Home |
Main Index |
Thread Index |
Old Index