From bb8bc24861f8cac0101f7f0a6f8877ff9c5ba6d7 Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 15:59:55 +0200 Subject: [PATCH 1/7] fix: wezfurlong.org/wezterm --- projects/wezfurlong.org/wezterm/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index b308181204..fd022ee671 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -26,5 +26,6 @@ build: provides: - bin/wezterm + - bin/wezterm-gui test: test "$(wezterm --version)" = "wezterm {{version.tag}}" From bb56ff2f366a6284623e85fb8f16c69079f6412b Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 17:32:13 +0200 Subject: [PATCH 2/7] fix: wezterm --- projects/wezfurlong.org/wezterm/package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index fd022ee671..4d7626283f 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -27,5 +27,6 @@ build: provides: - bin/wezterm - bin/wezterm-gui + - bin/wezterm-ssh test: test "$(wezterm --version)" = "wezterm {{version.tag}}" From ad754ff14d0d2555dd56204546c499bf9f283392 Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 17:48:30 +0200 Subject: [PATCH 3/7] fix: wezterm --- projects/wezfurlong.org/wezterm/package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index 4d7626283f..fd022ee671 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -27,6 +27,5 @@ build: provides: - bin/wezterm - bin/wezterm-gui - - bin/wezterm-ssh test: test "$(wezterm --version)" = "wezterm {{version.tag}}" From 7c49d008af0782c57bb39140a2ff36f7bf395f2c Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 18:53:23 +0200 Subject: [PATCH 4/7] wip --- projects/wezfurlong.org/wezterm/package.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index fd022ee671..759067e60a 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -8,6 +8,7 @@ versions: dependencies: zlib.net: ^1.3 + x.org/x11: '*' linux: freetype.org: '*' freedesktop.org/fontconfig: '*' @@ -17,7 +18,12 @@ build: dependencies: rust-lang.org: '>=1.71<1.78' rust-lang.org/cargo: '*' - script: cargo install $ARGS + script: | + # cargo install $ARGS + # ./get-deps + # cargo install --locked --root {{prefix}} + cargo build --release --no-default-features --features vendored-fonts --locked + sleep 100000 env: ARGS: - --locked @@ -27,5 +33,7 @@ build: provides: - bin/wezterm - bin/wezterm-gui + - bin/strip-ansi-escapes + - bin/wezterm-mux-server test: test "$(wezterm --version)" = "wezterm {{version.tag}}" From a7cc129f56f2b63333d42c03c5671ef3d9889b1c Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 18:57:36 +0200 Subject: [PATCH 5/7] wip --- projects/wezfurlong.org/wezterm/package.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index 759067e60a..c295e2878a 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -19,15 +19,15 @@ build: rust-lang.org: '>=1.71<1.78' rust-lang.org/cargo: '*' script: | - # cargo install $ARGS + cargo install $ARGS --path=wezterm + cargo install $ARGS --path=wezterm-gui --features vendored-fonts --no-default-features # ./get-deps # cargo install --locked --root {{prefix}} - cargo build --release --no-default-features --features vendored-fonts --locked + # cargo build --release --no-default-features --features vendored-fonts --locked sleep 100000 env: ARGS: - --locked - - --path=wezterm - --root {{prefix}} provides: From 41b8aa692a7222531aff82ef1807b74d543011dc Mon Sep 17 00:00:00 2001 From: Bas Steins Date: Fri, 27 Sep 2024 19:03:22 +0200 Subject: [PATCH 6/7] wip --- projects/wezfurlong.org/wezterm/package.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index c295e2878a..e7a79955fd 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -19,13 +19,14 @@ build: rust-lang.org: '>=1.71<1.78' rust-lang.org/cargo: '*' script: | - cargo install $ARGS --path=wezterm + # cargo install $ARGS --path=wezterm cargo install $ARGS --path=wezterm-gui --features vendored-fonts --no-default-features # ./get-deps # cargo install --locked --root {{prefix}} # cargo build --release --no-default-features --features vendored-fonts --locked sleep 100000 env: + PKG_CONFIG_PATH: /home/bas/.pkgx/x.org/x11/v1.8.10/lib/pkgconfig:$PKG_CONFIG_PATH ARGS: - --locked - --root {{prefix}} From e8884d159f0959a7ee7490d139248be41796a6ae Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Fri, 27 Sep 2024 15:31:56 -0400 Subject: [PATCH 7/7] add xcb-util (will fail for now) will re-run the checks once that package is built --- projects/wezfurlong.org/wezterm/package.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/wezfurlong.org/wezterm/package.yml b/projects/wezfurlong.org/wezterm/package.yml index e7a79955fd..62864a159e 100644 --- a/projects/wezfurlong.org/wezterm/package.yml +++ b/projects/wezfurlong.org/wezterm/package.yml @@ -8,25 +8,25 @@ versions: dependencies: zlib.net: ^1.3 - x.org/x11: '*' linux: freetype.org: '*' freedesktop.org/fontconfig: '*' openssl.org: ^1.1 + x.org/x11: '*' + x.org/xcb: '*' + x.org/xcb-util: '*' build: dependencies: rust-lang.org: '>=1.71<1.78' rust-lang.org/cargo: '*' - script: | - # cargo install $ARGS --path=wezterm - cargo install $ARGS --path=wezterm-gui --features vendored-fonts --no-default-features - # ./get-deps - # cargo install --locked --root {{prefix}} - # cargo build --release --no-default-features --features vendored-fonts --locked - sleep 100000 + script: + # - cargo install $ARGS --path=wezterm + - cargo install $ARGS --path=wezterm-gui --features vendored-fonts --no-default-features + # - ./get-deps + # - cargo install --locked --root {{prefix}} + # - cargo build --release --no-default-features --features vendored-fonts --locked env: - PKG_CONFIG_PATH: /home/bas/.pkgx/x.org/x11/v1.8.10/lib/pkgconfig:$PKG_CONFIG_PATH ARGS: - --locked - --root {{prefix}}