diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-05 19:24:58 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-05 19:24:58 +0000 |
| commit | c5accf0b1725931103517e6be9ee055747b0a713 (patch) | |
| tree | cb0d0e6adfda9d20a4b74ed8abce7572e93c4184 /x11/kdebase4-runtime/files | |
| parent | a39413592f31d8b91f994ab980ac410aa258c782 (diff) | |
Update to KDE 3.5.3
Notes
Notes:
svn path=/head/; revision=164487
Diffstat (limited to 'x11/kdebase4-runtime/files')
| -rw-r--r-- | x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c | 11 | ||||
| -rw-r--r-- | x11/kdebase4-runtime/files/patch-ksmserver-legacy.cpp | 13 | ||||
| -rw-r--r-- | x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp | 20 |
3 files changed, 11 insertions, 33 deletions
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..e0179de4e074 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c.orig Mon Jun 5 14:34:06 2006 ++++ kdm/kfrontend/genkdmconf.c Mon Jun 5 14:35:52 2006 +@@ -1684,7 +1684,7 @@ + linkfile( ce ); + else { + tmpf = locate( "mktemp" ) ? +- "`mktemp`" : ++ "`mktemp /tmp/xsess-env-XXXXXX`" : + locate( "tempfile" ) ? + "`tempfile`" : + "$HOME/.xsession-env-$DISPLAY"; diff --git a/x11/kdebase4-runtime/files/patch-ksmserver-legacy.cpp b/x11/kdebase4-runtime/files/patch-ksmserver-legacy.cpp deleted file mode 100644 index 553e15953605..000000000000 --- a/x11/kdebase4-runtime/files/patch-ksmserver-legacy.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- ksmserver/legacy.cpp.orig Sun Feb 12 16:47:39 2006 -+++ ksmserver/legacy.cpp Sun Feb 12 16:48:55 2006 -@@ -36,6 +36,10 @@ - - #include "server.h" - -+#ifdef HAVE_SYS_TIME_H -+#include <sys/time.h> -+#endif -+ - #include <unistd.h> - - #include <qtimer.h> diff --git a/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp b/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp deleted file mode 100644 index 1254fc501ed8..000000000000 --- a/x11/kdebase4-runtime/files/patch-kwin-tabbox.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- kwin/tabbox.cpp 2006/03/17 21:38:24 519807 -+++ kwin/tabbox.cpp 2006/04/03 13:05:18 525954 -@@ -1152,7 +1152,7 @@ - */ - Client* Workspace::nextFocusChainClient( Client* c ) const - { -- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop(); -+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop(); - if ( focus_chain[desktop].isEmpty() ) - return 0; - ClientList::ConstIterator it = focus_chain[desktop].find( c ); -@@ -1170,7 +1170,7 @@ - */ - Client* Workspace::previousFocusChainClient( Client* c ) const - { -- int desktop = c->isOnAllDesktops() ? currentDesktop() : c->desktop(); -+ int desktop = !c || c->isOnAllDesktops() ? currentDesktop() : c->desktop(); - if ( focus_chain[desktop].isEmpty() ) - return 0; - ClientList::ConstIterator it = focus_chain[desktop].find( c ); |