[kdebase-workspace] rebase patches

[Rex Dieter]

commit 5025c3e1850d529de76162053e033b89a3cc3267
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 4 06:48:07 2012 -0600

    rebase patches

 kde-workspace-4.7.95-gcc47.patch                   |   38 --------------------
 kde-workspace-4.7.95-no_malloc_check.patch         |   22 -----------
 kde-workspace-4.7.97-gcc47.patch                   |   12 ++++++
 ...h => kde-workspace-4.7.97-redhat_startkde.patch |   20 +++++-----
 kdebase-workspace.spec                             |    7 +---
 5 files changed, 24 insertions(+), 75 deletions(-)
---
diff --git a/kde-workspace-4.7.97-gcc47.patch b/kde-workspace-4.7.97-gcc47.patch
new file mode 100644
index 0000000..d29b4ff
--- /dev/null
+++ b/kde-workspace-4.7.97-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp.gcc47 kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp
+--- kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp.gcc47	2012-01-03 13:43:13.000000000 -0600
++++ kde-workspace-4.7.97/ksplash/ksplashqml/main.cpp	2012-01-04 06:45:43.494619293 -0600
+@@ -20,6 +20,7 @@
+ #include "SplashApp.h"
+ 
+ #include <iostream>
++#include <unistd.h>
+ #include <X11/Xlib.h>
+ 
+ int main(int argc, char **argv)
+diff -up kde-workspace-4.7.97/libs/ksysguard/processui/ProcessModel.cpp.gcc47 kde-workspace-4.7.97/libs/ksysguard/processui/ProcessModel.cpp
diff --git a/kdebase-workspace-4.7.80-redhat_startkde.patch b/kde-workspace-4.7.97-redhat_startkde.patch
similarity index 85%
rename from kdebase-workspace-4.7.80-redhat_startkde.patch
rename to kde-workspace-4.7.97-redhat_startkde.patch
index d1c377f..3dbd75a 100644
--- a/kdebase-workspace-4.7.80-redhat_startkde.patch
+++ b/kde-workspace-4.7.97-redhat_startkde.patch
@@ -1,9 +1,9 @@
-diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.80/startkde.cmake
---- kde-workspace-4.7.80/startkde.cmake.redhat_startkde	2011-11-17 21:55:51.000000000 +0100
-+++ kde-workspace-4.7.80/startkde.cmake	2011-11-21 14:47:09.947290754 +0100
-@@ -40,22 +40,6 @@ if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /
-     export MALLOC_CHECK_
- fi
+diff -up kde-workspace-4.7.97/startkde.cmake.redhat_startkde kde-workspace-4.7.97/startkde.cmake
+--- kde-workspace-4.7.97/startkde.cmake.redhat_startkde	2012-01-03 13:43:14.000000000 -0600
++++ kde-workspace-4.7.97/startkde.cmake	2012-01-04 06:43:55.711665134 -0600
+@@ -28,22 +28,6 @@ fi
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
  
 -# in case we have been started with full pathname spec without being in PATH
 -bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
@@ -24,7 +24,7 @@ diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.8
  # Boot sequence:
  #
  # kdeinit is used to fork off processes which improves memory usage
-@@ -76,6 +60,37 @@ fi
+@@ -64,6 +48,37 @@ fi
  kdehome=$HOME/@KDE_DEFAULT_HOME@
  test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
  
@@ -62,7 +62,7 @@ diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.8
  # see kstartupconfig source for usage
  mkdir -m 700 -p $kdehome
  mkdir -m 700 -p $kdehome/share
-@@ -93,7 +108,15 @@ krandrrc [Screen2]
+@@ -81,7 +96,15 @@ krandrrc [Screen2]
  krandrrc [Screen3]
  kcmfonts General forceFontDPI 0
  kdeglobals Locale Language '' # trigger requesting languages from KLocale
@@ -78,7 +78,7 @@ diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.8
  kstartupconfig4
  returncode=$?
  if test $returncode -ne 0; then
-@@ -171,8 +194,9 @@ fi
+@@ -159,8 +182,9 @@ fi
  # better use the Autostart folder.
  
  libpath=`kde4-config --path lib | tr : '\n'`
@@ -89,7 +89,7 @@ diff -up kde-workspace-4.7.80/startkde.cmake.redhat_startkde kde-workspace-4.7.8
    for file in "$prefix"*.sh; do
      test -r "$file" && . "$file"
    done
-@@ -381,7 +405,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
+@@ -369,7 +393,8 @@ kde3 dcopserver_shutdown --wait 2>/dev/n
  echo 'startkde: Running shutdown scripts...'  1>&2
  
  # Run scripts found in $KDEDIRS/shutdown
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index c77efd4..53053f7 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -18,7 +18,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # RH/Fedora-specific startkde changes
-Patch1: kdebase-workspace-4.7.80-redhat_startkde.patch
+Patch1: kde-workspace-4.7.97-redhat_startkde.patch
 
 # add konsole menuitem
 Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -81,11 +81,9 @@ Patch52: kde-workspace-4.7.80-bz#732830-login.patch
 Patch53: kde-workspace-4.7.95-kdm_xauth.patch
 
 # gcc47 fixes (missing headers mostly)
-Patch54: kde-workspace-4.7.95-gcc47.patch
+Patch54: kde-workspace-4.7.97-gcc47.patch
 
 ## upstream patches
-# omit MALLOC_CHECK_ from startkde
-Patch100: kde-workspace-4.7.95-no_malloc_check.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -400,7 +398,6 @@ Requires: akonadi
 %patch54 -p1 -b .gcc47
 
 # upstream patches
-%patch100 -p1 -b .no_malloc_check
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets