[kdebase-workspace] multilib QT_PLUGIN_PATH (#704840)

[Rex Dieter]

commit cfe0e7b0387851bea82a7621e40b0d2e2e2b6124
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat May 21 21:09:07 2011 -0500

    multilib QT_PLUGIN_PATH (#704840)

 ...e-workspace-4.6.3-multilib_qt_plugin_path.patch |   14 ++++++++++++++
 kdebase-workspace.spec                             |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.6.3-multilib_qt_plugin_path.patch b/kdebase-workspace-4.6.3-multilib_qt_plugin_path.patch
new file mode 100644
index 0000000..fe1bfc2
--- /dev/null
+++ b/kdebase-workspace-4.6.3-multilib_qt_plugin_path.patch
@@ -0,0 +1,14 @@
+diff -up kdebase-workspace-4.6.3/startkde.cmake.multilib_qt_plugin_path kdebase-workspace-4.6.3/startkde.cmake
+--- kdebase-workspace-4.6.3/startkde.cmake.multilib_qt_plugin_path	2011-05-21 20:32:02.373251624 -0500
++++ kdebase-workspace-4.6.3/startkde.cmake	2011-05-21 21:01:37.340718071 -0500
+@@ -213,6 +213,10 @@ if test -n "$QT_PLUGIN_PATH"; then
+ else
+   QT_PLUGIN_PATH="`kde4-config --path qtplugins`"
+ fi
++# 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 3b8f6dc..66eae9e 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.3
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -61,6 +61,9 @@ Patch21: kdebase-workspace-4.3.98-platformplugin-widgetstyle4.patch
 # drop hard dep on xorg-x11-apps (for xmessage), http://bugzilla.redhat.com/537609
 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
+
 ## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
@@ -306,6 +309,7 @@ Requires: akonadi
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .platformplugin-widgetstyle4
 %patch23 -p1 -b .startkde_zenity
+%patch24 -p1 -b .multilib_qt_plugin_path
 
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
@@ -734,6 +738,9 @@ fi
 
 
 %changelog
+* Sat May 21 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.3-7
+- multilib QT_PLUGIN_PATH (#704840)
+
 * Thu May 19 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.6.3-6
 - make nm-09-compat patch F15-only, it won't work on Rawhide anyway