[kdebase-workspace] adapted patches

[Than Ngo]

commit 23dc0b3f8527a84be14db023aaf03f7fdfe3e8d7
Author: Than Ngo <than at redhat.com>
Date:   Tue Jun 28 23:23:19 2011 +0200

    adapted patches

 ...e-workspace-4.6.3-multilib_qt_plugin_path.patch |   14 --------------
 ...nt.patch => kdebase-workspace-4.6.90-font.patch |   10 +++++-----
 ...-workspace-4.6.90-multilib_qt_plugin_path.patch |   15 +++++++++++++++
 kdebase-workspace.spec                             |    4 ++--
 4 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/kdebase-workspace-4.1.96-font.patch b/kdebase-workspace-4.6.90-font.patch
similarity index 82%
rename from kdebase-workspace-4.1.96-font.patch
rename to kdebase-workspace-4.6.90-font.patch
index a6a654a..3275d03 100644
--- a/kdebase-workspace-4.1.96-font.patch
+++ b/kdebase-workspace-4.6.90-font.patch
@@ -1,8 +1,8 @@
-diff -up kdebase-workspace-4.1.96/startkde.cmake.orig kdebase-workspace-4.1.96/startkde.cmake
---- kdebase-workspace-4.1.96/startkde.cmake.orig	2009-01-21 16:35:32.000000000 +0100
-+++ kdebase-workspace-4.1.96/startkde.cmake	2009-01-21 16:35:53.000000000 +0100
-@@ -214,48 +214,6 @@ else
- fi
+diff -up kdebase-workspace-4.6.90/startkde.cmake.font kdebase-workspace-4.6.90/startkde.cmake
+--- kdebase-workspace-4.6.90/startkde.cmake.font	2011-06-28 23:08:01.000000000 +0200
++++ kdebase-workspace-4.6.90/startkde.cmake	2011-06-28 23:10:54.000000000 +0200
+@@ -215,48 +215,6 @@ done
+ QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kde4-config --path qtplugins`
  export QT_PLUGIN_PATH
  
 -# Activate the kde font directories.
diff --git a/kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch b/kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
new file mode 100644
index 0000000..ddda40c
--- /dev/null
+++ b/kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
@@ -0,0 +1,15 @@
+diff -up kdebase-workspace-4.6.90/startkde.cmake.multilib_qt_plugin_path kdebase-workspace-4.6.90/startkde.cmake
+--- kdebase-workspace-4.6.90/startkde.cmake.multilib_qt_plugin_path	2011-06-28 23:13:28.000000000 +0200
++++ kdebase-workspace-4.6.90/startkde.cmake	2011-06-28 23:17:05.000000000 +0200
+@@ -221,6 +221,11 @@ done
+ 
+ # Set the path for Qt plugins provided by KDE
+ QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kde4-config --path qtplugins`
++
++# hack in multilib support
++if ! echo ${QT_PLUGIN_PATH} | /bin/grep -q /usr/lib/kde4/plugins ; then
++  QT_PLUGIN_PATH=${QT_PLUGIN_PATH}:/usr/lib/kde4/plugins
++fi
+ export QT_PLUGIN_PATH
+ 
+ # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index aefffa5..c2f9dd1 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -36,7 +36,7 @@ Patch8: kdebase-workspace-4.2.85-klipper-url.patch
 Patch9: kdebase-workspace-4.4.90-rootprivs.patch
 
 # drop useless kde font directories
-Patch11: kdebase-workspace-4.1.96-font.patch
+Patch11: kdebase-workspace-4.6.90-font.patch
 
 # no klipper action on selection for Arora browser
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
@@ -63,7 +63,7 @@ Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
 Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch 
 
 # multilib QT_PLUGIN_PATH, http://bugzilla.redhat.com/704840
-Patch24: kdebase-workspace-4.6.3-multilib_qt_plugin_path.patch
+Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
 
 ## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135