diff --git a/fix-plugin-loading.diff b/fix-plugin-loading.diff new file mode 100644 index 0000000..e428411 --- /dev/null +++ b/fix-plugin-loading.diff @@ -0,0 +1,47 @@ +commit f934575613d7efc60b9b6be6203c777d42ab7ffc +Author: Dominik Haumann +Date: Sun Feb 10 22:18:38 2013 +0100 + + fix plugin loading in KDE SC 4.10.0 + + Thanks to Dorian and Loïc for finding the root of this issue. + + BUG: 314530 + FIXED-IN: 4.10.1 + +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(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); ++ } + } + } + diff --git a/kate.changes b/kate.changes index 9e4a2d3..6c22b00 100644 --- a/kate.changes +++ b/kate.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 11 20:12:44 UTC 2013 - hrvoje.senjan@gmail.com + +- Added upstream fix-plugin-loading.diff, fixes kde#314530 + ------------------------------------------------------------------- Thu Jan 31 17:44:43 UTC 2013 - tittiatcoke@gmail.com diff --git a/kate.spec b/kate.spec index e06838f..7cda82b 100644 --- a/kate.spec +++ b/kate.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Editors/Other Url: http://www.kde.org/ Source0: %{name}-%{version}.tar.xz +#PATCH-FIX-UPSTREAM fix-plugin-loading.diff kde#314530 +Patch0: fix-plugin-loading.diff BuildRequires: fdupes BuildRequires: libkactivities-devel BuildRequires: libkde4-devel >= %version @@ -44,6 +46,7 @@ Kate is an advanced text editor for KDE. %prep %setup -q +%patch0 -p1 %build %ifarch ppc64