diff options
Diffstat (limited to 'kde-base/katepart/files/katepart-4.10.0-plugins.patch')
| -rw-r--r-- | kde-base/katepart/files/katepart-4.10.0-plugins.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/kde-base/katepart/files/katepart-4.10.0-plugins.patch b/kde-base/katepart/files/katepart-4.10.0-plugins.patch new file mode 100644 index 000000000000..3b52bfae6a6c --- /dev/null +++ b/kde-base/katepart/files/katepart-4.10.0-plugins.patch @@ -0,0 +1,55 @@ +From f934575613d7efc60b9b6be6203c777d42ab7ffc Mon Sep 17 00:00:00 2001 +From: Dominik Haumann <dhaumann@kde.org> +Date: Sun, 10 Feb 2013 22:18:38 +0100 +Subject: [PATCH] fix plugin loading in KDE SC 4.10.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Dorian and Loïc for finding the root of this issue. + +BUG: 314530 +FIXED-IN: 4.10.1 +--- + part/utils/katepartpluginmanager.cpp | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) + +diff --git a/part/utils/katepartpluginmanager.cpp b/part/utils/katepartpluginmanager.cpp +index e9cb258..18fe6f0 100644 +--- a/part/utils/katepartpluginmanager.cpp ++++ b/part/utils/katepartpluginmanager.cpp +@@ -75,17 +75,25 @@ KatePartPluginManager *KatePartPluginManager::self() + void KatePartPluginManager::setupPluginList () + { + KService::List traderList = KServiceTypeTrader::self()-> +- query("KTextEditor/Plugin", +- "([X-KDE-Version] >= 4.0) and ([X-KDE-Version] <= " + QString("%1.%2").arg(KDE::versionMajor()).arg(KDE::versionMinor()) + ')'); ++ query("KTextEditor/Plugin"); + + foreach(const KService::Ptr &ptr, traderList) + { +- KatePartPluginInfo info(ptr); ++ QVariant version = ptr->property("X-KDE-Version", QVariant::String); ++ QStringList numbers = qvariant_cast<QString>(version).split('.'); ++ unsigned int kdeVersion = KDE_MAKE_VERSION(numbers.value(0).toUInt(), ++ numbers.value(1).toUInt(), ++ numbers.value(2).toUInt()); + +- info.load = false; +- info.plugin = 0L; ++ if (KDE_MAKE_VERSION(4,0,0) <= kdeVersion && kdeVersion <= KDE::version()) ++ { ++ KatePartPluginInfo info(ptr); ++ ++ info.load = false; ++ info.plugin = 0L; + +- m_pluginList.push_back (info); ++ m_pluginList.push_back (info); ++ } + } + } + +-- +1.8.1.2 + |