[arch-commits] Commit in kdesdk-kate/trunk (PKGBUILD fix-highlight-selection.patch)

[Andrea Scarpino]

    Date: Monday, February 11, 2013 @ 18:55:01
  Author: andrea
Revision: 177931

Fix highlight selection plugin (FS#33813); Use python3

Added:
  kdesdk-kate/trunk/fix-highlight-selection.patch
Modified:
  kdesdk-kate/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   23 ++++++++++---------
 fix-highlight-selection.patch |   47 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-11 17:30:09 UTC (rev 177930)
+++ PKGBUILD	2013-02-11 17:55:01 UTC (rev 177931)
@@ -6,18 +6,22 @@
          'kdebase-kwrite'
          'kdesdk-kate')
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
+makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
+        'pkgbuild-syntax-highlight.patch'
+        'fix-highlight-selection.patch')
 sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
-          'dc70306c507083cf9b4bb1c536858742292fa1bf')
+          'dc70306c507083cf9b4bb1c536858742292fa1bf'
+          '46a09159747a76f348ab66a5c88dfeb596a1cbdd')
 
 build() {
   cd kate-${pkgver}
   patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
+  # KDEBUG#314530
+  patch -p1 -i "${srcdir}"/fix-highlight-selection.patch
   cd ../
 
   mkdir build
@@ -25,8 +29,7 @@
   cmake ../kate-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
+    -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
 
@@ -49,9 +52,8 @@
 
   cd build/kwrite
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kwrite
+  cd ../../build/doc/kwrite
   make DESTDIR="${pkgdir}" install
 }
 
@@ -62,12 +64,11 @@
   url="http://www.kde.org/applications/utilities/kate/"
   install='kdesdk-kate.install'
   optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
+              'kdebindings-python: python bindings')
 
   cd build/kate
   make DESTDIR="${pkgdir}" install
-  cd ../../
 
-  cd build/doc/kate
+  cd ../../build/doc/kate
   make DESTDIR="${pkgdir}" install
 }

Added: fix-highlight-selection.patch
===================================================================
--- fix-highlight-selection.patch	                        (rev 0)
+++ fix-highlight-selection.patch	2013-02-11 17:55:01 UTC (rev 177931)
@@ -0,0 +1,47 @@
+commit f934575613d7efc60b9b6be6203c777d42ab7ffc
+Author: Dominik Haumann <dhaumann at kde.org>
+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);
++    }
+   }
+ }
+