Adding wezterm

[Kreijstal]

So the reason I share this here instead of like making a pull request is simple wezterm will not compile with the latest release version you need the git master but msys2 prefers tagged/released versions, still wanted to share if someone wants to use wezterm on msys2

cat PKGBUILD

_realname=wezterm
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=20240203-110809-5046fc22
pkgrel=1
pkgdesc="A GPU-accelerated cross-platform terminal emulator and multiplexer (mingw-w64)"
arch=('any')
mingw_arch=('ucrt64' 'clang64' 'clangarm64')
url="https://wezfurlong.org/wezterm/"
license=('MIT')
makedepends=("${MINGW_PACKAGE_PREFIX}-rust" "${MINGW_PACKAGE_PREFIX}-libssh" "${MINGW_PACKAGE_PREFIX}-cc" )
source=("git+https://github.com/wez/wezterm.git#commit=30345b36d8a00fed347e4df5dadd83915a7693fb"
        "0001-Do-not-vendor-on-msys2.patch")
sha256sums=('89822773f12af00cb88ac6af76567fac97b543f4cacaa197c47d04eb228eeb6b'
            '2c495b40e8dcedc8695339c48f93179024588a01f0cf996234df857ca129df77')

prepare() {
  cd "${srcdir}/${_realname}"

  patch -Np1 -i "${srcdir}/0001-Do-not-vendor-on-msys2.patch"

  # if cargo wants to make an HTTP request at build stage, use `cargo fetch --locked` instead
  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
}

build() {
  cd "${srcdir}/${_realname}"

  cargo build --release -p wezterm-gui --features distro-defaults --frozen
  cargo build --release -p wezterm --frozen
}

check() {
  cd "${srcdir}/${_realname}"
 #tests are broken on msys2? please fix
  #cargo test --release --features distro-defaults --frozen
}

package() {
  cd "${srcdir}/${_realname}"

  cargo install \
    --offline \
    --no-track \
    --frozen \
    --path ./wezterm-gui \
    --root "${pkgdir}${MINGW_PREFIX}"

  cargo install \
    --offline \
    --no-track \
    --frozen \
    --path ./wezterm \
    --root "${pkgdir}${MINGW_PREFIX}"


#license found elsewhere
  #install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
}

cat 0001-Do-not-vendor-on-msys2.patch

From 205911569fa262e5957715373c901a5ca4843815 Mon Sep 17 00:00:00 2001
From: kreijstal <[email protected]>
Date: Thu, 22 Aug 2024 20:46:49 +0200
Subject: [PATCH] Do not vendor on msys2

---
 Cargo.lock                  |  1 -
 async_ossl/Cargo.toml       |  2 +-
 wezterm-mux-server/build.rs | 40 +++++++++++++++++++++++++++++++------
 wezterm-ssh/Cargo.toml      |  4 ++--
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6535a2f..09f5140 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2859,7 +2859,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "205ceca5947f473c76f34175de70b15d9e8fadbbdb1bba45d4973037bbdb5fc7"
 dependencies = [
  "cc",
- "libz-sys",
  "openssl-sys",
  "pkg-config",
 ]
diff --git a/async_ossl/Cargo.toml b/async_ossl/Cargo.toml
index bd7d81b..ad87ebe 100644
--- a/async_ossl/Cargo.toml
+++ b/async_ossl/Cargo.toml
@@ -15,5 +15,5 @@ async-io = "2.3"
 openssl = "0.10"

 [target.'cfg(any(windows, target_os="macos"))'.dependencies]
-openssl = { version = "0.10", features=["vendored"] }
+openssl = { version = "0.10" }

diff --git a/wezterm-mux-server/build.rs b/wezterm-mux-server/build.rs
index 44c7b12..20a9cf4 100644
--- a/wezterm-mux-server/build.rs
+++ b/wezterm-mux-server/build.rs
@@ -25,14 +25,42 @@ fn main() {
         .unwrap();
         drop(rcfile);

-        // Obtain MSVC environment so that the rc compiler can find the right headers.
-        // https://github.com/nabijaczleweli/rust-embed-resource/issues/11#issuecomment-603655972
         let target = std::env::var("TARGET").unwrap();
-        if let Some(tool) = cc::windows_registry::find_tool(target.as_str(), "cl.exe") {
-            for (key, value) in tool.env() {
-                std::env::set_var(key, value);
+
+        if target.contains("msvc") {
+            // Obtain MSVC environment so that the rc compiler can find the right headers.
+            // https://github.com/nabijaczleweli/rust-embed-resource/issues/11#issuecomment-603655972
+            if let Some(tool) = cc::windows_registry::find_tool(target.as_str(), "cl.exe") {
+                for (key, value) in tool.env() {
+                    std::env::set_var(key, value);
+                }
             }
+            embed_resource::compile(rcfile_name);
+        } else if target.contains("windows-gnu") {
+            // Instead of hardcoding, rely on environment variables or other dynamic mechanisms
+            let msystem_prefix = std::env::var("MSYSTEM_PREFIX").unwrap_or_else(|_| {
+                panic!("MSYSTEM_PREFIX environment variable is not set.");
+            });
+            let lib_path = Path::new(&msystem_prefix).join("lib");
+            println!("cargo:rustc-link-search={}", lib_path.display());
+            println!("cargo:rustc-link-lib=ssh");
+
+            use std::process::Command;
+            let out_dir = std::env::var("OUT_DIR").unwrap();
+            let status = Command::new("windres")
+                .args(&[
+                    rcfile_name.to_str().unwrap(),
+                    &format!("{}/resource.o", out_dir),
+                ])
+                .status()
+                .expect("Failed to execute windres");
+
+            if !status.success() {
+                panic!("windres failed to compile resource file");
+            }
+
+            println!("cargo:rustc-link-search=native={}", out_dir);
+            println!("cargo:rustc-link-arg={}/resource.o", out_dir);
         }
-        embed_resource::compile(rcfile_name);
     }
 }
diff --git a/wezterm-ssh/Cargo.toml b/wezterm-ssh/Cargo.toml
index bea299a..f526ace 100644
--- a/wezterm-ssh/Cargo.toml
+++ b/wezterm-ssh/Cargo.toml
@@ -30,8 +30,8 @@ log = "0.4"
 portable-pty = { version="0.8", path = "../pty" }
 regex = "1"
 smol = "2.0"
-ssh2 = {version="0.9.3", features=["openssl-on-win32"], optional = true}
-libssh-rs = {version="0.3.2", features=["vendored"], optional = true}
+ssh2 = {version="0.9.3", optional = true}
+libssh-rs = {version="0.3.2" , optional = true}
 #libssh-rs = {path="../../libssh-rs/libssh-rs", features=["vendored"], optional = true}
 thiserror = "1.0"
 socket2 = "0.5"
--
2.46.0

Enjoy, I suppose.

[ognevny]

to disable openssl vendor, just do export OPENSSL_NO_VENDOR=1, you don't have to change features for crates

[ognevny]

embed_resource supports MinGW, there is no need for such workarounds

[Kreijstal]

Feel free to package it once wezterm gets a new release

[Kreijstal]

Thank you for creating #21729