Date: Thu, 4 Apr 2024 09:55:15 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: b2767b9fea26 - 2024Q1 - x11/i3bar-river: unbreak build after dfc55c4ee063 Message-ID: <202404040955.4349tFkd089104@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2767b9fea26ec7726e2cdd9eb61b66133332e0c commit b2767b9fea26ec7726e2cdd9eb61b66133332e0c Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-04-04 09:50:39 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-04-04 09:54:46 +0000 x11/i3bar-river: unbreak build after dfc55c4ee063 error[E0658]: `c".."` literals are experimental --> src/bar.rs:61:13 | 61 | c"i3bar-river".into(), | ^^^^^^^^^^^^^^ | = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information error[E0658]: `c".."` literals are experimental --> src/wm_info_provider/river.rs:118:33 | 118 | PointerBtn::Left => c"set-focused-tags", | ^^^^^^^^^^^^^^^^^^^ | = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information error[E0658]: `c".."` literals are experimental --> src/wm_info_provider/river.rs:119:34 | 119 | PointerBtn::Right => c"toggle-focused-tags", | ^^^^^^^^^^^^^^^^^^^^^^ | = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information Reported by: pkg-fallout (direct commit to 2024Q1 as 73941e6741d6 is missing on the branch) --- x11/i3bar-river/files/patch-rust-1.76 | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/x11/i3bar-river/files/patch-rust-1.76 b/x11/i3bar-river/files/patch-rust-1.76 new file mode 100644 index 000000000000..79eb4aa8dccb --- /dev/null +++ b/x11/i3bar-river/files/patch-rust-1.76 @@ -0,0 +1,60 @@ +Revert https://github.com/MaxVerevkin/i3bar-river/commit/d1ba22747e9e +until lang/rust >= 1.77 update. + +error[E0658]: `c".."` literals are experimental + --> src/bar.rs:61:13 + | +61 | c"i3bar-river".into(), + | ^^^^^^^^^^^^^^ + | + = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information + +error[E0658]: `c".."` literals are experimental + --> src/wm_info_provider/river.rs:118:33 + | +118 | PointerBtn::Left => c"set-focused-tags", + | ^^^^^^^^^^^^^^^^^^^ + | + = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information + +error[E0658]: `c".."` literals are experimental + --> src/wm_info_provider/river.rs:119:34 + | +119 | PointerBtn::Right => c"toggle-focused-tags", + | ^^^^^^^^^^^^^^^^^^^^^^ + | + = note: see issue #105723 <https://github.com/rust-lang/rust/issues/105723>; for more information + +--- src/bar.rs.orig 2024-03-30 19:50:32 UTC ++++ src/bar.rs +@@ -58,7 +58,7 @@ impl Bar { + surface, + Some(output.wl), + zwlr_layer_shell_v1::Layer::Top, +- c"i3bar-river".into(), ++ wayrs_client::cstr!("i3bar-river").into(), + layer_surface_cb, + ); + +--- src/wm_info_provider/river.rs.orig 2024-03-30 19:50:32 UTC ++++ src/wm_info_provider/river.rs +@@ -2,7 +2,7 @@ use wayrs_client::proxy::Proxy; + + use wayrs_client::global::*; + use wayrs_client::proxy::Proxy; +-use wayrs_client::EventCtx; ++use wayrs_client::{cstr, EventCtx}; + + use super::*; + +@@ -115,8 +115,8 @@ impl WmInfoProvider for RiverInfoProvider { + btn: PointerBtn, + ) { + let cmd = match btn { +- PointerBtn::Left => c"set-focused-tags", +- PointerBtn::Right => c"toggle-focused-tags", ++ PointerBtn::Left => cstr!("set-focused-tags"), ++ PointerBtn::Right => cstr!("toggle-focused-tags"), + _ => return, + }; + self.control.add_argument(conn, cmd.to_owned());
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404040955.4349tFkd089104>