[gentoo-commits] gentoo-x86 commit in kde-base/katepart/files: katepart-4.10.0-plugins.patch

[gentoo-commits] gentoo-x86 commit in kde-base/katepart/files: katepart-4.10.0-plugins.patch

[Michael Palimaka (kensington)]

kensington    13/02/11 14:34:44

  Added:                katepart-4.10.0-plugins.patch
  Log:
  Backport patch from upstream to fix loading of the highlight-selection plugin, wrt bug #456660.
  
  (Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

Revision  Changes    Path
1.1                  kde-base/katepart/files/katepart-4.10.0-plugins.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/katepart/files/katepart-4.10.0-plugins.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/katepart/files/katepart-4.10.0-plugins.patch?rev=1.1&content-type=text/plain

Index: katepart-4.10.0-plugins.patch
===================================================================
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

[gentoo-commits] gentoo-x86 commit in kde-base/katepart/files: katepart-4.10.0-plugins.patch

[Michael Palimaka (kensington)]

kensington    13/04/02 12:37:09

  Removed:              katepart-4.10.0-plugins.patch
  Log:
  Remove unused patch.
  
  (Portage version: 2.1.11.59/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)