From 63b57aa8e097fb2ef34dfd5605e82e18673e9461 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 13 Sep 2007 04:50:36 +0000 Subject: [PATCH] set QT_PLUGIN_PATH in kde4.sh and kde4.csh --- kde4.csh | 4 ++++ kde4.sh | 4 ++++ kdelibs.spec | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/kde4.csh b/kde4.csh index d395426..d778bb0 100755 --- a/kde4.csh +++ b/kde4.csh @@ -14,3 +14,7 @@ if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1 # don't enable until http://bugs.kde.org/88557 is fixed # if ( ! $?KDE_FORK_SLAVES ) setenv KDE_FORK_SLAVES 1 +if ( ! $?QT_PLUGIN_PATH ) then + set KDE4_LIBDIR = `/bin/rpm --eval %\{\?_kde4_libdir\}%\{\!\?_kde4_libdir:%\{_libdir\}\}` + setenv QT_PLUGIN_PATH ${KDE4_LIBDIR}/kde4/plugins +endif diff --git a/kde4.sh b/kde4.sh index cfcc1aa..b422e35 100755 --- a/kde4.sh +++ b/kde4.sh @@ -14,3 +14,7 @@ # don't enable until http://bugs.kde.org/88557 is fixed # [ -z "$KDE_FORK_SLAVES" ] && KDE_FORK_SLAVES=1 && export KDE_FORK_SLAVES +if [ -z "$QT_PLUGIN_PATH" ]; then + KDE4_LIBDIR=`/bin/rpm --eval '%{?_kde4_libdir}%{!?_kde4_libdir:%{_libdir}}' 2>/dev/null` + QT_PLUGIN_PATH=${KDE4_LIBDIR}/kde4/plugins && export QT_PLUGIN_PATH +fi diff --git a/kdelibs.spec b/kdelibs.spec index d2ad755..eea2ed1 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -4,7 +4,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 3.93.0 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -222,6 +222,9 @@ rm -rf %{buildroot} %changelog +* Thu Sep 13 2007 Kevin Kofler 3.93.0-6 +- set QT_PLUGIN_PATH in kde4.sh and kde4.csh + * Wed Sep 12 2007 Kevin Kofler 3.93.0-5 - fix strange coloring due to incomplete changes to KColorScheme