Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2011-10-26 15:31:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2011-10-19 13:40:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2011-10-26 15:39:56.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Oct 26 09:47:23 UTC 2011 - g...@opensuse.org + +- update to version 1.0.4 + - fix --enable-gtk-greeter=yes not working + - fix X sessions with arguments in Exec not working + - use previous session for automatic login or if greeter does not + request one + - correct ownership of ~/.Xauthority if upgrading from buggy + version of LightDM that had it root owned + - set default resolution of VNC to 1024x768, add settings for + width, height, depth into lightdm.conf + - AppArmor profile: Fix broken gnome-keyring and dbus/gwibber, + and quiesce annoying kernel audit messages for privileges that + we definitively do not want to grant + - set LOGNAME environment variable + +------------------------------------------------------------------- Old: ---- lightdm-1.0.3.tar.gz New: ---- lightdm-1.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.0.3 +Version: 1.0.4 Release: 1 Summary: Lightweight, Cross-desktop Display Manager Group: System/X11/Displaymanagers ++++++ lightdm-1.0.3.tar.gz -> lightdm-1.0.4.tar.gz ++++++ ++++ 23579 lines of diff (skipped) ++++++ lightdm-default-configuration.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 080ce97fa0f70bce82d41bc5ce308982a24f522a +# Parent a5fbc3e2645c335d3936ca62c61b7555468f4da7 openSUSE-specific default configuration diff --git a/data/lightdm.conf b/data/lightdm.conf @@ -42,7 +42,7 @@ diff --git a/data/users.conf b/data/users.conf --- a/data/users.conf +++ b/data/users.conf -@@ -6,6 +6,6 @@ +@@ -9,6 +9,6 @@ # hidden-shells = Shells that indicate a user cannot login # [UserAccounts] ++++++ lightdm-desktop-session-env-pam.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent db97db2821c84b9a5d51c4c42f3e69ae6f45ca10 +# Parent cd6e0c1fd5632551b248be13bfebae8cd621114b pass a DESKTOP_SESSION environment variable with the name of the selected session into the PAM environment diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -465,6 +465,8 @@ create_session (Display *display, PAMSes +@@ -490,6 +490,8 @@ create_session (Display *display, PAMSes session_set_authentication (session, authentication); session_set_command (session, command); g_free (command); @@ -88,7 +88,7 @@ void session_set_command (Session *session, const gchar *command) { -@@ -273,7 +291,7 @@ session_real_start (Session *session) +@@ -277,7 +295,7 @@ session_real_start (Session *session) process_set_command (PROCESS (session), absolute_command); g_free (absolute_command); ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -1,19 +1,19 @@ # HG changeset patch -# Parent 4efa36a96678139f52531e2309798ccad731be02 +# Parent ba843deea04ac9f614338045d71e362fd92127bc set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper diff --git a/src/session.c b/src/session.c --- a/src/session.c +++ b/src/session.c -@@ -272,6 +272,7 @@ session_start (Session *session) - session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? +@@ -274,6 +274,7 @@ session_start (Session *session) + session_set_env (session, "LOGNAME", user_get_name (user)); session_set_env (session, "HOME", user_get_home_directory (user)); session_set_env (session, "SHELL", user_get_shell (user)); + session_set_env (session, "GDMFLEXISERVER", PKGLIBEXEC_DIR "/gdmflexiserver"); - return SESSION_GET_CLASS (session)->start (session); - } -@@ -451,7 +452,7 @@ session_run (Process *process) + session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? + +@@ -455,7 +456,7 @@ session_run (Process *process) pam_session_setup (session->priv->authentication); set_env_from_authentication (session, session->priv->authentication); set_locale (session); ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -51,7 +51,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -853,7 +853,10 @@ static void +@@ -887,7 +887,10 @@ static void display_init (Display *display) { display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE, DisplayPrivate); ++++++ lightdm-use-pkglibexecdir.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent c01a70c16eaab921742d9f62da32b6cd34bfa18d +# Parent 79422a3a63bcacbadbb7c27ced238711d5d318cb Use pkglibexecdir instead of libexecdir for helper binaries/scripts diff --git a/data/Makefile.am b/data/Makefile.am @@ -41,7 +41,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -449,7 +449,7 @@ create_session (Display *display, PAMSes +@@ -474,7 +474,7 @@ create_session (Display *display, PAMSes if (display->priv->autologin_guest) { gchar *t = command; ++++++ lightdm-vnc-configuration.patch ++++++ --- /var/tmp/diff_new_pack.hfKLRG/_old 2011-10-26 15:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.hfKLRG/_new 2011-10-26 15:40:12.000000000 +0200 @@ -1,21 +1,11 @@ Set default resolution of VNC to 1024x768, add settings for width, height, depth into lightdm.conf -diff --git a/data/lightdm.conf b/data/lightdm.conf ---- a/data/lightdm.conf -+++ b/data/lightdm.conf -@@ -137,3 +137,6 @@ session-cleanup-script=/etc/X11/xdm/Xres - [VNCServer] - #enabled=false - #port=5900 -+#width=1024 -+#height=768 -+#depth=8 diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c --- a/src/seat-xvnc.c +++ b/src/seat-xvnc.c @@ -39,6 +39,23 @@ seat_xvnc_create_display_server (Seat *s xserver = xserver_xvnc_new (); - xserver_xvnc_set_stdin (xserver, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection)); + xserver_xvnc_set_socket (xserver, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection)); + if (config_has_key (config_get_instance (), "VNCServer", "width") && + config_has_key (config_get_instance (), "VNCServer", "height")) @@ -37,103 +27,3 @@ return DISPLAY_SERVER (xserver); } -diff --git a/src/xserver-xvnc.c b/src/xserver-xvnc.c ---- a/src/xserver-xvnc.c -+++ b/src/xserver-xvnc.c -@@ -34,6 +34,9 @@ struct XServerXVNCPrivate - - /* File descriptor to use for standard input */ - gint stdin_fd; -+ -+ /* Geometry and colour depth */ -+ gint width, height, depth; - - /* TRUE when received ready signal */ - gboolean got_signal; -@@ -70,6 +73,21 @@ xserver_xvnc_get_stdin (XServerXVNC *ser - return server->priv->stdin_fd; - } - -+void -+xserver_xvnc_set_geometry (XServerXVNC *server, gint width, gint height) -+{ -+ g_return_if_fail (server != NULL); -+ server->priv->width = width; -+ server->priv->height = height; -+} -+ -+void -+xserver_xvnc_set_depth (XServerXVNC *server, gint depth) -+{ -+ g_return_if_fail (server != NULL); -+ server->priv->depth = depth; -+} -+ - gchar * - xserver_xvnc_get_authority_file_path (XServerXVNC *server) - { -@@ -173,7 +191,8 @@ xserver_xvnc_start (DisplayServer *displ - XServerXVNC *server = XSERVER_XVNC (display_server); - XAuthority *authority; - gboolean result; -- gchar *filename, *run_dir, *dir, *path, *absolute_command, *command; -+ gchar *filename, *run_dir, *dir, *path, *absolute_command; -+ GString *command; - gchar hostname[1024], *number; - GError *error = NULL; - -@@ -226,16 +245,21 @@ xserver_xvnc_start (DisplayServer *displ - if (error) - g_warning ("Failed to write authority: %s", error->message); - g_clear_error (&error); -+ -+ command = g_string_new (absolute_command); -+ g_free (absolute_command); -+ -+ g_string_append_printf (command, " :%d", xserver_get_display_number (XSERVER (server))); -+ g_string_append_printf (command, " -auth %s ", path); -+ g_free (path); -+ g_string_append (command, " -inetd -nolisten tcp"); -+ if (server->priv->width > 0 && server->priv->height > 0) -+ g_string_append_printf (command, " -geometry %dx%d ", server->priv->width, server->priv->height); -+ if (server->priv->depth > 0) -+ g_string_append_printf (command, " -depth %d ", server->priv->depth); - -- command = g_strdup_printf ("%s :%d -auth %s -inetd -nolisten tcp", -- absolute_command, -- xserver_get_display_number (XSERVER (server)), -- path); -- g_free (absolute_command); -- g_free (path); -- -- process_set_command (server->priv->xserver_process, command); -- g_free (command); -+ process_set_command (server->priv->xserver_process, command->str); -+ g_string_free (command, TRUE); - - g_debug ("Launching Xvnc server"); - -@@ -260,6 +284,9 @@ static void - xserver_xvnc_init (XServerXVNC *server) - { - server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, XSERVER_XVNC_TYPE, XServerXVNCPrivate); -+ server->priv->width = 1024; -+ server->priv->height = 768; -+ server->priv->depth = 8; - } - - static void -diff --git a/src/xserver-xvnc.h b/src/xserver-xvnc.h ---- a/src/xserver-xvnc.h -+++ b/src/xserver-xvnc.h -@@ -45,6 +45,10 @@ void xserver_xvnc_set_stdin (XServerXVNC - - int xserver_xvnc_get_stdin (XServerXVNC *server); - -+void xserver_xvnc_set_geometry (XServerXVNC *server, gint width, gint height); -+ -+void xserver_xvnc_set_depth (XServerXVNC *server, gint depth); -+ - gchar *xserver_xvnc_get_authority_file_path (XServerXVNC *server); - - G_END_DECLS -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org