From 1325b96c19d495b978ec29af3c58feb95e0ebf1e Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 12 Jul 2023 20:17:47 -0700 Subject: [PATCH 1/2] wezterm: update to 20230712. Signed-off-by: Joseph Benden --- srcpkgs/wezterm/patches/remove-libgit.patch | 59 --------------------- srcpkgs/wezterm/template | 10 ++-- 2 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 srcpkgs/wezterm/patches/remove-libgit.patch diff --git a/srcpkgs/wezterm/patches/remove-libgit.patch b/srcpkgs/wezterm/patches/remove-libgit.patch deleted file mode 100644 index fea47b7600138..0000000000000 --- a/srcpkgs/wezterm/patches/remove-libgit.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/config/build.rs 2022-09-05 10:28:02.000000000 -0700 -+++ b/config/build.rs 2022-11-16 11:25:28.938783238 -0700 -@@ -13,44 +13,6 @@ - } - } else { - // Otherwise we'll derive it from the git information -- -- if let Ok(repo) = git2::Repository::discover(".") { -- if let Ok(ref_head) = repo.find_reference("HEAD") { -- let repo_path = repo.path().to_path_buf(); -- -- if let Ok(resolved) = ref_head.resolve() { -- if let Some(name) = resolved.name() { -- let path = repo_path.join(name); -- if path.exists() { -- println!( -- "cargo:rerun-if-changed={}", -- path.canonicalize().unwrap().display() -- ); -- } -- } -- } -- } -- } -- -- let head = Path::new("../.git/HEAD"); -- if head.exists() { -- let head = head.canonicalize().unwrap(); -- println!("cargo:rerun-if-changed={}", head.display()); -- if let Ok(output) = std::process::Command::new("git") -- .args(&[ -- "-c", -- "core.abbrev=8", -- "show", -- "-s", -- "--format=%cd-%h", -- "--date=format:%Y%m%d-%H%M%S", -- ]) -- .output() -- { -- let info = String::from_utf8_lossy(&output.stdout); -- ci_tag = info.trim().to_string(); -- } -- } - } - - let target = std::env::var("TARGET").unwrap_or_else(|_| "unknown".to_string()); ---- a/config/Cargo.toml 2022-09-05 10:28:02.000000000 -0700 -+++ b/config/Cargo.toml 2022-11-16 11:26:47.258458105 -0700 -@@ -10,9 +10,6 @@ - [dev-dependencies] - env_logger = "0.9" - --[build-dependencies] --git2 = { version = "0.16", default-features = false } -- - [features] - distro-defaults = [] - diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template index c3041986e3955..d16879e19c2b7 100644 --- a/srcpkgs/wezterm/template +++ b/srcpkgs/wezterm/template @@ -1,15 +1,15 @@ # Template file for 'wezterm' pkgname=wezterm -version=20230408 -revision=2 -_srcver=${version}-112425-69ae8472 +version=20230712 +revision=1 +_srcver=${version}-072601-f4abf8fd archs="x86_64* i686* aarch64* arm*" # ring build_style=cargo configure_args="--no-default-features --features wezterm-gui/distro-defaults,wezterm-gui/wayland" hostmakedepends="pkg-config" makedepends="fontconfig-devel freetype-devel harfbuzz-devel openssl-devel libssh2-devel libX11-devel libxkbcommon-devel wayland-devel xcb-util-devel - xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel" + xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel zlib-devel" depends="noto-fonts-emoji fonts-roboto-ttf wezterm-terminfo-${version}_${revision}" short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer" maintainer="Joseph Benden " @@ -17,7 +17,7 @@ license="MIT" homepage="https://wezfurlong.org/wezterm/" changelog="https://wezfurlong.org/wezterm/changelog.html" distfiles="https://github.com/wez/wezterm/releases/download/${_srcver}/wezterm-${_srcver}-src.tar.gz" -checksum=8f5c15db8341b0c067d7a5f6f06d4af17d5c24526e908eac4bd70156cd565800 +checksum=cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8 post_patch() { cargo update From edc683b92921533c95f8e2cbc0930c20a15e7cf1 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Wed, 12 Jul 2023 20:17:47 -0700 Subject: [PATCH 2/2] wezterm: update to 20230712. Signed-off-by: Joseph Benden --- srcpkgs/wezterm/template | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template index d16879e19c2b7..0e900bfd48782 100644 --- a/srcpkgs/wezterm/template +++ b/srcpkgs/wezterm/template @@ -19,10 +19,6 @@ changelog="https://wezfurlong.org/wezterm/changelog.html" distfiles="https://github.com/wez/wezterm/releases/download/${_srcver}/wezterm-${_srcver}-src.tar.gz" checksum=cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8 -post_patch() { - cargo update -} - do_check() { # NOTE: cannot use build_style cargo do_check because of --release flag. # NOTE: e2e::sftp is skipped due to missing ssh