diff options
| author | root <root@rshg054.dnsready.net> | 2013-04-06 00:05:46 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-04-06 00:05:46 -0700 |
| commit | fd8249d016683ade99a23251d6ffdf5d5a3e76a4 (patch) | |
| tree | de9e45e44e9a8ffb85bd8895dcec0ebcd34d17e3 /extra/kdesdk-kate | |
| parent | 3c7a59bfd2b8340068df7dc196e0c9b612b9ef31 (diff) | |
Sat Apr 6 00:05:46 PDT 2013
Diffstat (limited to 'extra/kdesdk-kate')
| -rw-r--r-- | extra/kdesdk-kate/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/kdesdk-kate/fix-highlight-selection.patch | 47 |
2 files changed, 3 insertions, 50 deletions
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index f839d46b8..9c1912c38 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 179336 2013-03-05 15:22:52Z andrea $ +# $Id: PKGBUILD 181881 2013-04-05 08:54:24Z svenstaro $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.1 +pkgver=4.10.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('35f93d992cccf8ef7fc1bb59f11cdee6015484ef' +sha1sums=('117850ca1728c309310f23a5ac2d583cfdfd29c7' 'dc70306c507083cf9b4bb1c536858742292fa1bf') build() { diff --git a/extra/kdesdk-kate/fix-highlight-selection.patch b/extra/kdesdk-kate/fix-highlight-selection.patch deleted file mode 100644 index 26accafc7..000000000 --- a/extra/kdesdk-kate/fix-highlight-selection.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit f934575613d7efc60b9b6be6203c777d42ab7ffc -Author: Dominik Haumann <dhaumann@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); -+ } - } - } - |