* [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8
@ 2021-05-01 22:39 Logarithmus
2021-05-01 23:32 ` [PR PATCH] [Updated] " Logarithmus
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-01 22:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
There is a new pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages wezterm
https://github.com/void-linux/void-packages/pull/30619
New package: wezterm-20210405.110924.a5bb5be8
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-30619.patch --]
[-- Type: text/x-diff, Size: 5466 bytes --]
From caed5af3e6ae2daffc366fac83bf4fd615e97d74 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Fri, 2 Apr 2021 04:34:12 +0300
Subject: [PATCH] New package: wezterm-20210405.110924.a5bb5be8
---
.../wezterm/patches/00-cargo-resolver.patch | 32 ++++++++++++
srcpkgs/wezterm/patches/01-sysdeps.patch | 38 ++++++++++++++
srcpkgs/wezterm/template | 50 +++++++++++++++++++
3 files changed, 120 insertions(+)
create mode 100644 srcpkgs/wezterm/patches/00-cargo-resolver.patch
create mode 100644 srcpkgs/wezterm/patches/01-sysdeps.patch
create mode 100644 srcpkgs/wezterm/template
diff --git a/srcpkgs/wezterm/patches/00-cargo-resolver.patch b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
new file mode 100644
index 000000000000..0b5d4385abcf
--- /dev/null
+++ b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
@@ -0,0 +1,32 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [workspace]
+ members = ["wezterm-mux-server", "wezterm", "wezterm-gui", "strip-ansi-escapes", "wezterm-ssh"]
+ resolver = "2"
+--- async_ossl/Cargo.toml
++++ async_ossl/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "async_ossl"
+ version = "0.1.0"
+--- wezterm-gui/Cargo.toml
++++ wezterm-gui/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-gui"
+ version = "0.1.0"
+--- wezterm-mux-server/Cargo.toml
++++ wezterm-mux-server/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-mux-server"
+ version = "0.1.0"
diff --git a/srcpkgs/wezterm/patches/01-sysdeps.patch b/srcpkgs/wezterm/patches/01-sysdeps.patch
new file mode 100644
index 000000000000..01764ddfb8ff
--- /dev/null
+++ b/srcpkgs/wezterm/patches/01-sysdeps.patch
@@ -0,0 +1,38 @@
+--- deps/freetype/build.rs
++++ deps/freetype/build.rs
+@@ -74,9 +74,16 @@ fn freetype() {
+ }
+
+ fn main() {
+- zlib();
+- libpng();
+- freetype();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=z");
++ println!("cargo:rustc-link-lib=png");
++ println!("cargo:rustc-link-lib=freetype");
++ } else {
++ zlib();
++ libpng();
++ freetype();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
+--- deps/harfbuzz/build.rs
++++ deps/harfbuzz/build.rs
+@@ -45,7 +45,12 @@ fn emit_libdirs(p: &Path) {
+ }
+
+ fn main() {
+- harfbuzz();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=harfbuzz");
++ } else {
++ harfbuzz();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
new file mode 100644
index 000000000000..229d740e3b52
--- /dev/null
+++ b/srcpkgs/wezterm/template
@@ -0,0 +1,50 @@
+# Template file for 'wezterm'
+pkgname=wezterm
+version=20210405.110924.a5bb5be8
+revision=1
+_version=${version//./-}
+wrksrc="${pkgname}-${_version}"
+build_style=cargo
+hostmakedepends="pkgconf python3"
+makedepends="fontconfig-devel libxcb-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-wm-devel libxkbcommon-devel libX11-devel wayland-devel openssl-devel zlib-devel
+ harfbuzz-devel freetype-devel libpng-devel"
+depends="libxkbcommon-x11 hicolor-icon-theme"
+short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer"
+maintainer="Artur Sinila <freesoftware@logarithmus.dev>"
+license="MIT"
+homepage="https://github.com/wez/wezterm"
+changelog="https://raw.githubusercontent.com/wez/wezterm/main/docs/changelog.md"
+distfiles="${homepage}/archive/refs/tags/${_version}.tar.gz"
+checksum=199b884b2fbcc3d9e8aa6cd3bd04a4bc01fccecc093b1db3807d98f580a9e4ec
+
+pre_build() {
+ # Use system harfbuzz, freetype, libz & libpng instead of the vendored ones
+ export WEZTERM_SYSDEPS=1
+ # Fixed in rust 1.49, but we still use 1.48
+ # Can be dropped after merging https://github.com/void-linux/void-packages/pull/30259
+ cargo update -p spinning_top --precise 0.2.2
+ # Before 1.1.3, libz-sys used vendored zlib for musl targets by default.
+ # `wezterm` still uses libz-sys-1.1.2. https://github.com/wez/wezterm/pull/754 fixed that,
+ # but new wezterm release hasn't been made yet
+ # TLDR; can be dropped after new `wezterm` is released
+ cargo update -p libz-sys
+}
+
+do_install() {
+ vbin target/${RUST_TARGET}/release/wezterm
+ vbin target/${RUST_TARGET}/release/wezterm-gui
+ vbin target/${RUST_TARGET}/release/wezterm-mux-server
+ vmkdir usr/share/wezterm/colors
+ vmkdir usr/share/applications/
+ vmkdir usr/share/icons/hicolor/128x128/apps/
+ vmkdir usr/share/icons/hicolor/scalable/apps/
+ install -m 644 assets/colors/* ${DESTDIR}/usr/share/wezterm/colors/
+ vinstall assets/wezterm.desktop 644 usr/share/applications/
+ vinstall assets/icon/terminal.png 644 usr/share/icons/hicolor/128x128/apps/ wezterm.png
+ vinstall assets/icon/wezterm-icon.svg 644 usr/share/icons/hicolor/scalable/apps/ wezterm.svg
+}
+
+post_install() {
+ vlicense LICENSE.md
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
@ 2021-05-01 23:32 ` Logarithmus
2021-05-02 14:20 ` ericonr
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-01 23:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages wezterm
https://github.com/void-linux/void-packages/pull/30619
New package: wezterm-20210405.110924.a5bb5be8
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-30619.patch --]
[-- Type: text/x-diff, Size: 5466 bytes --]
From c885a15077b99de6f41ba0cf264bee16f79ea502 Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Fri, 2 Apr 2021 04:34:12 +0300
Subject: [PATCH] New package: wezterm-20210405.110924.a5bb5be8
---
.../wezterm/patches/00-cargo-resolver.patch | 32 ++++++++++++
srcpkgs/wezterm/patches/01-sysdeps.patch | 38 ++++++++++++++
srcpkgs/wezterm/template | 51 +++++++++++++++++++
3 files changed, 121 insertions(+)
create mode 100644 srcpkgs/wezterm/patches/00-cargo-resolver.patch
create mode 100644 srcpkgs/wezterm/patches/01-sysdeps.patch
create mode 100644 srcpkgs/wezterm/template
diff --git a/srcpkgs/wezterm/patches/00-cargo-resolver.patch b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
new file mode 100644
index 000000000000..0b5d4385abcf
--- /dev/null
+++ b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
@@ -0,0 +1,32 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [workspace]
+ members = ["wezterm-mux-server", "wezterm", "wezterm-gui", "strip-ansi-escapes", "wezterm-ssh"]
+ resolver = "2"
+--- async_ossl/Cargo.toml
++++ async_ossl/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "async_ossl"
+ version = "0.1.0"
+--- wezterm-gui/Cargo.toml
++++ wezterm-gui/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-gui"
+ version = "0.1.0"
+--- wezterm-mux-server/Cargo.toml
++++ wezterm-mux-server/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-mux-server"
+ version = "0.1.0"
diff --git a/srcpkgs/wezterm/patches/01-sysdeps.patch b/srcpkgs/wezterm/patches/01-sysdeps.patch
new file mode 100644
index 000000000000..01764ddfb8ff
--- /dev/null
+++ b/srcpkgs/wezterm/patches/01-sysdeps.patch
@@ -0,0 +1,38 @@
+--- deps/freetype/build.rs
++++ deps/freetype/build.rs
+@@ -74,9 +74,16 @@ fn freetype() {
+ }
+
+ fn main() {
+- zlib();
+- libpng();
+- freetype();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=z");
++ println!("cargo:rustc-link-lib=png");
++ println!("cargo:rustc-link-lib=freetype");
++ } else {
++ zlib();
++ libpng();
++ freetype();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
+--- deps/harfbuzz/build.rs
++++ deps/harfbuzz/build.rs
+@@ -45,7 +45,12 @@ fn emit_libdirs(p: &Path) {
+ }
+
+ fn main() {
+- harfbuzz();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=harfbuzz");
++ } else {
++ harfbuzz();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
new file mode 100644
index 000000000000..5e3691cc6d32
--- /dev/null
+++ b/srcpkgs/wezterm/template
@@ -0,0 +1,51 @@
+# Template file for 'wezterm'
+pkgname=wezterm
+version=20210405.110924.a5bb5be8
+revision=1
+_version=${version//./-}
+wrksrc="${pkgname}-${_version}"
+build_style=cargo
+hostmakedepends="pkgconf python3"
+makedepends="fontconfig-devel libxcb-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-wm-devel libxkbcommon-devel libX11-devel wayland-devel openssl-devel zlib-devel
+ harfbuzz-devel freetype-devel libpng-devel"
+depends="libxkbcommon-x11 hicolor-icon-theme"
+short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer"
+maintainer="Artur Sinila <freesoftware@logarithmus.dev>"
+license="MIT"
+homepage="https://github.com/wez/wezterm"
+changelog="https://raw.githubusercontent.com/wez/wezterm/main/docs/changelog.md"
+distfiles="${homepage}/archive/refs/tags/${_version}.tar.gz"
+checksum=199b884b2fbcc3d9e8aa6cd3bd04a4bc01fccecc093b1db3807d98f580a9e4ec
+
+# Use system harfbuzz, freetype, libz & libpng instead of the vendored ones
+export WEZTERM_SYSDEPS=1
+
+pre_build() {
+ # Fixed in rust 1.49, but we still use 1.48
+ # Can be dropped after merging https://github.com/void-linux/void-packages/pull/30259
+ cargo update -p spinning_top --precise 0.2.2
+ # Before 1.1.3, libz-sys used vendored zlib for musl targets by default.
+ # `wezterm` still uses libz-sys-1.1.2. https://github.com/wez/wezterm/pull/754 fixed that,
+ # but new wezterm release hasn't been made yet
+ # TLDR; can be dropped after new `wezterm` is released
+ cargo update -p libz-sys
+}
+
+do_install() {
+ vbin target/${RUST_TARGET}/release/wezterm
+ vbin target/${RUST_TARGET}/release/wezterm-gui
+ vbin target/${RUST_TARGET}/release/wezterm-mux-server
+ vmkdir usr/share/wezterm/colors
+ vmkdir usr/share/applications/
+ vmkdir usr/share/icons/hicolor/128x128/apps/
+ vmkdir usr/share/icons/hicolor/scalable/apps/
+ install -m 644 assets/colors/* ${DESTDIR}/usr/share/wezterm/colors/
+ vinstall assets/wezterm.desktop 644 usr/share/applications/
+ vinstall assets/icon/terminal.png 644 usr/share/icons/hicolor/128x128/apps/ wezterm.png
+ vinstall assets/icon/wezterm-icon.svg 644 usr/share/icons/hicolor/scalable/apps/ wezterm.svg
+}
+
+post_install() {
+ vlicense LICENSE.md
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
2021-05-01 23:32 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-05-02 14:20 ` ericonr
2021-05-02 14:23 ` [PR REVIEW] " ericonr
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-02 14:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830816913
Comment:
IMO should at least wait for the patches to be upstreamed.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
2021-05-01 23:32 ` [PR PATCH] [Updated] " Logarithmus
2021-05-02 14:20 ` ericonr
@ 2021-05-02 14:23 ` ericonr
2021-05-02 21:51 ` kwshi
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-02 14:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#discussion_r624703185
Comment:
No need to have post install as its own thing.
That said, not sure how I feel about yet another GPU accelerated terminal.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (2 preceding siblings ...)
2021-05-02 14:23 ` [PR REVIEW] " ericonr
@ 2021-05-02 21:51 ` kwshi
2021-05-02 23:14 ` Logarithmus
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: kwshi @ 2021-05-02 21:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 732 bytes --]
New review comment by kwshi on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#discussion_r624776274
Comment:
> That said, not sure how I feel about yet another GPU accelerated terminal.
You've got a point! But I'll vote in favor of having it because it:
- serves a different purpose than existing GPU-accelerated terminals (it _has_ GPU acceleration, but that doesn't appear to be its first priority--instead, its priority is adding more features, e.g. better support for emoji, tabbing/multiplexing, native SSH & serial clients, etc.)
- seems kind of cool & is fairly well-established at this point (1.7k stars). I would enjoy having it & being able to play around w/ it.
Just my 2c :)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (3 preceding siblings ...)
2021-05-02 21:51 ` kwshi
@ 2021-05-02 23:14 ` Logarithmus
2021-05-02 23:19 ` Logarithmus
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#discussion_r624798872
Comment:
> No need to have post install as its own thing.
Do you want me to move `vlicense` to the `do_install` function?
> That said, not sure how I feel about yet another GPU accelerated terminal.
`alacritty` doesn't support ligatures. `kitty` supports them, but it's half-written in `python`, an interpreted language.
`wezterm` supports ligatures & is written in Rust.
Yes, `wezterm`'s has ~550 dependencies, thus build time is quite long (~30 minutes), but it's not too bad IMHO.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (4 preceding siblings ...)
2021-05-02 23:14 ` Logarithmus
@ 2021-05-02 23:19 ` Logarithmus
2021-05-02 23:19 ` Logarithmus
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830924455
Comment:
> IMO should at least wait for the patches to be upstreamed.
`00-cargo-resolver.patch` is required because we still use rust 1.48.0.
`01-sysdeps.patch` isn't going to be merged, but I feel it's the right thing to do, since Void tends to avoid bundling dependencies.
https://github.com/wez/wezterm/pull/48
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (5 preceding siblings ...)
2021-05-02 23:19 ` Logarithmus
@ 2021-05-02 23:19 ` Logarithmus
2021-05-02 23:20 ` Logarithmus
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 454 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830924455
Comment:
> IMO should at least wait for the patches to be upstreamed.
`00-cargo-resolver.patch` is required because we still use rust 1.48.0.
`01-sysdeps.patch` isn't going to be merged, but I feel it's the right thing to do, since Void tends to avoid bundling dependencies.
https://github.com/wez/wezterm/pull/48
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (6 preceding siblings ...)
2021-05-02 23:19 ` Logarithmus
@ 2021-05-02 23:20 ` Logarithmus
2021-05-02 23:21 ` Logarithmus
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 486 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830924455
Comment:
> IMO should at least wait for the patches to be upstreamed.
`00-cargo-resolver.patch` is required because we still use rust 1.48.0. It isn't required since 1.51.0.
`01-sysdeps.patch` isn't going to be merged, but I feel it's the right thing to do, since Void tends to avoid bundling dependencies.
https://github.com/wez/wezterm/pull/48
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (7 preceding siblings ...)
2021-05-02 23:20 ` Logarithmus
@ 2021-05-02 23:21 ` Logarithmus
2021-05-02 23:40 ` [PR PATCH] [Updated] " Logarithmus
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830924455
Comment:
> IMO should at least wait for the patches to be upstreamed.
`00-cargo-resolver.patch` is required because we still use rust 1.48.0. It isn't required since 1.51.0: https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver.
`01-sysdeps.patch` isn't going to be merged, but I feel it's the right thing to do, since Void tends to avoid bundling dependencies.
https://github.com/wez/wezterm/pull/48
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (8 preceding siblings ...)
2021-05-02 23:21 ` Logarithmus
@ 2021-05-02 23:40 ` Logarithmus
2021-05-02 23:52 ` ericonr
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-02 23:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages wezterm
https://github.com/void-linux/void-packages/pull/30619
New package: wezterm-20210405.110924.a5bb5be8
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30619.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wezterm-30619.patch --]
[-- Type: text/x-diff, Size: 5445 bytes --]
From a10abce22cdc86c318c4622ae372ea48e322c71a Mon Sep 17 00:00:00 2001
From: Artur Sinila <freesoftware@logarithmus.dev>
Date: Fri, 2 Apr 2021 04:34:12 +0300
Subject: [PATCH] New package: wezterm-20210405.110924.a5bb5be8
---
.../wezterm/patches/00-cargo-resolver.patch | 32 +++++++++++++
srcpkgs/wezterm/patches/01-sysdeps.patch | 38 +++++++++++++++
srcpkgs/wezterm/template | 48 +++++++++++++++++++
3 files changed, 118 insertions(+)
create mode 100644 srcpkgs/wezterm/patches/00-cargo-resolver.patch
create mode 100644 srcpkgs/wezterm/patches/01-sysdeps.patch
create mode 100644 srcpkgs/wezterm/template
diff --git a/srcpkgs/wezterm/patches/00-cargo-resolver.patch b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
new file mode 100644
index 000000000000..0b5d4385abcf
--- /dev/null
+++ b/srcpkgs/wezterm/patches/00-cargo-resolver.patch
@@ -0,0 +1,32 @@
+--- Cargo.toml
++++ Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [workspace]
+ members = ["wezterm-mux-server", "wezterm", "wezterm-gui", "strip-ansi-escapes", "wezterm-ssh"]
+ resolver = "2"
+--- async_ossl/Cargo.toml
++++ async_ossl/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "async_ossl"
+ version = "0.1.0"
+--- wezterm-gui/Cargo.toml
++++ wezterm-gui/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-gui"
+ version = "0.1.0"
+--- wezterm-mux-server/Cargo.toml
++++ wezterm-mux-server/Cargo.toml
+@@ -1,3 +1,5 @@
++cargo-features = ["resolver"]
++
+ [package]
+ name = "wezterm-mux-server"
+ version = "0.1.0"
diff --git a/srcpkgs/wezterm/patches/01-sysdeps.patch b/srcpkgs/wezterm/patches/01-sysdeps.patch
new file mode 100644
index 000000000000..01764ddfb8ff
--- /dev/null
+++ b/srcpkgs/wezterm/patches/01-sysdeps.patch
@@ -0,0 +1,38 @@
+--- deps/freetype/build.rs
++++ deps/freetype/build.rs
+@@ -74,9 +74,16 @@ fn freetype() {
+ }
+
+ fn main() {
+- zlib();
+- libpng();
+- freetype();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=z");
++ println!("cargo:rustc-link-lib=png");
++ println!("cargo:rustc-link-lib=freetype");
++ } else {
++ zlib();
++ libpng();
++ freetype();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
+--- deps/harfbuzz/build.rs
++++ deps/harfbuzz/build.rs
+@@ -45,7 +45,12 @@ fn emit_libdirs(p: &Path) {
+ }
+
+ fn main() {
+- harfbuzz();
++ println!("cargo:rerun-if-env-changed=WEZTERM_SYSDEPS");
++ if cfg!(unix) && env::var("WEZTERM_SYSDEPS").map(|x| x == "1").unwrap_or(false) {
++ println!("cargo:rustc-link-lib=harfbuzz");
++ } else {
++ harfbuzz();
++ }
+ let out_dir = env::var("OUT_DIR").unwrap();
+ println!("cargo:outdir={}", out_dir);
+ println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.9");
diff --git a/srcpkgs/wezterm/template b/srcpkgs/wezterm/template
new file mode 100644
index 000000000000..c1ad30f132fb
--- /dev/null
+++ b/srcpkgs/wezterm/template
@@ -0,0 +1,48 @@
+# Template file for 'wezterm'
+pkgname=wezterm
+version=20210405.110924.a5bb5be8
+revision=1
+_version=${version//./-}
+wrksrc="${pkgname}-${_version}"
+build_style=cargo
+hostmakedepends="pkgconf python3"
+makedepends="fontconfig-devel libxcb-devel xcb-util-image-devel xcb-util-keysyms-devel
+ xcb-util-wm-devel libxkbcommon-devel libX11-devel wayland-devel openssl-devel zlib-devel
+ harfbuzz-devel freetype-devel libpng-devel"
+depends="libxkbcommon-x11 hicolor-icon-theme"
+short_desc="GPU-accelerated cross-platform terminal emulator and multiplexer"
+maintainer="Artur Sinila <freesoftware@logarithmus.dev>"
+license="MIT"
+homepage="https://github.com/wez/wezterm"
+changelog="https://raw.githubusercontent.com/wez/wezterm/main/docs/changelog.md"
+distfiles="${homepage}/archive/refs/tags/${_version}.tar.gz"
+checksum=199b884b2fbcc3d9e8aa6cd3bd04a4bc01fccecc093b1db3807d98f580a9e4ec
+
+# Use system harfbuzz, freetype, libz & libpng instead of the vendored ones
+export WEZTERM_SYSDEPS=1
+
+pre_build() {
+ # Fixed in rust 1.49, but we still use 1.48
+ # Can be dropped after merging https://github.com/void-linux/void-packages/pull/30259
+ cargo update -p spinning_top --precise 0.2.2
+ # Before 1.1.3, libz-sys used vendored zlib for musl targets by default.
+ # `wezterm` still uses libz-sys-1.1.2. https://github.com/wez/wezterm/pull/754 fixed that,
+ # but new wezterm release hasn't been made yet
+ # TLDR; can be dropped after new `wezterm` is released
+ cargo update -p libz-sys
+}
+
+do_install() {
+ vbin target/${RUST_TARGET}/release/wezterm
+ vbin target/${RUST_TARGET}/release/wezterm-gui
+ vbin target/${RUST_TARGET}/release/wezterm-mux-server
+ vmkdir usr/share/wezterm/colors
+ vmkdir usr/share/applications/
+ vmkdir usr/share/icons/hicolor/128x128/apps/
+ vmkdir usr/share/icons/hicolor/scalable/apps/
+ install -m 644 assets/colors/* ${DESTDIR}/usr/share/wezterm/colors/
+ vinstall assets/wezterm.desktop 644 usr/share/applications/
+ vinstall assets/icon/terminal.png 644 usr/share/icons/hicolor/128x128/apps/ wezterm.png
+ vinstall assets/icon/wezterm-icon.svg 644 usr/share/icons/hicolor/scalable/apps/ wezterm.svg
+ vlicense LICENSE.md
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (9 preceding siblings ...)
2021-05-02 23:40 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-05-02 23:52 ` ericonr
2021-05-06 8:23 ` [PR REVIEW] " Logarithmus
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-05-02 23:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-830928639
Comment:
Then the patch should show where it originated from.
And upstream doesn't seem extremely interested in *being* packageable.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (10 preceding siblings ...)
2021-05-02 23:52 ` ericonr
@ 2021-05-06 8:23 ` Logarithmus
2022-05-19 2:16 ` github-actions
2022-06-03 2:11 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 15+ messages in thread
From: Logarithmus @ 2021-05-06 8:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 679 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#discussion_r624798872
Comment:
> No need to have post install as its own thing.
Do you want me to move `vlicense` to the `do_install` function?
> That said, not sure how I feel about yet another GPU accelerated terminal.
`alacritty` doesn't support ligatures. `kitty` supports them, but it's half-written in `python`, an interpreted language.
`wezterm` supports ligatures & is written in Rust, so `wezterm` has potential to be faster.
Yes, `wezterm`'s has ~550 dependencies, thus build time is quite long (~30 minutes), but it's not too bad IMHO.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (11 preceding siblings ...)
2021-05-06 8:23 ` [PR REVIEW] " Logarithmus
@ 2022-05-19 2:16 ` github-actions
2022-06-03 2:11 ` [PR PATCH] [Closed]: " github-actions
13 siblings, 0 replies; 15+ messages in thread
From: github-actions @ 2022-05-19 2:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/30619#issuecomment-1131014031
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Closed]: New package: wezterm-20210405.110924.a5bb5be8
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
` (12 preceding siblings ...)
2022-05-19 2:16 ` github-actions
@ 2022-06-03 2:11 ` github-actions
13 siblings, 0 replies; 15+ messages in thread
From: github-actions @ 2022-06-03 2:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1430 bytes --]
There's a closed pull request on the void-packages repository
New package: wezterm-20210405.110924.a5bb5be8
https://github.com/void-linux/void-packages/pull/30619
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2022-06-03 2:11 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-01 22:39 [PR PATCH] New package: wezterm-20210405.110924.a5bb5be8 Logarithmus
2021-05-01 23:32 ` [PR PATCH] [Updated] " Logarithmus
2021-05-02 14:20 ` ericonr
2021-05-02 14:23 ` [PR REVIEW] " ericonr
2021-05-02 21:51 ` kwshi
2021-05-02 23:14 ` Logarithmus
2021-05-02 23:19 ` Logarithmus
2021-05-02 23:19 ` Logarithmus
2021-05-02 23:20 ` Logarithmus
2021-05-02 23:21 ` Logarithmus
2021-05-02 23:40 ` [PR PATCH] [Updated] " Logarithmus
2021-05-02 23:52 ` ericonr
2021-05-06 8:23 ` [PR REVIEW] " Logarithmus
2022-05-19 2:16 ` github-actions
2022-06-03 2:11 ` [PR PATCH] [Closed]: " github-actions
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).