diff options
Diffstat (limited to 'extra/kdesdk-kate')
| -rw-r--r-- | extra/kdesdk-kate/PKGBUILD | 25 | ||||
| -rw-r--r-- | extra/kdesdk-kate/fix-highlight-selection.patch | 47 |
2 files changed, 60 insertions, 12 deletions
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 054f8b8cd..f3c7cc0e0 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177635 2013-02-08 08:55:54Z andrea $ +# $Id: PKGBUILD 177932 2013-02-11 17:58:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate @@ -6,18 +6,22 @@ pkgname=('kdebase-katepart' '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 @@ build() { 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 @@ package_kdebase-kwrite() { cd build/kwrite make DESTDIR="${pkgdir}" install - cd ../../ - cd build/doc/kwrite + cd ../../build/doc/kwrite make DESTDIR="${pkgdir}" install } @@ -62,12 +64,11 @@ package_kdesdk-kate() { 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 } diff --git a/extra/kdesdk-kate/fix-highlight-selection.patch b/extra/kdesdk-kate/fix-highlight-selection.patch new file mode 100644 index 000000000..26accafc7 --- /dev/null +++ b/extra/kdesdk-kate/fix-highlight-selection.patch @@ -0,0 +1,47 @@ +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); ++ } + } + } + |