From nobody Mon Feb 26 19:05:12 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 4Tk96d23yxz5Byc7; Mon, 26 Feb 2024 19:05:13 +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 4Tk96d1V5Gz3wgt; Mon, 26 Feb 2024 19:05:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708974313; 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=Q4J/nAr6XcOBtn/ON1iHspHMgifF9Fc7DL7mrVCJLok=; b=eBYD14IDVIb2SAce1XU8NA/N8hP8pQJOA/LCc77z5Q02hQWyP07lIP1a/n0zcP7YM9YxjR Orj9k8yVcj8oGNwJCuNxFmc9xs9jYgY1SwYgAKeaiQwp9tRTCdPBFohVx8mcaguf6DABFM urQKRVwgfiVV5Iy5y3IX52yCRckiqhzqZ0uCAn1BX3LZNAUtxHUE6p4etmjK2QdH479zpk o97aLpOOqUf7RA7Ewyve4SIkzK+9aBs4XXhRdTB6PGpvde7fhZ6tyjuZg60Ak6EboYcRNG yd+bVXowofEHrPVQ72dydzz5QvuqhYvwxoFo1i1S1LY4c4FRDcCLFPVCH5g1Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708974313; a=rsa-sha256; cv=none; b=mWXJpwiaed4K+V0QVSKIUge3kNAv2Za4FGknD0V9X2WH59o49rKvDlgjRftP+trGnextoP ZxuUf8abuP+LGGXDiCumD3v3suNPq61XuBQeJYXWCI1hxy7B+w/zzWUU1qXB5zQ/HbkSQa l1QPR0de3kEdBc6sGKRPB8iXZN87aJIREEFwMVTgduhVY3NSfBfQsXtzhKXIwE0wTuQYBl jcuyXcLC7Vqmjtj9dQrlYuCCYVIYmnrlHW4ojNeGSoHNpNWBLdiafmtdNTf91rP8XdEKLH GIFPj+CW+0Y3OA9kskx6e6AXSVj8Zt7n/SOicQQmDWS87B3U9HqLVQ6EhUe+nw== 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=1708974313; 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=Q4J/nAr6XcOBtn/ON1iHspHMgifF9Fc7DL7mrVCJLok=; b=ichEdV+hU5L7ScwitRWa4EwtiqEVKLO65sCinTuhflmAvj0PO2znYqIMRB39gxGR8+tBfD kwC0k1ZzxGeHQnixi2xcNaaUzDPUdNRnNukaI/S5+Xl15Si+Rwcfua0tlGqyns2igM/PTE ledO/o8Wi/9kqZkLteiy/aZBP5gT1DwlT4frOJU9WunYMVCfZD0JAkPjqZ0TOMEyggWPu7 mN5FmVKaHNcDRssJrOVVxrQUr0t+52N7ioQOxMYHrkqMkR1eM8L6Rso8hAfMRGbthA9ezZ 1GSk+1TIDXO8B4BW23U4HK42Lp0qpjQ6/cPa//4t+RZqBv0bZB+MCIAmfkI2LQ== 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 4Tk96d0XnGzg3m; Mon, 26 Feb 2024 19:05:13 +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 41QJ5CJE084585; Mon, 26 Feb 2024 19:05:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QJ5C1U084582; Mon, 26 Feb 2024 19:05:12 GMT (envelope-from git) Date: Mon, 26 Feb 2024 19:05:12 GMT Message-Id: <202402261905.41QJ5C1U084582@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 79674f5097cf - 2024Q1 - x11/lightdm: Fix ttyv numbering logic 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 79674f5097cfec61c7e981ede019bb449f6e28e6 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=79674f5097cfec61c7e981ede019bb449f6e28e6 commit 79674f5097cfec61c7e981ede019bb449f6e28e6 Author: Guido Falsi AuthorDate: 2024-02-26 19:00:03 +0000 Commit: Guido Falsi CommitDate: 2024-02-26 19:04:59 +0000 x11/lightdm: Fix ttyv numbering logic Adapt code from wlroots to correctly generate ttyv device names for numbers beyond 9. Upstream pull request: https://github.com/canonical/lightdm/pull/343 PR: 277114 Obtained from: https://github.com/swaywm/wlroots/commit/fc6c0ca12e941d5d7d567834bff3ab7df9447001 (inspired by) MFH: 2024Q1 (cherry picked from commit c88dffc0c8b6f2c82a522d8eb2dcd2b49e9a4015) --- x11/lightdm/Makefile | 2 +- x11/lightdm/files/patch-src_x-server.c | 60 ++++++++++++++++++++++++++++++---- 2 files changed, 55 insertions(+), 7 deletions(-) diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile index cdbe7bb7d5f5..5139df1403f2 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= lightdm PORTVERSION= 1.32.0 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= https://github.com/canonical/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ diff --git a/x11/lightdm/files/patch-src_x-server.c b/x11/lightdm/files/patch-src_x-server.c index 394789feaa3f..514215b861ab 100644 --- a/x11/lightdm/files/patch-src_x-server.c +++ b/x11/lightdm/files/patch-src_x-server.c @@ -1,15 +1,63 @@ ---- src/x-server.c.orig 2018-08-30 00:28:55 UTC +--- src/x-server.c.orig 2019-08-04 22:29:55 UTC +++ src/x-server.c -@@ -152,10 +152,10 @@ x_server_connect_session (DisplayServer *display_serve +@@ -152,13 +152,60 @@ x_server_connect_session (DisplayServer *display_serve g_autofree gchar *tty_text = NULL; g_autofree gchar *vt_text = NULL; -- tty_text = g_strdup_printf ("/dev/tty%d", vt); -+ tty_text = g_strdup_printf ("/dev/ttyv%d", vt - 1); ++#ifdef __FreeBSD__ ++ char vty_num32[6]; ++ int num; ++ const int base = 32; ++ size_t offset = 0; ++ ++ num = vt - 1; ++ ++ if (num == 0) { ++ vty_num32[offset++] = '0'; ++ vty_num32[offset] = '\0'; ++ } else { ++ for (int remaning = num; remaning > 0; remaning /= base, offset++) { ++ if (offset + 1 >= 6) { ++ g_error ("tty number buffer too small"); ++ goto error; ++ } ++ ++ const int value = remaning % base; ++ if (value >= 10) { ++ vty_num32[offset] = 'a' + value - 10; ++ } else { ++ vty_num32[offset] = '0' + value; ++ } ++ } ++ ++ for (size_t i = 0; i < offset / 2; i++) { ++ const size_t p1 = i; ++ const size_t p2 = offset - 1 - i; ++ const char tmp = vty_num32[p1]; ++ vty_num32[p1] = vty_num32[p2]; ++ vty_num32[p2] = tmp; ++ } ++ ++ vty_num32[offset] = '\0'; ++ } ++ ++ tty_text = g_strdup_printf ("/dev/ttyv%s", vty_num32); ++#else + tty_text = g_strdup_printf ("/dev/tty%d", vt); ++#endif session_set_tty (session, tty_text); -- vt_text = g_strdup_printf ("%d", vt); -+ vt_text = g_strdup_printf ("%d", vt - 1); ++#ifdef __FreeBSD__ ++ vt_text = g_strdup_printf ("%d", num); ++#else + vt_text = g_strdup_printf ("%d", vt); ++#endif session_set_env (session, "XDG_VTNR", vt_text); } else ++#ifdef __FreeBSD__ ++error: ++#endif + l_debug (session, "Not setting XDG_VTNR"); + + session_set_env (session, "DISPLAY", x_server_get_address (X_SERVER (display_server)));