[arch-commits] Commit in kdesdk-kate/trunk (PKGBUILD fix-highlight-selection.patch)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon Mar 4 11:09:21 UTC 2013
Date: Monday, March 4, 2013 @ 12:09:21
Author: andrea
Revision: 179146
KDE 4.10.1
Modified:
kdesdk-kate/trunk/PKGBUILD
Deleted:
kdesdk-kate/trunk/fix-highlight-selection.patch
-------------------------------+
PKGBUILD | 14 ++++-------
fix-highlight-selection.patch | 47 ----------------------------------------
2 files changed, 5 insertions(+), 56 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-04 11:09:19 UTC (rev 179145)
+++ PKGBUILD 2013-03-04 11:09:21 UTC (rev 179146)
@@ -5,23 +5,19 @@
pkgname=('kdebase-katepart'
'kdebase-kwrite'
'kdesdk-kate')
-pkgver=4.10.0
-pkgrel=2
+pkgver=4.10.1
+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'
- 'fix-highlight-selection.patch')
-sha1sums=('9754f1acd55278d529c4e7a5a778b5cec51e73b9'
- 'dc70306c507083cf9b4bb1c536858742292fa1bf'
- '46a09159747a76f348ab66a5c88dfeb596a1cbdd')
+ 'pkgbuild-syntax-highlight.patch')
+sha1sums=('35f93d992cccf8ef7fc1bb59f11cdee6015484ef'
+ 'dc70306c507083cf9b4bb1c536858742292fa1bf')
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
Deleted: fix-highlight-selection.patch
===================================================================
--- fix-highlight-selection.patch 2013-03-04 11:09:19 UTC (rev 179145)
+++ fix-highlight-selection.patch 2013-03-04 11:09:21 UTC (rev 179146)
@@ -1,47 +0,0 @@
-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);
-+ }
- }
- }
-
More information about the arch-commits
mailing list