Hello community, here is the log from the commit of package kate for openSUSE:Factory checked in at 2013-02-12 12:48:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kate (Old) and /work/SRC/openSUSE:Factory/.kate.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kate", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kate/kate.changes 2013-02-04 20:24:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kate.new/kate.changes 2013-02-12 12:48:49.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 11 20:12:44 UTC 2013 - [email protected] + +- Added upstream fix-plugin-loading.diff, fixes kde#314530 + +------------------------------------------------------------------- New: ---- fix-plugin-loading.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kate.spec ++++++ --- /var/tmp/diff_new_pack.23mIT5/_old 2013-02-12 12:48:52.000000000 +0100 +++ /var/tmp/diff_new_pack.23mIT5/_new 2013-02-12 12:48:52.000000000 +0100 @@ -24,6 +24,8 @@ 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 @@ %prep %setup -q +%patch0 -p1 %build %ifarch ppc64 ++++++ fix-plugin-loading.diff ++++++ commit f934575613d7efc60b9b6be6203c777d42ab7ffc Author: Dominik Haumann <[email protected]> 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<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); + } } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
