From nobody Thu Apr 4 09:55:15 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V9H6W48XSz5GhBZ; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V9H6W24v2z4xLQ; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdiXzcsLfLuXorA3jFksgvU27VwYnI4wFQFkgJKtEeU=; b=HelYBLWAVlEX0juLhYzNKffKqQCBw1O9l37CyHV7KzNbXV3V/pNOLbJLpABgeskHioXlHv 9/EYQd08W1xpYc+mOAYiAh2a9hrn4PDohnv48fh/bUNM3AGX1lfuWF3oKg7XPzUnDMaGiQ k5bj9Ex2H65o2iiMiFfB+gdpRlABCd7+VIfuWUHB2wt4nHqFQZqf0w4NZyHN41leJ5BGTo sExUORksx0+oTS6eo6DfpaLKyRQIBpG45uRAX+OtHOjRMoz9ytfsqOH3cQBs55YbB15ial 2cAN7WsHA11NpxIYMBKQThhC6Pcbgjupx6L5OlWRCxBA1sbu1wK1FmSE47AOlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712224515; a=rsa-sha256; cv=none; b=RYFx4entu1zOEiL5r6rRagjecIdF3KV+uZtbpedAHM54f/YkqAmJg4L8KMivZ+92W4y9PJ oWgU5J9W68Gl5BLLHd+5jm9U95Vyb6p7ltLovyb/qHVn8vrs3aEebkm1Bzgd0SUXPEQBz9 9F07biRrbgKV70FHXdnep8a1l7oHfM1UKMTk6Tt7smXybSHT1/SN5KEEcD3l8HuZXQ8Lyd 6xcRhVdE0BZ0eHGZDLHjjcejNQUT0yzsJLZYNoUBnOlJp/NoJmwz2cw6INgDEThEagfA0M kFYkLQUQGp+D/kKTN6n6o1C2KMRw9yROfxRbC4ny3uAYsTegaHdiVpN1tCLo/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712224515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bdiXzcsLfLuXorA3jFksgvU27VwYnI4wFQFkgJKtEeU=; b=GmrgJVufoqOLLoZqELBRJ8LqPNwRxbP9nCIXNGk0x8qJswXGb5sBLt2zY0aeEfN6hZ/c6n SWPSrs1AfdwAlgF9U+gjVsMDHRbr8bD5a5IOOcZ6+WVe7zSr4NIqebvM1EJGUQP2yMm8ji jY6tsXSf8XmT9RTFJ8V+wuW8mXkCKViuGqGAxvGymKXBT9vxpKTCjdoImOtf8F7KPPQtOq +VdUEnmRg4U6+MYd4J8n5DdQFPdJSRhPNDHpWLGyAD7rRwI+TEma4bv9lnsi0vH5YyLv+I cLhOMY9b38cy8/6wBtEfUTVFRlwSgfT/DN67zRcSrCY2QxQyHPaTfSSvoYdQXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V9H6W1h9Hz1BDy; Thu, 4 Apr 2024 09:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4349tFk4089107; Thu, 4 Apr 2024 09:55:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4349tFkd089104; Thu, 4 Apr 2024 09:55:15 GMT (envelope-from git) Date: Thu, 4 Apr 2024 09:55:15 GMT Message-Id: <202404040955.4349tFkd089104@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b2767b9fea26 - 2024Q1 - x11/i3bar-river: unbreak build after dfc55c4ee063 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: b2767b9fea26ec7726e2cdd9eb61b66133332e0c Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2767b9fea26ec7726e2cdd9eb61b66133332e0c commit b2767b9fea26ec7726e2cdd9eb61b66133332e0c Author: Jan Beich AuthorDate: 2024-04-04 09:50:39 +0000 Commit: Jan Beich 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 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 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 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 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 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 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());