From nobody Mon Feb 26 19:03:54 2024 X-Original-To: dev-commits-ports-all@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 4Tk9562GVXz5Byw3; Mon, 26 Feb 2024 19:03:54 +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 4Tk9561n9jz3wZQ; Mon, 26 Feb 2024 19:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708974234; 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=OiYlaSK9PKyZJ/rkd79qvgttpyZ1biRF/Yiof7asRqI=; b=huRTilIf3qwXYS+GR1ASIbGmHxetUbBo+ts+CkBJarJ5hCizSkopivqmyOCCt4sTo1fZKm P3B6Tyl2NMQ4vcZZVzxfUjbz7OtWlSCW7EyfF1h6fQ+AMk8RsLafRcXMWL/NtPX3cd9m4u E5o1BuDiQq5zBg7ykptVjf0yVlZU701f5m5aFWvAPzyIH1MbjKfSQieFtfei6L+SZt7jGw 0EIR+iaglN53qoyIUsSUX7xGG/2WKmmaMW7aePCmbN6WrkkDX0g2xOyKL2fblLh1FOim1e JZTp1sG4q/sUYsdI1Jv2HtDbgczyeUSLDS3T+uYMjbYvjPmS4XVKVpRavcorWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708974234; a=rsa-sha256; cv=none; b=msxDGwCMkslEFPgGuMSn26NWCW7GoIl39DwQk3DbSLPuai/6iNohbs0xu3xOVr3BAjaCWu V+/pzOMihQ9+S6rBeFAxuUdMBTYJ8j3OBDnLxxEc8wDPIS3VhjOJ7drXt7ZTJk7eag8Xob u6rkg4x+B5H1IpM0Bhm6H4hOZqk8E1SHhwgb6TeAqTSee4LvsXEJBWOOTDHNVRgR7Ai8Qs fqSoDoCv3Cke/Dr6Q8aU0WS1WPj7jUXZh+XC2lqRTJywv0AO1v+Nph836moyqreIpdzsQ7 5gr11I8NNghHih5Ih1eTvPkzcpjz5kFUyqr1+H5ZoRcjWo6kDVJJHso3PWZahw== 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=1708974234; 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=OiYlaSK9PKyZJ/rkd79qvgttpyZ1biRF/Yiof7asRqI=; b=dQKNqfV89aTXIkL0UbfAqPsmfDhX7leN+AWONbSNrBD6XLZQK5BIuXfdT9yRwMXJIWSyif GGhjYvQLAaVcDoVoNfZwdkUomJ9lH7qblwO0p48KCCyszAzlqtdQ6OdG9SZG3T6DjVR9NM L82bnl/O+hZQRIlMtJCDr/wSAwAcdUJD0Ev7n7s/e8KPgckOKXlIRMXCy4wZmF8ITfJaIz Kh2897gEgaTw01iCLTuPNYM2KnX9UJ6lSCjFfKby8pHexZyytOCAqYizy+hknTopYyfQBu Enw4Y/DkuwlL+GUr7YYHeermUKTzYsnI832Guo9dz72HlbfKb4uRnJUTJheU1A== 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 4Tk9560qz1zglm; Mon, 26 Feb 2024 19:03:54 +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 41QJ3soa084248; Mon, 26 Feb 2024 19:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41QJ3sZe084245; Mon, 26 Feb 2024 19:03:54 GMT (envelope-from git) Date: Mon, 26 Feb 2024 19:03:54 GMT Message-Id: <202402261903.41QJ3sZe084245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: c88dffc0c8b6 - main - x11/lightdm: Fix ttyv numbering logic List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: c88dffc0c8b6f2c82a522d8eb2dcd2b49e9a4015 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=c88dffc0c8b6f2c82a522d8eb2dcd2b49e9a4015 commit c88dffc0c8b6f2c82a522d8eb2dcd2b49e9a4015 Author: Guido Falsi AuthorDate: 2024-02-26 19:00:03 +0000 Commit: Guido Falsi CommitDate: 2024-02-26 19:00:03 +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 --- 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 e649be1f6ca6..3be758e97f2e 100644 --- a/x11/lightdm/Makefile +++ b/x11/lightdm/Makefile @@ -1,6 +1,6 @@ PORTNAME= lightdm PORTVERSION= 1.32.0 -PORTREVISION= 4 +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)));