[PR PATCH] eww: add wayland build option, patch cargo lockfile

[PR PATCH] eww: add wayland build option, patch cargo lockfile

[heittpr]

[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]

There is a new pull request by heittpr against master on the void-packages repository

https://github.com/heittpr/void-packages eww
https://github.com/void-linux/void-packages/pull/54261

eww: add wayland build option, patch cargo lockfile
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, x86_64

This PR adds a wayland build option for `eww`.

Since `rust 1.80.0`, `eww 0.6.0` is know [not to compile](https://github.com/elkowar/eww/issues/1156) due to an incompatibility with crate `time 0.3.34` (this is currently [fixed](https://github.com/elkowar/eww/pull/1144) upstream, but not released). Note that this affects the current revision of `eww`, independent of the wayland specific stuff (the template fails to build due to the new rust version). This PR also adds [a small patch from nixpkgs](https://github.com/NixOS/nixpkgs/blob/40cffc01bc89548395103929e3ddb98b57d00e67/pkgs/by-name/ew/eww/lockfile.patch) to circumvent this problem.

A patch file from https://github.com/void-linux/void-packages/pull/54261.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-eww-54261.patch --]
[-- Type: text/x-diff, Size: 2637 bytes --]

From 3314be9028b2c52aa4c686b4e120753c194e434a Mon Sep 17 00:00:00 2001
From: Heitor <heitorleite.dev@gmail.com>
Date: Sun, 9 Feb 2025 00:28:57 -0300
Subject: [PATCH] eww: add wayland build option, patch cargo lockfile

---
 srcpkgs/eww/patches/lockfile.patch | 37 ++++++++++++++++++++++++++++++
 srcpkgs/eww/template               |  7 ++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/eww/patches/lockfile.patch

diff --git a/srcpkgs/eww/patches/lockfile.patch b/srcpkgs/eww/patches/lockfile.patch
new file mode 100644
index 00000000000000..1edc62c66a45b2
--- /dev/null
+++ b/srcpkgs/eww/patches/lockfile.patch
@@ -0,0 +1,37 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 5d94bd4..acd2c8d 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1676,7 +1676,7 @@ dependencies = [
+  "libm",
+  "log",
+  "regex",
+- "time 0.3.34",
++ "time 0.3.36",
+  "urlencoding",
+ ]
+ 
+@@ -2893,9 +2893,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
diff --git a/srcpkgs/eww/template b/srcpkgs/eww/template
index 6359f4d514c27b..a65a2458470874 100644
--- a/srcpkgs/eww/template
+++ b/srcpkgs/eww/template
@@ -1,9 +1,10 @@
 # Template file for 'eww'
 pkgname=eww
 version=0.6.0
-revision=1
+revision=2
 build_style=cargo
-build_helper="qemu"
+build_helper=qemu
+configure_args="--no-default-features --features $(vopt_if wayland wayland x11)"
 make_install_args="--path=crates/eww"
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel gtk-layer-shell-devel pango-devel gdk-pixbuf-devel
@@ -16,6 +17,8 @@ changelog="https://raw.githubusercontent.com/elkowar/eww/master/CHANGELOG.md"
 distfiles="https://github.com/elkowar/eww/archive/refs/tags/v${version}.tar.gz"
 checksum=cef361946946c566b79f8ddc6208d1a3f16b4ff9961439a3f86935e1cfa174a1
 
+build_options="wayland"
+
 post_install() {
 	vlicense LICENSE
 	for sh in bash fish zsh; do

Re: eww: add wayland build option, patch cargo lockfile

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54261#issuecomment-2646597570

Comment:
what's the point of this? [by default](https://github.com/elkowar/eww/blob/master/crates/eww/Cargo.toml#L13) it enables both the wayland and x11 features

Re: [PR PATCH] [Closed]: eww: add wayland build option, patch cargo lockfile

[heittpr]

[-- Attachment #1: Type: text/plain, Size: 938 bytes --]

There's a closed pull request on the void-packages repository

eww: add wayland build option, patch cargo lockfile
https://github.com/void-linux/void-packages/pull/54261

Description:
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, x86_64

This PR adds a wayland build option for `eww`.

Since `rust 1.80.0`, `eww 0.6.0` is know [not to compile](https://github.com/elkowar/eww/issues/1156) due to an incompatibility with crate `time 0.3.34` (this is currently [fixed](https://github.com/elkowar/eww/pull/1144) upstream, but not released). Note that this affects the current revision of `eww`, independent of the wayland specific stuff (the template fails to build due to the new rust version). This PR also adds [a small patch from nixpkgs](https://github.com/NixOS/nixpkgs/blob/40cffc01bc89548395103929e3ddb98b57d00e67/pkgs/by-name/ew/eww/lockfile.patch) to circumvent this problem.

Re: eww: add wayland build option, patch cargo lockfile

[heittpr]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]

New comment by heittpr on void-packages repository

https://github.com/void-linux/void-packages/pull/54261#issuecomment-2646621494

Comment:
> [by default](https://github.com/elkowar/eww/blob/master/crates/eww/Cargo.toml#L13) it enables both the wayland and x11 features

Oh, that's weird. I ran into some issues with eww on Wayland, and since [the documentation](https://elkowar.github.io/eww/eww.html) recommends building with `cargo build --release --no-default-features --features=wayland`, I assumed that the `x11` and `wayland` features were mutually exclusive, and that the Void package was built without Wayland capabilities. However, that doesn't seem to be the case - the `eww` package works fine as it is.

Re: eww: add wayland build option, patch cargo lockfile

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 216 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/54261#issuecomment-2646623243

Comment:
would be nice to get the build fix patch, though. no need for revbump