Update to gdm-3.18.3.
Drop the gettext module while here.
This commit is contained in:
ajacoutot
parent
0f5b95da41
commit
8d23783870
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.245 2016/03/18 23:12:20 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.246 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
COMMENT= GNOME display manager
|
||||
|
||||
GNOME_PROJECT= gdm
|
||||
GNOME_VERSION= 3.18.2
|
||||
REVISION= 4
|
||||
GNOME_VERSION= 3.18.3
|
||||
|
||||
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} puflogh1000X248.gif:0
|
||||
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
||||
@ -20,13 +19,12 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender accountsservice atk-1.0
|
||||
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject canberra
|
||||
WANTLIB += canberra-gtk3 dbus-1 epoxy expat ffi fontconfig freetype
|
||||
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
|
||||
WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz ltdl m ogg pam
|
||||
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
|
||||
WANTLIB += png pthread pthread-stubs util vorbis vorbisfile xcb
|
||||
WANTLIB += xcb-render xcb-shm z
|
||||
WANTLIB += graphite2 gthread-2.0 gtk-3 harfbuzz iconv intl ltdl
|
||||
WANTLIB += m ogg pam pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
|
||||
WANTLIB += pixman-1 png pthread pthread-stubs util vorbis vorbisfile
|
||||
WANTLIB += xcb xcb-render xcb-shm z
|
||||
|
||||
MODULES= devel/gettext \
|
||||
x11/gnome \
|
||||
MODULES= x11/gnome \
|
||||
devel/dconf
|
||||
|
||||
BUILD_DEPENDS= devel/check \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SHA256 (gnome/gdm-3.18.2.tar.xz) = VJI1JHYR108NXVpKoBupNQpNNGjkSsATtAeRxqmG+CI=
|
||||
SHA256 (gnome/gdm-3.18.3.tar.xz) = Bocp+hdEs465a+VEBBbkIMbkF4Pp5T0KIXyJkoWBsaM=
|
||||
SHA256 (gnome/puflogh1000X248.gif) = /Cl2kyuX6zQVfYO41Zjey65xUZ28V2as8j9eS13SG6k=
|
||||
SIZE (gnome/gdm-3.18.2.tar.xz) = 1574772
|
||||
SIZE (gnome/gdm-3.18.3.tar.xz) = 1605980
|
||||
SIZE (gnome/puflogh1000X248.gif) = 28427
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-common_gdm-common_h,v 1.1 2015/10/18 13:25:54 ajacoutot Exp $
|
||||
$OpenBSD: patch-common_gdm-common_h,v 1.2 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
|
||||
From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
|
||||
@ -6,11 +6,11 @@ From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Fri, 12 Jun 2015 13:48:52 -0400
|
||||
Subject: require logind support
|
||||
|
||||
--- common/gdm-common.h.orig Mon Sep 21 16:12:33 2015
|
||||
+++ common/gdm-common.h Sun Oct 18 14:23:39 2015
|
||||
@@ -33,6 +33,9 @@
|
||||
|
||||
#define GDM_CUSTOM_SESSION "custom"
|
||||
--- common/gdm-common.h.orig Thu Apr 14 07:27:26 2016
|
||||
+++ common/gdm-common.h Fri Apr 15 15:05:26 2016
|
||||
@@ -31,6 +31,9 @@
|
||||
expr; \
|
||||
} while G_UNLIKELY (errno == EINTR);
|
||||
|
||||
+/* check if logind is running */
|
||||
+#define LOGIND_RUNNING() (access("/run/systemd/seats/", F_OK) >= 0)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.7 2015/10/18 13:25:54 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure_ac,v 1.8 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
|
||||
From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
|
||||
@ -8,8 +8,8 @@ Subject: drop consolekit support
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=722482
|
||||
|
||||
--- configure.ac.orig Sun Oct 18 14:26:52 2015
|
||||
+++ configure.ac Sun Oct 18 14:34:00 2015
|
||||
--- configure.ac.orig Thu Apr 14 07:56:26 2016
|
||||
+++ configure.ac Fri Apr 15 15:05:26 2016
|
||||
@@ -244,7 +244,15 @@ AC_ARG_WITH(tcp-wrappers,
|
||||
[Use TCP Wrappers @<:@default=auto@:>@]),,
|
||||
with_tcp_wrappers=auto)
|
||||
@ -102,7 +102,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=722482
|
||||
AC_ARG_WITH(gnome-settings-daemon-directory,
|
||||
[AC_HELP_STRING([--with-gnome-settings-daemon-directory],
|
||||
[Specify the directory of gnome-settings-daemon used by the chooser @<:@default=libexecdir@:>@])],,
|
||||
@@ -1549,6 +1589,7 @@ echo "
|
||||
@@ -1557,6 +1597,7 @@ echo "
|
||||
dmconfdir: ${dmconfdir}
|
||||
localstatedir: ${localstatedir}
|
||||
datadir: ${datadir}
|
||||
@ -110,7 +110,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=722482
|
||||
gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
|
||||
gnome-session-check-accel location: ${with_check_accelerated_directory}
|
||||
source code location: ${srcdir}
|
||||
@@ -1578,6 +1619,8 @@ echo \
|
||||
@@ -1586,6 +1627,8 @@ echo \
|
||||
" Xinerama support: ${XINERAMA_SUPPORT}
|
||||
XDMCP support: ${XDMCP_SUPPORT}
|
||||
SELinux support: ${use_selinux}
|
||||
@ -119,7 +119,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=722482
|
||||
systemd unit dir: ${with_systemdsystemunitdir}
|
||||
plymouth support: ${use_plymouth}
|
||||
wayland support: ${use_wayland}
|
||||
@@ -1586,3 +1629,4 @@ echo \
|
||||
@@ -1594,3 +1637,4 @@ echo \
|
||||
Enable documentation: ${enable_documentation}
|
||||
Install GDM's Xsession: ${enable_gdm_xsession}
|
||||
"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-daemon_gdm-server_c,v 1.7 2015/10/18 13:25:54 ajacoutot Exp $
|
||||
$OpenBSD: patch-daemon_gdm-server_c,v 1.8 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
REVERT - OpenBSD lacks sigwaitinfo(2)
|
||||
From 956d7d1c7a0cfbf2beacdb9e88e645e15ad32047 Mon Sep 17 00:00:00 2001
|
||||
@ -18,8 +18,8 @@ From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Fri, 12 Jun 2015 13:48:52 -0400
|
||||
Subject: require logind support
|
||||
|
||||
--- daemon/gdm-server.c.orig Sun Oct 18 14:26:36 2015
|
||||
+++ daemon/gdm-server.c Sun Oct 18 14:24:34 2015
|
||||
--- daemon/gdm-server.c.orig Thu Apr 14 07:29:22 2016
|
||||
+++ daemon/gdm-server.c Fri Apr 15 15:05:26 2016
|
||||
@@ -43,7 +43,9 @@
|
||||
#include <linux/vt.h>
|
||||
#endif
|
||||
@ -227,9 +227,9 @@ Subject: require logind support
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (server->priv->disable_tcp && ! query_in_arglist) {
|
||||
argv[len++] = g_strdup ("-nolisten");
|
||||
@@ -650,12 +648,6 @@ server_child_watch (GPid pid,
|
||||
/* If we were compiled with Xserver >= 1.17 we need to specify
|
||||
* '-listen tcp' as the X server dosen't listen on tcp sockets
|
||||
@@ -663,12 +661,6 @@ server_child_watch (GPid pid,
|
||||
g_object_unref (server);
|
||||
}
|
||||
|
||||
@ -242,7 +242,7 @@ Subject: require logind support
|
||||
static gboolean
|
||||
gdm_server_spawn (GdmServer *server,
|
||||
const char *vtarg,
|
||||
@@ -693,15 +685,6 @@ gdm_server_spawn (GdmServer *server,
|
||||
@@ -706,15 +698,6 @@ gdm_server_spawn (GdmServer *server,
|
||||
g_debug ("GdmServer: Starting X server process: %s", freeme);
|
||||
g_free (freeme);
|
||||
|
||||
@ -258,7 +258,7 @@ Subject: require logind support
|
||||
if (!g_spawn_async_with_pipes (NULL,
|
||||
argv,
|
||||
(char **)env->pdata,
|
||||
@@ -1037,11 +1020,16 @@ gdm_server_class_init (GdmServerClass *klass)
|
||||
@@ -1050,11 +1033,16 @@ gdm_server_class_init (GdmServerClass *klass)
|
||||
static void
|
||||
gdm_server_init (GdmServer *server)
|
||||
{
|
||||
@ -275,7 +275,7 @@ Subject: require logind support
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1055,6 +1043,9 @@ gdm_server_finalize (GObject *object)
|
||||
@@ -1068,6 +1056,9 @@ gdm_server_finalize (GObject *object)
|
||||
server = GDM_SERVER (object);
|
||||
|
||||
g_return_if_fail (server->priv != NULL);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.10 2015/10/18 13:25:54 ajacoutot Exp $
|
||||
$OpenBSD: patch-daemon_gdm-session-worker_c,v 1.11 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
|
||||
From 1ac67f522f5690c27023d98096ca817f12f7eb88 Mon Sep 17 00:00:00 2001
|
||||
@ -18,8 +18,14 @@ From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Fri, 12 Jun 2015 14:33:40 -0400
|
||||
Subject: session: drop session-type property
|
||||
|
||||
--- daemon/gdm-session-worker.c.orig Sun Oct 18 14:26:47 2015
|
||||
+++ daemon/gdm-session-worker.c Sun Oct 18 14:24:34 2015
|
||||
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
|
||||
From 6942fb9b16bab7173bbd295fb19a9770289dbe0e Mon Sep 17 00:00:00 2001
|
||||
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 Thu Apr 14 07:56:26 2016
|
||||
+++ daemon/gdm-session-worker.c Fri Apr 15 15:48:26 2016
|
||||
@@ -28,9 +28,11 @@
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
@ -294,7 +300,48 @@ Subject: session: drop session-type property
|
||||
|
||||
worker->priv->login_vt = 0;
|
||||
worker->priv->session_vt = 0;
|
||||
@@ -1036,10 +1247,12 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *w
|
||||
@@ -963,32 +1174,6 @@ _get_xauth_for_pam (const char *x11_authority_file)
|
||||
#endif
|
||||
|
||||
static gboolean
|
||||
-ensure_login_vt (GdmSessionWorker *worker)
|
||||
-{
|
||||
- int fd;
|
||||
- struct vt_stat vt_state = { 0 };
|
||||
- gboolean got_login_vt = FALSE;
|
||||
-
|
||||
- fd = open ("/dev/tty0", O_RDWR | O_NOCTTY);
|
||||
-
|
||||
- if (fd < 0) {
|
||||
- g_debug ("GdmSessionWorker: couldn't open VT master: %m");
|
||||
- return FALSE;
|
||||
- }
|
||||
-
|
||||
- if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
|
||||
- g_debug ("GdmSessionWorker: couldn't get current VT: %m");
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
- worker->priv->login_vt = vt_state.v_active;
|
||||
- got_login_vt = TRUE;
|
||||
-out:
|
||||
- close (fd);
|
||||
- return got_login_vt;
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
|
||||
const char *service,
|
||||
const char *username,
|
||||
@@ -1002,7 +1187,6 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *w
|
||||
{
|
||||
struct pam_conv pam_conversation;
|
||||
int error_code;
|
||||
- char tty_string[256];
|
||||
|
||||
g_assert (worker->priv->pam_handle == NULL);
|
||||
|
||||
@@ -1063,10 +1247,12 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *w
|
||||
}
|
||||
}
|
||||
|
||||
@ -308,7 +355,22 @@ Subject: session: drop session-type property
|
||||
|
||||
if (strcmp (service, "gdm-launch-environment") == 0) {
|
||||
gdm_session_worker_set_environment_variable (worker, "XDG_SESSION_CLASS", "greeter");
|
||||
@@ -1595,6 +1808,26 @@ gdm_session_worker_get_environment (GdmSessionWorker *
|
||||
@@ -1075,14 +1261,6 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *w
|
||||
g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
|
||||
worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
|
||||
|
||||
- /* Temporarily set PAM_TTY with the currently active VT (login screen)
|
||||
- PAM_TTY will be reset with the users VT right before the user session is opened */
|
||||
- ensure_login_vt (worker);
|
||||
- g_snprintf (tty_string, 256, "/dev/tty%d", worker->priv->login_vt);
|
||||
- pam_set_item (worker->priv->pam_handle, PAM_TTY, tty_string);
|
||||
- if (!display_is_local)
|
||||
- worker->priv->password_is_required = TRUE;
|
||||
-
|
||||
out:
|
||||
if (error_code != PAM_SUCCESS) {
|
||||
gdm_session_worker_uninitialize_pam (worker, error_code);
|
||||
@@ -1629,6 +1807,26 @@ gdm_session_worker_get_environment (GdmSessionWorker *
|
||||
return (const char * const *) pam_getenvlist (worker->priv->pam_handle);
|
||||
}
|
||||
|
||||
@ -335,7 +397,7 @@ Subject: session: drop session-type property
|
||||
static gboolean
|
||||
run_script (GdmSessionWorker *worker,
|
||||
const char *dir)
|
||||
@@ -1625,6 +1858,9 @@ session_worker_child_watch (GPid pid,
|
||||
@@ -1659,6 +1857,9 @@ session_worker_child_watch (GPid pid,
|
||||
: WIFSIGNALED (status) ? WTERMSIG (status)
|
||||
: -1);
|
||||
|
||||
@ -345,7 +407,7 @@ Subject: session: drop session-type property
|
||||
|
||||
gdm_session_worker_uninitialize_pam (worker, PAM_SUCCESS);
|
||||
|
||||
@@ -1813,12 +2049,14 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
@@ -1847,12 +2048,14 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
|
||||
error_code = PAM_SUCCESS;
|
||||
|
||||
@ -360,7 +422,7 @@ Subject: session: drop session-type property
|
||||
|
||||
session_pid = fork ();
|
||||
|
||||
@@ -1865,6 +2103,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
@@ -1899,6 +2102,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
_exit (2);
|
||||
}
|
||||
|
||||
@ -368,7 +430,7 @@ Subject: session: drop session-type property
|
||||
/* Take control of the tty
|
||||
*/
|
||||
if (needs_controlling_terminal) {
|
||||
@@ -1872,6 +2111,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
@@ -1906,6 +2110,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
g_debug ("GdmSessionWorker: could not take control of tty: %m");
|
||||
}
|
||||
}
|
||||
@ -376,7 +438,7 @@ Subject: session: drop session-type property
|
||||
|
||||
#ifdef HAVE_LOGINCAP
|
||||
if (setusercontext (NULL, passwd_entry, passwd_entry->pw_uid, LOGIN_SETALL) < 0) {
|
||||
@@ -2016,6 +2256,7 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
@@ -2050,11 +2255,13 @@ gdm_session_worker_start_session (GdmSessionWorker *w
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -384,7 +446,33 @@ Subject: session: drop session-type property
|
||||
static gboolean
|
||||
set_up_for_new_vt (GdmSessionWorker *worker)
|
||||
{
|
||||
@@ -2073,6 +2314,7 @@ fail:
|
||||
int fd;
|
||||
char vt_string[256], tty_string[256];
|
||||
+ struct vt_stat vt_state = { 0 };
|
||||
int session_vt = 0;
|
||||
|
||||
fd = open ("/dev/tty0", O_RDWR | O_NOCTTY);
|
||||
@@ -2064,6 +2271,11 @@ set_up_for_new_vt (GdmSessionWorker *worker)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+ if (ioctl (fd, VT_GETSTATE, &vt_state) < 0) {
|
||||
+ g_debug ("GdmSessionWorker: couldn't get current VT: %m");
|
||||
+ goto fail;
|
||||
+ }
|
||||
+
|
||||
if (worker->priv->display_is_initial) {
|
||||
session_vt = atoi (GDM_INITIAL_VT);
|
||||
} else {
|
||||
@@ -2073,6 +2285,7 @@ set_up_for_new_vt (GdmSessionWorker *worker)
|
||||
}
|
||||
}
|
||||
|
||||
+ worker->priv->login_vt = vt_state.v_active;
|
||||
worker->priv->session_vt = session_vt;
|
||||
|
||||
close (fd);
|
||||
@@ -2100,6 +2313,7 @@ fail:
|
||||
close (fd);
|
||||
return FALSE;
|
||||
}
|
||||
@ -392,7 +480,7 @@ Subject: session: drop session-type property
|
||||
|
||||
static gboolean
|
||||
set_up_for_current_vt (GdmSessionWorker *worker,
|
||||
@@ -2161,6 +2403,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
@@ -2188,6 +2402,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
@ -400,7 +488,7 @@ Subject: session: drop session-type property
|
||||
case GDM_SESSION_DISPLAY_MODE_NEW_VT:
|
||||
case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED:
|
||||
if (!set_up_for_new_vt (worker)) {
|
||||
@@ -2171,6 +2414,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
@@ -2198,6 +2413,7 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
return FALSE;
|
||||
}
|
||||
break;
|
||||
@ -408,7 +496,7 @@ Subject: session: drop session-type property
|
||||
}
|
||||
|
||||
flags = 0;
|
||||
@@ -2200,7 +2444,9 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
@@ -2227,7 +2443,9 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
g_debug ("GdmSessionWorker: state SESSION_OPENED");
|
||||
worker->priv->state = GDM_SESSION_WORKER_STATE_SESSION_OPENED;
|
||||
|
||||
@ -418,7 +506,7 @@ Subject: session: drop session-type property
|
||||
|
||||
/* FIXME: should we do something here?
|
||||
* Note that error return status from PreSession script should
|
||||
@@ -2210,6 +2456,14 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
@@ -2237,6 +2455,14 @@ gdm_session_worker_open_session (GdmSessionWorker *wo
|
||||
*/
|
||||
run_script (worker, GDMCONFDIR "/PreSession");
|
||||
|
||||
@ -433,7 +521,7 @@ Subject: session: drop session-type property
|
||||
if (session_id != NULL) {
|
||||
g_free (worker->priv->session_id);
|
||||
worker->priv->session_id = session_id;
|
||||
@@ -2314,6 +2568,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
|
||||
@@ -2341,6 +2567,19 @@ gdm_session_worker_handle_set_session_name (GdmDBusWor
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@ -453,7 +541,7 @@ Subject: session: drop session-type property
|
||||
gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object,
|
||||
GDBusMethodInvocation *invocation,
|
||||
const char *str)
|
||||
@@ -3121,6 +3388,7 @@ worker_interface_init (GdmDBusWorkerIface *interface)
|
||||
@@ -3148,6 +3387,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;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-daemon_gdm-session_c,v 1.6 2015/11/17 17:48:40 ajacoutot Exp $
|
||||
$OpenBSD: patch-daemon_gdm-session_c,v 1.7 2016/04/15 14:11:09 ajacoutot Exp $
|
||||
|
||||
REVERT - OpenBSD does not have a systemd implementation (we need ConsoleKit)
|
||||
From 9be58c9ec9a3a411492a5182ac4b0d51fdc3a323 Mon Sep 17 00:00:00 2001
|
||||
@ -12,9 +12,9 @@ From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Fri, 12 Jun 2015 14:33:40 -0400
|
||||
Subject: session: drop session-type property
|
||||
|
||||
--- daemon/gdm-session.c.orig Tue Nov 17 18:14:16 2015
|
||||
+++ daemon/gdm-session.c Tue Nov 17 18:39:14 2015
|
||||
@@ -3071,6 +3071,10 @@ gdm_session_get_display_mode (GdmSession *self)
|
||||
--- daemon/gdm-session.c.orig Thu Apr 14 07:56:26 2016
|
||||
+++ daemon/gdm-session.c Fri Apr 15 15:05:26 2016
|
||||
@@ -3060,6 +3060,10 @@ gdm_session_get_display_mode (GdmSession *self)
|
||||
self->priv->is_program_session? "yes" : "no",
|
||||
self->priv->display_seat_id);
|
||||
|
||||
@ -25,7 +25,7 @@ Subject: session: drop session-type property
|
||||
#ifdef ENABLE_WAYLAND_SUPPORT
|
||||
/* Wayland sessions are for now assumed to run in a
|
||||
* mutter-launch-like environment, so we allocate
|
||||
@@ -3109,6 +3113,27 @@ gdm_session_select_program (GdmSession *self,
|
||||
@@ -3098,6 +3102,27 @@ gdm_session_select_program (GdmSession *self,
|
||||
g_free (self->priv->selected_program);
|
||||
|
||||
self->priv->selected_program = g_strdup (text);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user