From nobody Fri Dec 01 08:52:14 2023 X-Original-To: dev-commits-ports-main@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 4ShRdW0Nzzz52J4k; Fri, 1 Dec 2023 08:52: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 4ShRdV70pZz4L2c; Fri, 1 Dec 2023 08:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701420735; 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=g84UzAqrdFVAut5s/znZFFH2jMJdMPNs0en0NkaGo8c=; b=I0s3O1ehtpM8SaYfOql+YkVeetqs9x97hINGd4Av/PYtaeNX/xBB7ZrURRe/Exud3c0/Sc KdYiNAmzNf4Owd09kCIDaGezzUcBHOkS+7Sr39iadtyyDe2iHHJ6L9wQs+UnIUbhjJ1vKK BpB1QrYYx1fEDSuRYjsG5ayWO6+SIpHFVmPIAPucIU5PqiZ76ufQBVaAdYXJzYIjZGYnXp 86nk9zWgiE53jWzQ8Syg7uf2gaAzp92tViwMJzhch69vLXyKLZVeH77bPTJMYFkwdCOQZN LK29WA/FEmNkOoQsi1Fiadyc5k3q5NnkvKTFVZA5EFPSTPl01QaBU1CwNn/b0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701420735; 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=g84UzAqrdFVAut5s/znZFFH2jMJdMPNs0en0NkaGo8c=; b=wP4JSLBzYtsyAiqDx8P9fSVutyuNbW6V0wT+HwulxkFf61OAEjvaKqdY4VIj3jgDojFGnC RPaQ9OQWYXNqYlHvATQrK9MCiMfPwxHGGxAS/V4H8r6rGkauYR5XWzjGScQypW7isnSSX0 ShzfYsjLangFF3HmfSS5HGxWi61RtxeLKcRu4nWo9eVtk1DIwbANr4ABfjbcuZQlw4PgBv LuIHTOHiKpZFG6X/BmoX91XqxWERAYwanO0lFbbGk2agxQbVjBzk3CUBzvPqVV9imELVH2 lSeOd3JFhtGDGIUZrm3bKQumwrr3Fw9mL251+P5TDjLoCC30DoFkFjME/gIdXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701420735; a=rsa-sha256; cv=none; b=oW2HEacf6n3+8+pF4I9gTbxJkU6baFqgxn0NHtGmluSttkh+Od0Ps+Lq3vYfX0wNJCU339 0a+hCSPS8rqP15KfvYRs0Bb3ygdE+asg65iHul8DimKjoX0dGytYWfP2hvkoPfdSCwiZNJ Z6yJOUC3DRRBgwL4ojk2fAV6wpHby4qk/5TfBu35wwkBOiKAqw35axrAwzTMYY/TjVLL0i KYBj50rWFaXuOAFUh2R5ZZ1I3436Sw7uj2NOlpcB5HUJlLpVMv2Rtz+l9uHaJmBOs/wk5A umQf2HyeIe9kXY9d6xIuXK0AwCv8pPjkUNKiWTC65FqV8Cfvxwc+0FrjlTwDhg== 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 4ShRdV64sYzC2s; Fri, 1 Dec 2023 08:52:14 +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 3B18qE03090490; Fri, 1 Dec 2023 08:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B18qE3S090487; Fri, 1 Dec 2023 08:52:14 GMT (envelope-from git) Date: Fri, 1 Dec 2023 08:52:14 GMT Message-Id: <202312010852.3B18qE3S090487@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 3dee7e552236 - main - x11-wm/niri: set XDG_SESSION_TYPE by default (a la niri-session) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 3dee7e5522361d15406e740a13b16d00b4138fe4 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dee7e5522361d15406e740a13b16d00b4138fe4 commit 3dee7e5522361d15406e740a13b16d00b4138fe4 Author: Jan Beich AuthorDate: 2023-12-01 08:49:46 +0000 Commit: Jan Beich CommitDate: 2023-12-01 08:51:35 +0000 x11-wm/niri: set XDG_SESSION_TYPE by default (a la niri-session) Smithay (unlike wlroots) doesn't seem to set XDG_SESSION_TYPE. Mainly affects Qt which prefers XDG_SESSION_TYPE over WAYLAND_DISPLAY. --- x11-wm/niri/files/patch-no-systemd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x11-wm/niri/files/patch-no-systemd b/x11-wm/niri/files/patch-no-systemd index f22f4fbf6088..525af9ff06a6 100644 --- a/x11-wm/niri/files/patch-no-systemd +++ b/x11-wm/niri/files/patch-no-systemd @@ -42,12 +42,13 @@ Avoid various systemd dependencies let cli = Cli::parse(); let _client = tracy_client::Client::start(); -@@ -128,6 +114,9 @@ fn main() { +@@ -128,6 +114,10 @@ fn main() { socket_name.to_string_lossy() ); + // Advise xdg-desktop-portal which *-portals.conf to load + env::set_var("XDG_CURRENT_DESKTOP", "niri"); ++ env::set_var("XDG_SESSION_TYPE", "wayland"); + if is_systemd_service { // We're starting as a systemd service. Export our variables.