Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2013-05-06 10:10:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2013-05-03 07:33:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2013-05-06 10:10:50.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 4 18:35:23 UTC 2013 - [email protected] + +- Added lightdm-fix-pkgconfig.patch, fixes liblightdm-3 pc file + +------------------------------------------------------------------- New: ---- lightdm-fix-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -52,6 +52,8 @@ Patch5: lightdm-disable-utmp-handling.patch # PATCH-FIX-OPENSUSE lightdm-use-run-dir.patch [email protected] -- Use /run instead of /var/run Patch6: lightdm-use-run-dir.patch +# PATCH-FIX-UPSTREAM lightdm-fix-pkgconfig.patch [email protected] -- Adjust pc file for new libqlightdm version +Patch7: lightdm-fix-pkgconfig.patch BuildRequires: gcc-c++ BuildRequires: gnome-common BuildRequires: gtk-doc @@ -138,6 +140,7 @@ %if 0%{?suse_version} >= 1230 %patch6 -p1 %endif +%patch7 -p1 %build bash ./autogen.sh ++++++ lightdm-disable-utmp-handling.patch ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -1,6 +1,10 @@ -diff -urNB lightdm-1.5.0/src/session-child.c new/src/session-child.c ---- lightdm-1.5.0/src/session-child.c 2013-01-31 21:28:23.000000000 +0100 -+++ new/src/session-child.c 2013-02-01 14:23:24.518480052 +0100 +# HG changeset patch +# Parent 2544ba70bcb3588f9564f8ae079020ce76a9240b +disable utmp handling since this is handled in the Xstartup/Xreset scripts + +diff --git a/src/session-child.c b/src/session-child.c +--- a/src/session-child.c ++++ b/src/session-child.c @@ -13,7 +13,9 @@ #include <grp.h> #include <glib.h> @@ -11,7 +15,7 @@ #include <sys/mman.h> #include "configuration.h" -@@ -545,6 +547,7 @@ +@@ -578,6 +580,7 @@ session_child_run (int argc, char **argv /* Wait for the command to complete (blocks) */ if (child_pid > 0) { @@ -19,7 +23,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -570,10 +573,10 @@ +@@ -603,10 +606,10 @@ session_child_run (int argc, char **argv g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } @@ -32,7 +36,7 @@ /* Log to utmp */ if (g_strcmp0 (class, XDG_SESSION_CLASS_GREETER) != 0) { -@@ -599,6 +602,7 @@ +@@ -632,6 +635,7 @@ session_child_run (int argc, char **argv g_printerr ("Failed to write utmpx: %s\n", strerror (errno)); endutxent (); } ++++++ lightdm-fix-pkgconfig.patch ++++++ # HG changeset patch # User Michael Terry <[email protected]> # Date 1367539727 25200 # Node ID 1d123578623a9a8b84708303bad7fd99bbd62ee9 # Parent 2eb116f890c245a57424f9ce2860f404c85c4c8d Fix pc file for liblightdm-qt-3 and liblightdm-qt5-3 diff --git a/liblightdm-qt/liblightdm-qt-3.pc.in b/liblightdm-qt/liblightdm-qt-3.pc.in --- a/liblightdm-qt/liblightdm-qt-3.pc.in +++ b/liblightdm-qt/liblightdm-qt-3.pc.in @@ -7,5 +7,5 @@ Name: liblightdm-qt Description: LightDM Qt4 client library Version: @VERSION@ Requires: QtCore QtGui -Libs: -L${libdir} -llightdm-qt-2 -Cflags: -I${includedir}/lightdm-qt-2 +Libs: -L${libdir} -llightdm-qt-3 +Cflags: -I${includedir}/lightdm-qt-3 diff --git a/liblightdm-qt/liblightdm-qt5-3.pc.in b/liblightdm-qt/liblightdm-qt5-3.pc.in --- a/liblightdm-qt/liblightdm-qt5-3.pc.in +++ b/liblightdm-qt/liblightdm-qt5-3.pc.in @@ -7,5 +7,5 @@ Name: liblightdm-qt5 Description: LightDM Qt5 client library Version: @VERSION@ Requires: Qt5Core Qt5Gui -Libs: -L${libdir} -llightdm-qt5-2 -Cflags: -I${includedir}/lightdm-qt5-2 +Libs: -L${libdir} -llightdm-qt5-3 +Cflags: -I${includedir}/lightdm-qt5-3 ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -3,7 +3,7 @@ diff --git a/src/session-child.c b/src/session-child.c --- a/src/session-child.c +++ b/src/session-child.c -@@ -472,10 +472,7 @@ session_child_run (int argc, char **argv +@@ -512,10 +512,7 @@ session_child_run (int argc, char **argv g_free (value); } ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -1,6 +1,8 @@ -diff -urNB lightdm-1.5.2/data/lightdm.conf new/data/lightdm.conf ---- lightdm-1.5.2/data/lightdm.conf 2013-03-06 03:40:10.000000000 +0100 -+++ new/data/lightdm.conf 2013-03-27 12:44:12.162028461 +0100 +retrieve configuration seetings from sysconfig files + +diff --git a/data/lightdm.conf b/data/lightdm.conf +--- a/data/lightdm.conf ++++ b/data/lightdm.conf @@ -1,3 +1,32 @@ +# NOTE: settings under /etc/sysconfig take precendence over those below, +# specifically: @@ -34,10 +36,22 @@ # # General configuration # -diff -urNB lightdm-1.5.2/src/display.c new/src/display.c ---- lightdm-1.5.2/src/display.c 2013-03-26 23:08:07.000000000 +0100 -+++ new/src/display.c 2013-03-27 12:46:11.734533599 +0100 -@@ -410,7 +410,10 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,6 +28,8 @@ lightdm_SOURCES = \ + lightdm.c \ + ldm-marshal.c \ + ldm-marshal.h \ ++ opensuse-sysconfig.c \ ++ opensuse-sysconfig.h \ + login1.c \ + login1.h \ + plymouth.c \ +diff --git a/src/display.c b/src/display.c +--- a/src/display.c ++++ b/src/display.c +@@ -410,7 +410,10 @@ start_greeter (Display *display) g_signal_connect (display->priv->session, "authentication-complete", G_CALLBACK (greeter_authentication_complete_cb), display); /* Make communication link to greeter that will run on this session */ @@ -49,7 +63,7 @@ g_signal_connect (G_OBJECT (display->priv->greeter), "connected", G_CALLBACK (greeter_connected_cb), display); g_signal_connect (G_OBJECT (display->priv->greeter), "start-authentication", G_CALLBACK (greeter_start_authentication_cb), display); g_signal_connect (G_OBJECT (display->priv->greeter), "start-session", G_CALLBACK (greeter_start_session_cb), display); -@@ -788,7 +791,10 @@ +@@ -797,7 +800,10 @@ display_server_ready_cb (DisplayServer * else if (display->priv->select_user_hint && display->priv->select_user_attempt_login) { g_debug ("Logging in user %s", display->priv->select_user_hint); @@ -61,9 +75,9 @@ } /* If no session started, start a greeter */ -diff -urNB lightdm-1.5.2/src/lightdm.c new/src/lightdm.c ---- lightdm-1.5.2/src/lightdm.c 2013-03-07 22:29:53.000000000 +0100 -+++ new/src/lightdm.c 2013-03-27 12:49:39.381937649 +0100 +diff --git a/src/lightdm.c b/src/lightdm.c +--- a/src/lightdm.c ++++ b/src/lightdm.c @@ -21,6 +21,7 @@ #include <sys/stat.h> @@ -72,7 +86,7 @@ #include "display-manager.h" #include "xdmcp-server.h" #include "vnc-server.h" -@@ -60,6 +61,117 @@ +@@ -60,6 +61,117 @@ typedef struct #define LIGHTDM_BUS_NAME "org.freedesktop.DisplayManager" @@ -190,7 +204,7 @@ static void log_cb (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer data) { -@@ -1045,6 +1157,9 @@ +@@ -1046,6 +1158,9 @@ main (int argc, char **argv) g_mkdir_with_parents (dir, S_IRWXU | S_IXGRP | S_IXOTH); g_free (dir); @@ -200,21 +214,10 @@ log_init (); g_debug ("Starting Light Display Manager %s, UID=%i PID=%i", VERSION, getuid (), getpid ()); -diff -urNB lightdm-1.5.2/src/Makefile.am new/src/Makefile.am ---- lightdm-1.5.2/src/Makefile.am 2013-03-06 03:40:10.000000000 +0100 -+++ new/src/Makefile.am 2013-03-27 12:50:14.660496606 +0100 -@@ -28,6 +28,8 @@ lightdm_SOURCES = \ - lightdm.c \ - ldm-marshal.c \ - ldm-marshal.h \ -+ opensuse-sysconfig.c \ -+ opensuse-sysconfig.h \ - login1.c \ - login1.h \ - plymouth.c \ -diff -urNB lightdm-1.5.2/src/opensuse-sysconfig.c new/src/opensuse-sysconfig.c ---- lightdm-1.5.2/src/opensuse-sysconfig.c 1970-01-01 01:00:00.000000000 +0100 -+++ new/src/opensuse-sysconfig.c 2013-02-01 13:49:53.068382703 +0100 +diff --git a/src/opensuse-sysconfig.c b/src/opensuse-sysconfig.c +new file mode 100644 +--- /dev/null ++++ b/src/opensuse-sysconfig.c @@ -0,0 +1,380 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -596,9 +599,10 @@ + return boolean_value; +} + -diff -urNB lightdm-1.5.2/src/opensuse-sysconfig.h new/src/opensuse-sysconfig.h ---- lightdm-1.5.2/src/opensuse-sysconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ new/src/opensuse-sysconfig.h 2013-02-01 13:49:53.068382703 +0100 +diff --git a/src/opensuse-sysconfig.h b/src/opensuse-sysconfig.h +new file mode 100644 +--- /dev/null ++++ b/src/opensuse-sysconfig.h @@ -0,0 +1,50 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * ++++++ lightdm-use-run-dir.patch ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 16baf7f6a5360a28f37c8cf324577209ece84fb2 +# Parent eef396cf8403d166680c9a19ce719d3bc28d128d Use /run instead of localstatedir/run/lightdm diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -87,7 +87,7 @@ lightdm_CFLAGS = \ +@@ -89,7 +89,7 @@ lightdm_CFLAGS = \ -DSBIN_DIR=\"$(sbindir)\" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ ++++++ lightdm-xauthlocalhostname-support.patch ++++++ --- /var/tmp/diff_new_pack.N6Mbjd/_old 2013-05-06 10:10:51.000000000 +0200 +++ /var/tmp/diff_new_pack.N6Mbjd/_new 2013-05-06 10:10:51.000000000 +0200 @@ -3,7 +3,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -50,6 +50,8 @@ lightdm_SOURCES = \ +@@ -52,6 +52,8 @@ lightdm_SOURCES = \ session.h \ session-child.c \ session-child.h \ @@ -71,7 +71,7 @@ diff --git a/src/xserver-local.c b/src/xserver-local.c --- a/src/xserver-local.c +++ b/src/xserver-local.c -@@ -22,6 +22,7 @@ +@@ -23,6 +23,7 @@ #include "process.h" #include "vt.h" #include "plymouth.h" @@ -79,7 +79,7 @@ struct XServerLocalPrivate { -@@ -386,7 +387,7 @@ xserver_local_start (DisplayServer *disp +@@ -407,7 +408,7 @@ xserver_local_start (DisplayServer *disp XServerLocal *server = XSERVER_LOCAL (display_server); gboolean result; gchar *filename, *dir, *absolute_command; @@ -88,7 +88,7 @@ GString *command; g_return_val_if_fail (server->priv->xserver_process == NULL, FALSE); -@@ -427,11 +428,13 @@ xserver_local_start (DisplayServer *disp +@@ -448,11 +449,13 @@ xserver_local_start (DisplayServer *disp if (server->priv->layout) g_string_append_printf (command, " -layout %s", server->priv->layout); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
