[kde-workspace] QT_PLUGIN_PATH contains repeated paths (#1115268)
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 3 17:59:39 UTC 2014
commit fd9a6c44ee4d21ef9217ae1053ab7202fe39006b
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Jul 3 12:59:49 2014 -0500
QT_PLUGIN_PATH contains repeated paths (#1115268)
kde-workspace.spec | 5 ++++-
startkde.cmake | 5 -----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/kde-workspace.spec b/kde-workspace.spec
index b5ebbec..dcfcf43 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -20,7 +20,7 @@
Summary: KDE Workspace
Name: kde-workspace
Version: 4.11.10
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-workspace
@@ -1088,6 +1088,9 @@ fi
%changelog
+* Thu Jul 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.10-7
+- QT_PLUGIN_PATH contains repeated paths (#1115268)
+
* Wed Jul 02 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.10-6
- BuildConflicts: nepomuk-core-devel
diff --git a/startkde.cmake b/startkde.cmake
index 8dbd398..11da90f 100644
--- a/startkde.cmake
+++ b/startkde.cmake
@@ -171,11 +171,6 @@ 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
More information about the scm-commits
mailing list