[kdebase-workspace] update the patch

Lukas Tinkl ltinkl at fedoraproject.org
Thu Aug 12 13:47:14 UTC 2010


commit bd82b71d5b62093046822e88314564b1868e84e2
Author: Lukas Tinkl <lukas at kde.org>
Date:   Thu Aug 12 15:47:01 2010 +0200

    update the patch

 kdebase-workspace-4.5.0-startkde-malloc.patch |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/kdebase-workspace-4.5.0-startkde-malloc.patch b/kdebase-workspace-4.5.0-startkde-malloc.patch
index d97ddf7..8d9de24 100644
--- a/kdebase-workspace-4.5.0-startkde-malloc.patch
+++ b/kdebase-workspace-4.5.0-startkde-malloc.patch
@@ -1,5 +1,5 @@
---- startkde.cmake	2010/08/12 11:40:19	1162652
-+++ startkde.cmake	2010/08/12 11:41:53	1162653
+--- startkde.cmake.old	2010-08-12 15:41:41.810952995 +0200
++++ startkde.cmake	2010-08-12 15:41:53.597077083 +0200
 @@ -36,18 +36,6 @@
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
@@ -19,18 +19,3 @@
  # in case we have been started with full pathname spec without being in PATH
  bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
  if [ -n "$bindir" ]; then
-@@ -405,11 +393,11 @@
- # if KDEWM is not set, ksmserver will ensure kwin is started.
- # kwrapper4 is used to reduce startup time and memory usage
- # kwrapper4 does not return useful error codes such as the exit code of ksmserver.
--# We only check for 255 which means that the ksmserver process could not be 
--# started, any problems thereafter, e.g. ksmserver failing to initialize, 
-+# We only check for 255 which means that the ksmserver process could not be
-+# started, any problems thereafter, e.g. ksmserver failing to initialize,
- # will remain undetected.
- test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
--kwrapper4 ksmserver $KDEWM 
-+kwrapper4 ksmserver $KDEWM
- if test $? -eq 255; then
-   # Startup error
-   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2


More information about the scm-commits mailing list