aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-workspace/files/patch-kdm__backend__client.c
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2010-09-02 21:06:27 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2010-09-02 21:06:27 +0000
commit08351f8e016396e46d654e72eceb6a2ed81aadbb (patch)
treed97f07c03bb7f9977c1021629266214a9d2310e6 /x11/kde4-workspace/files/patch-kdm__backend__client.c
parent0b3b58a79f748bf25f2a89f19316de184c390fa6 (diff)
downloadports-08351f8e016396e46d654e72eceb6a2ed81aadbb.tar.gz
ports-08351f8e016396e46d654e72eceb6a2ed81aadbb.zip
KDE FreeBSD team presents KDE SC 4.5.1.
New ports added: misc/kde4-l10n-ia - Interlingua localization for KDE
Notes
Notes: svn path=/head/; revision=260443
Diffstat (limited to 'x11/kde4-workspace/files/patch-kdm__backend__client.c')
-rw-r--r--x11/kde4-workspace/files/patch-kdm__backend__client.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/x11/kde4-workspace/files/patch-kdm__backend__client.c b/x11/kde4-workspace/files/patch-kdm__backend__client.c
index fe71ad1286a9..ddc34a7504ae 100644
--- a/x11/kde4-workspace/files/patch-kdm__backend__client.c
+++ b/x11/kde4-workspace/files/patch-kdm__backend__client.c
@@ -1,26 +1,26 @@
---- kdm/backend/client.c.orig 2010-03-26 18:26:49.000000000 +0100
-+++ kdm/backend/client.c 2010-06-16 00:28:31.056683006 +0200
-@@ -1271,6 +1271,9 @@
- char ckDeviceBuf[20] = "";
- const char *ckDevice = ckDeviceBuf;
- dbus_bool_t isLocal;
+--- ./kdm/backend/client.c.orig 2010-07-06 10:54:30.000000000 +0400
++++ ./kdm/backend/client.c 2010-07-30 22:23:48.264408318 +0400
+@@ -1309,6 +1309,9 @@
+ char ckDeviceBuf[20] = "";
+ const char *ckDevice = ckDeviceBuf;
+ dbus_bool_t isLocal;
+# ifdef BSD
+ FILE *proc;
+# endif
#endif
- char *failsafeArgv[2];
- char *buf, *buf2;
-@@ -1302,6 +1305,13 @@
+ char *failsafeArgv[2];
+ char *buf, *buf2;
+@@ -1340,6 +1343,13 @@
# ifdef HAVE_VTS
- if (td->serverVT > 0)
- sprintf( ckDeviceBuf, "/dev/tty%d", td->serverVT );
+ if (td->serverVT > 0)
+ sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT);
+# elif defined(BSD)
-+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
++ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) {
+ fscanf( proc, "%s", ckDeviceBuf );
-+ pclose( proc );
++ pclose(proc);
+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0)
+ ckDeviceBuf[0] = '\0';
+ }
# endif
- isLocal = ((td->displayType & d_location) == dLocal);
+ isLocal = ((td->displayType & d_location) == dLocal);
# ifdef XDMCP