[kdebase-workspace] rebase startkde-malloc patch

Rex Dieter rdieter at fedoraproject.org
Thu Aug 12 14:49:49 UTC 2010


commit 50576d614874b01b6ed34dd61f3ba1d79765f00c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 12 09:54:19 2010 -0500

    rebase startkde-malloc patch

 kdebase-workspace-4.5.0-startkde-malloc.patch |   13 +++++++------
 kdebase-workspace.spec                        |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/kdebase-workspace-4.5.0-startkde-malloc.patch b/kdebase-workspace-4.5.0-startkde-malloc.patch
index 8d9de24..589c267 100644
--- a/kdebase-workspace-4.5.0-startkde-malloc.patch
+++ b/kdebase-workspace-4.5.0-startkde-malloc.patch
@@ -1,6 +1,7 @@
---- 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 @@
+diff -up kdebase-workspace-4.5.0/startkde.cmake.startkde-malloc kdebase-workspace-4.5.0/startkde.cmake
+--- kdebase-workspace-4.5.0/startkde.cmake.startkde-malloc	2010-08-12 09:52:35.000000000 -0500
++++ kdebase-workspace-4.5.0/startkde.cmake	2010-08-12 09:53:15.899671270 -0500
+@@ -36,18 +36,6 @@ fi
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
  
@@ -16,6 +17,6 @@
 -    export MALLOC_CHECK_
 -fi
 -
- # 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
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 8b31552..002ad20 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -320,7 +320,7 @@ Requires: akonadi
 %patch53 -p1 -b .kdebug183143
 
 # 4.5 patches
-%patch100 -p0 -b .startkde-malloc
+%patch100 -p1 -b .startkde-malloc
 
 # trunk patches
 


More information about the scm-commits mailing list