Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked
in at 2017-07-21 22:44:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Fri Jul 21 22:44:00 2017 rev:93 rq:511865 version:1.22.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2017-07-05
23:56:34.180027119 +0200
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2017-07-21
22:44:09.309113166 +0200
@@ -1,0 +2,8 @@
+Fri Jul 21 13:21:30 UTC 2017 - dims...@opensuse.org
+
+- Update lightdm-sysconfig-support.patch: deprecate the use of
+ DEFAULT_WM in /etc/sysconfig/windowmanager. The new way of
+ setting the system default WM is by means of update-alternatives,
+ handling the /usr/share/xsessions/default.desktop (boo#1030873).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm-sysconfig-support.patch ++++++
--- /var/tmp/diff_new_pack.eR8JZ4/_old 2017-07-21 22:44:10.164992433 +0200
+++ /var/tmp/diff_new_pack.eR8JZ4/_new 2017-07-21 22:44:10.164992433 +0200
@@ -1,6 +1,8 @@
---- a/data/lightdm.conf
-+++ b/data/lightdm.conf
-@@ -1,3 +1,30 @@
+Index: lightdm-1.22.0/data/lightdm.conf
+===================================================================
+--- lightdm-1.22.0.orig/data/lightdm.conf
++++ lightdm-1.22.0/data/lightdm.conf
+@@ -1,3 +1,26 @@
+# NOTE: settings under /etc/sysconfig take precendence over those below,
+# specifically:
+#
@@ -23,16 +25,14 @@
+# [Seat:*]
+# xserver-allow-tcp = <value>
+#
-+# /etc/sysconfig/windowmanager - DEFAULT_WM:
-+# [SeatDefaults]
-+# user-session = <value>
-+#
+
#
# General configuration
#
---- a/src/lightdm.c
-+++ b/src/lightdm.c
+Index: lightdm-1.22.0/src/lightdm.c
+===================================================================
+--- lightdm-1.22.0.orig/src/lightdm.c
++++ lightdm-1.22.0/src/lightdm.c
@@ -22,6 +22,7 @@
#include <errno.h>
@@ -41,12 +41,11 @@
#include "display-manager.h"
#include "display-manager-service.h"
#include "xdmcp-server.h"
-@@ -50,6 +51,114 @@ static gint exit_code = EXIT_SUCCESS;
+@@ -50,6 +51,85 @@ static gint exit_code = EXIT_SUCCESS;
static gboolean update_login1_seat (Login1Seat *login1_seat);
+#define SYSCONFIG_DISPLAYMANAGER "/etc/sysconfig/displaymanager"
-+#define SYSCONFIG_WINDOWMANAGER "/etc/sysconfig/windowmanager"
+
+static void
+config_load_sysconfig (Configuration *config)
@@ -122,41 +121,13 @@
+ }
+ }
+
-+ windowmanager_config = opensuse_sysconfig_load_file
(SYSCONFIG_WINDOWMANAGER, &error);
-+ if (windowmanager_config)
-+ {
-+ str_value = opensuse_sysconfig_get_string (windowmanager_config,
"DEFAULT_WM", &error);
-+ if (!error)
-+ {
-+ if (*str_value != '\0')
-+ config_set_string (config_get_instance (), "Seat:*",
"user-session", str_value);
-+ g_free (str_value);
-+ }
-+ else
-+ {
-+ g_warning ("Failed to read 'DEFAULT_WM' from "
SYSCONFIG_WINDOWMANAGER);
-+ g_clear_error (&error);
-+ }
-+
-+ g_strfreev (windowmanager_config);
-+ }
-+ else
-+ {
-+ g_warning ("Failed to read " SYSCONFIG_WINDOWMANAGER);
-+ if (error)
-+ {
-+ g_warning ("%s", error->message);
-+ g_clear_error (&error);
-+ }
-+ }
-+
+ return;
+}
+
static void
log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar
*message, gpointer data)
{
-@@ -927,6 +1036,9 @@ main (int argc, char **argv)
+@@ -933,6 +1013,9 @@ main (int argc, char **argv)
g_warning ("Failed to make cache directory %s: %s", dir, strerror
(errno));
g_free (dir);
@@ -166,8 +137,10 @@
log_init ();
/* Show queued messages once logging is complete */
---- a/src/Makefile.am
-+++ b/src/Makefile.am
+Index: lightdm-1.22.0/src/Makefile.am
+===================================================================
+--- lightdm-1.22.0.orig/src/Makefile.am
++++ lightdm-1.22.0/src/Makefile.am
@@ -77,7 +77,9 @@ lightdm_SOURCES = \
xdmcp-server.h \
xdmcp-session.c \
@@ -179,8 +152,10 @@
lightdm_CFLAGS = \
$(WARN_CFLAGS) \
--- /dev/null
-+++ b/src/opensuse-sysconfig.c
+Index: lightdm-1.22.0/src/opensuse-sysconfig.c
+===================================================================
+--- /dev/null
++++ lightdm-1.22.0/src/opensuse-sysconfig.c
@@ -0,0 +1,380 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -562,8 +537,10 @@
+ return boolean_value;
+}
+
+Index: lightdm-1.22.0/src/opensuse-sysconfig.h
+===================================================================
--- /dev/null
-+++ b/src/opensuse-sysconfig.h
++++ lightdm-1.22.0/src/opensuse-sysconfig.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -615,8 +592,10 @@
+G_END_DECLS
+
+#endif /* __OPENSUSE_SYSCONFIG_H */
---- a/src/seat.c
-+++ b/src/seat.c
+Index: lightdm-1.22.0/src/seat.c
+===================================================================
+--- lightdm-1.22.0.orig/src/seat.c
++++ lightdm-1.22.0/src/seat.c
@@ -1338,9 +1338,14 @@ create_greeter_session (Seat *seat)
session_set_argv (SESSION (greeter_session), argv);
g_strfreev (argv);
