cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to allow building

Browse Source 
Ok aja@
This commit is contained in:
nigel 2017-03-12 12:58:03 +00:00
parent c08925e912
commit 0809c1a140
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
x11/gnome/gdm/patches/patch-daemon_gdm-session-worker_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.14 2017/03/11 00:22:27 ajacoutot Exp $
$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.15 2017/03/12 12:58:03 nigel Exp $
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
@ -24,8 +24,8 @@ From: Tim Lunn <tim@feathertop.org>
Date: Mon, 11 Apr 2016 23:18:10 +1000
Subject: gdm-session: set PAM_TTY when initialising pam
--- daemon/gdm-session-worker.c.orig Fri Mar 3 21:32:37 2017
+++ daemon/gdm-session-worker.c Tue Mar 7 09:17:45 2017
--- daemon/gdm-session-worker.c.orig Fri Mar 3 20:32:37 2017
+++ daemon/gdm-session-worker.c Sun Mar 12 12:37:19 2017
@@ -28,9 +28,11 @@
#include <string.h>
#include <sys/types.h>
@ -480,7 +480,22 @@ Subject: gdm-session: set PAM_TTY when initialising pam
static gboolean
set_up_for_current_vt (GdmSessionWorker *worker,
@@ -2251,6 +2465,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
@@ -2222,12 +2436,14 @@ set_up_for_current_vt (GdmSessionWorker *worker,
}
#endif
+#ifdef WITH_SYSTEMD
if (g_strcmp0 (worker->priv->display_seat_id, "seat0") == 0) {
g_debug ("GdmSessionWorker: setting XDG_VTNR to current vt");
set_xdg_vtnr_to_current_vt (worker);
} else {
g_debug ("GdmSessionWorker: not setting XDG_VTNR since not seat0");
}
+#endif
return TRUE;
out:
@@ -2251,6 +2467,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
return FALSE;
}
break;
@ -488,7 +503,7 @@ Subject: gdm-session: set PAM_TTY when initialising pam
case GDM_SESSION_DISPLAY_MODE_NEW_VT:
case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED:
if (!set_up_for_new_vt (worker)) {
@@ -2261,6 +2476,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
@@ -2261,6 +2478,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
return FALSE;
}
break;
@ -496,7 +511,7 @@ Subject: gdm-session: set PAM_TTY when initialising pam
}
flags = 0;
@@ -2282,8 +2498,18 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
@@ -2282,8 +2500,18 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
g_debug ("GdmSessionWorker: state SESSION_OPENED");
worker->priv->state = GDM_SESSION_WORKER_STATE_SESSION_OPENED;
@ -515,7 +530,7 @@ Subject: gdm-session: set PAM_TTY when initialising pam
if (session_id != NULL) {
g_free (worker->priv->session_id);
worker->priv->session_id = session_id;
@@ -2388,6 +2614,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
@@ -2388,6 +2616,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
}
static gboolean
@ -535,7 +550,7 @@ Subject: gdm-session: set PAM_TTY when initialising pam
gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object,
GDBusMethodInvocation *invocation,
const char *str)
@@ -3194,6 +3433,7 @@ worker_interface_init (GdmDBusWorkerIface *interface)
@@ -3194,6 +3435,7 @@ worker_interface_init (GdmDBusWorkerIface *interface)
interface->handle_open = gdm_session_worker_handle_open;
interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;