* [PR PATCH] wezterm: update to 20230712.
@ 2023-07-13 3:22 jbenden
2023-07-15 5:52 ` classabbyamp
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: jbenden @ 2023-07-13 3:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
There is a new pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages wezterm-20230712
https://github.com/void-linux/void-packages/pull/45008
wezterm: update to 20230712.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/45008.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-20230712-45008.patch --]
[-- Type: text/x-diff, Size: 3766 bytes --]
From 725c49fbe6193061e9f5074985aae542184a6350 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
srcpkgs/wezterm/patches/remove-libgit.patch | 59 ---------------------
srcpkgs/wezterm/template | 8 +--
2 files changed, 4 insertions(+), 63 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 fea47b760013..000000000000
--- 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 c3041986e395..5eb3c3dfb450 100644
--- a/srcpkgs/wezterm/template
+++ b/srcpkgs/wezterm/template
@@ -1,8 +1,8 @@
# 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"
@@ -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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
@ 2023-07-15 5:52 ` classabbyamp
2023-07-15 12:33 ` [PR PATCH] [Updated] " jbenden
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-07-15 5:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45008#issuecomment-1636676368
Comment:
looks like makedepends needs zlib-devel
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
2023-07-15 5:52 ` classabbyamp
@ 2023-07-15 12:33 ` jbenden
2023-07-16 5:49 ` [PR REVIEW] " tranzystorek-io
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: jbenden @ 2023-07-15 12:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages wezterm-20230712
https://github.com/void-linux/void-packages/pull/45008
wezterm: update to 20230712.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/45008.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-20230712-45008.patch --]
[-- Type: text/x-diff, Size: 4300 bytes --]
From 1325b96c19d495b978ec29af3c58feb95e0ebf1e Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
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 fea47b760013..000000000000
--- 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 c3041986e395..d16879e19c2b 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 <joe@benden.us>"
@@ -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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
2023-07-15 5:52 ` classabbyamp
2023-07-15 12:33 ` [PR PATCH] [Updated] " jbenden
@ 2023-07-16 5:49 ` tranzystorek-io
2023-07-16 5:53 ` tranzystorek-io
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: tranzystorek-io @ 2023-07-16 5:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/45008#discussion_r1264612130
Comment:
We can drop this as well
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (2 preceding siblings ...)
2023-07-16 5:49 ` [PR REVIEW] " tranzystorek-io
@ 2023-07-16 5:53 ` tranzystorek-io
2023-07-27 13:36 ` [PR PATCH] [Updated] " jbenden
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: tranzystorek-io @ 2023-07-16 5:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/45008#discussion_r1264612130
Comment:
We can drop the `cargo update` as well
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (3 preceding siblings ...)
2023-07-16 5:53 ` tranzystorek-io
@ 2023-07-27 13:36 ` jbenden
2023-07-27 13:38 ` jbenden
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: jbenden @ 2023-07-27 13:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages wezterm-20230712
https://github.com/void-linux/void-packages/pull/45008
wezterm: update to 20230712.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/45008.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-20230712-45008.patch --]
[-- Type: text/x-diff, Size: 5223 bytes --]
From 1325b96c19d495b978ec29af3c58feb95e0ebf1e Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH 1/2] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
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 <joe@benden.us>"
@@ -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 <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH 2/2] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
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
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (4 preceding siblings ...)
2023-07-27 13:36 ` [PR PATCH] [Updated] " jbenden
@ 2023-07-27 13:38 ` jbenden
2023-07-28 10:51 ` tranzystorek-io
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: jbenden @ 2023-07-27 13:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages wezterm-20230712
https://github.com/void-linux/void-packages/pull/45008
wezterm: update to 20230712.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/45008.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-20230712-45008.patch --]
[-- Type: text/x-diff, Size: 4400 bytes --]
From 2849ef302184400891222725799909d3a0070d5a Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
srcpkgs/wezterm/patches/remove-libgit.patch | 59 ---------------------
srcpkgs/wezterm/template | 14 ++---
2 files changed, 5 insertions(+), 68 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..0e900bfd48782 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 <joe@benden.us>"
@@ -17,11 +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
-
-post_patch() {
- cargo update
-}
+checksum=cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8
do_check() {
# NOTE: cannot use build_style cargo do_check because of --release flag.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (5 preceding siblings ...)
2023-07-27 13:38 ` jbenden
@ 2023-07-28 10:51 ` tranzystorek-io
2023-07-28 11:14 ` [PR PATCH] [Updated] " jbenden
2023-08-01 11:36 ` [PR PATCH] [Merged]: " abenson
8 siblings, 0 replies; 10+ messages in thread
From: tranzystorek-io @ 2023-07-28 10:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/45008#issuecomment-1655482996
Comment:
`wezterm-version` uses git2 as a build dependency and therefore builds it for host. We can fix the cross builds by adding `zlib-devel` to `hostmakedepends` as well.
It's a simpler alternative to adjusting the libgit2 patch I think, but technically it keeps around a small portion of otherwise unneeded code and deps.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (6 preceding siblings ...)
2023-07-28 10:51 ` tranzystorek-io
@ 2023-07-28 11:14 ` jbenden
2023-08-01 11:36 ` [PR PATCH] [Merged]: " abenson
8 siblings, 0 replies; 10+ messages in thread
From: jbenden @ 2023-07-28 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages wezterm-20230712
https://github.com/void-linux/void-packages/pull/45008
wezterm: update to 20230712.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
A patch file from https://github.com/void-linux/void-packages/pull/45008.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-20230712-45008.patch --]
[-- Type: text/x-diff, Size: 4442 bytes --]
From fc15165711efa5ec3aab50ca32898f6cd50836bf Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 12 Jul 2023 20:17:47 -0700
Subject: [PATCH] wezterm: update to 20230712.
Signed-off-by: Joseph Benden <joe@benden.us>
---
srcpkgs/wezterm/patches/remove-libgit.patch | 59 ---------------------
srcpkgs/wezterm/template | 16 +++---
2 files changed, 6 insertions(+), 69 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..d042d3302b154 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"
+hostmakedepends="pkg-config zlib-devel"
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 <joe@benden.us>"
@@ -17,11 +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
-
-post_patch() {
- cargo update
-}
+checksum=cecb56697f912826abea548e948950e7556ff7c706192fa304992811fe0245a8
do_check() {
# NOTE: cannot use build_style cargo do_check because of --release flag.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: wezterm: update to 20230712.
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
` (7 preceding siblings ...)
2023-07-28 11:14 ` [PR PATCH] [Updated] " jbenden
@ 2023-08-01 11:36 ` abenson
8 siblings, 0 replies; 10+ messages in thread
From: abenson @ 2023-08-01 11:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
There's a merged pull request on the void-packages repository
wezterm: update to 20230712.
https://github.com/void-linux/void-packages/pull/45008
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-08-01 11:36 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-13 3:22 [PR PATCH] wezterm: update to 20230712 jbenden
2023-07-15 5:52 ` classabbyamp
2023-07-15 12:33 ` [PR PATCH] [Updated] " jbenden
2023-07-16 5:49 ` [PR REVIEW] " tranzystorek-io
2023-07-16 5:53 ` tranzystorek-io
2023-07-27 13:36 ` [PR PATCH] [Updated] " jbenden
2023-07-27 13:38 ` jbenden
2023-07-28 10:51 ` tranzystorek-io
2023-07-28 11:14 ` [PR PATCH] [Updated] " jbenden
2023-08-01 11:36 ` [PR PATCH] [Merged]: " abenson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).