Attachment 248626 Details for Bug 277114 – patch v1

[patch] patch v1

lightdm.diff (text/plain), 2.88 KB, created by Guido Falsi on 2024-02-20 09:36:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2024-02-20 09:36:42 UTC

Size: 2.88 KB

patch

obsolete

>diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
>index cdbe7bb7d5f5..e9f4c77e4538 100644
>--- a/x11/lightdm/Makefile
>+++ b/x11/lightdm/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	lightdm
> PORTVERSION=	1.32.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> 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)));

Actions: View | Diff

Attachments on bug 277114: 248626