From 428e1ad548b30e3b00bfb911eb7b4194057ce6d2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 07 2009 03:53:43 +0000 Subject: - improved kde4_plugins patch, skip expensive/unneeded canonicalPath --- diff --git a/qt-x11-opensource-src-4.5.1-kde4_plugins.patch b/qt-x11-opensource-src-4.5.1-kde4_plugins.patch index 390e9f3..a48860d 100644 --- a/qt-x11-opensource-src-4.5.1-kde4_plugins.patch +++ b/qt-x11-opensource-src-4.5.1-kde4_plugins.patch @@ -9,7 +9,7 @@ diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde + QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins"); + if (QFile::exists(kde4PathPlugins)) { + // Make sure we convert from backslashes to slashes. -+ kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath(); ++ // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath(); + if (!app_libpaths->contains(kde4PathPlugins)) + app_libpaths->append(kde4PathPlugins); + } diff --git a/qt.spec b/qt.spec index 5b15dc5..693745e 100644 --- a/qt.spec +++ b/qt.spec @@ -12,7 +12,7 @@ Epoch: 1 Name: qt4 %endif Version: 4.5.1 -Release: 9%{?dist} +Release: 10%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -828,6 +828,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Wed May 06 2009 Rex Dieter - 4.5.1-10 +- improved kde4_plugins patch, skip expensive/unneeded canonicalPath + * Wed May 06 2009 Rex Dieter - 4.5.1-9 - include kde4 plugin path by default (#498809)