rpms/kdebase-workspace/devel kdebase-workspace-4.0.98-consolekit-kdm.patch, 1.1, 1.2
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Tue Jul 15 01:33:47 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11401/devel
Modified Files:
kdebase-workspace-4.0.98-consolekit-kdm.patch
Log Message:
Fix patch.
kdebase-workspace-4.0.98-consolekit-kdm.patch:
Index: kdebase-workspace-4.0.98-consolekit-kdm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.98-consolekit-kdm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.98-consolekit-kdm.patch 14 Jul 2008 23:02:40 -0000 1.1
+++ kdebase-workspace-4.0.98-consolekit-kdm.patch 15 Jul 2008 01:33:04 -0000 1.2
@@ -1,7 +1,7 @@
diff -Nur kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake
--- kdebase-workspace-4.0.98/cmake/modules/FindCkConnector.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 00:13:56.000000000 +0200
-@@ -0,0 +1,57 @@
++++ kdebase-workspace-4.0.98-consolekit-kdm/cmake/modules/FindCkConnector.cmake 2008-07-15 03:31:04.000000000 +0200
+@@ -0,0 +1,58 @@
+# - Try to find the ConsoleKit connector library (libck-connector)
+# Once done this will define
+#
@@ -32,6 +32,7 @@
+ ENDIF (NOT WIN32)
+
+ FIND_PATH(CKCONNECTOR_INCLUDE_DIR ck-connector.h
++ ${_ckConnectorIncDir}/ConsoleKit/ck-connector
+ ${_ckConnectorIncDir}
+ )
+
@@ -160,7 +161,7 @@
int readDmrc( void );
diff -Nur kdebase-workspace-4.0.98/kdm/backend/session.c kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c
--- kdebase-workspace-4.0.98/kdm/backend/session.c 2008-01-05 00:55:44.000000000 +0100
-+++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 00:45:59.000000000 +0200
++++ kdebase-workspace-4.0.98-consolekit-kdm/kdm/backend/session.c 2008-07-15 03:18:06.000000000 +0200
@@ -45,6 +45,14 @@
#include <ctype.h>
#include <signal.h>
@@ -195,18 +196,18 @@
td = d;
debug( "manageSession %s\n", d->name );
if ((ex = Setjmp( abortSession ))) {
-@@ -627,8 +647,58 @@
-
+@@ -628,7 +648,58 @@
if (td_setup)
setupDisplay( td_setup );
+
++#ifdef HAVE_CKCONNECTOR
+#ifdef HAVE_VTS
+ if (d->serverVT > 0) {
+ /* FIXME: how does xorg construct this */
+ sprintf(device, "/dev/tty%d", d->serverVT);
+ }
+#endif
-
-+#ifdef HAVE_CKCONNECTOR
++
+ pwent = getpwnam(curuser);
+ if (pwent == NULL) {
+ debug ("NULL user\n");
@@ -254,7 +255,7 @@
logError( "Client start failed\n" );
sessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
}
-@@ -650,6 +720,23 @@
+@@ -650,6 +721,23 @@
catchTerm( SIGTERM );
}
}
More information about the fedora-extras-commits
mailing list