diff options
| -rw-r--r-- | kde-base/katepart/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/katepart/files/katepart-4.10.0-plugins.patch | 55 | ||||
| -rw-r--r-- | kde-base/katepart/katepart-4.10.0-r1.ebuild | 29 |
3 files changed, 92 insertions, 1 deletions
diff --git a/kde-base/katepart/ChangeLog b/kde-base/katepart/ChangeLog index e900057acdb1..e4f65d585a77 100644 --- a/kde-base/katepart/ChangeLog +++ b/kde-base/katepart/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/katepart # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.60 2013/02/07 04:57:02 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/ChangeLog,v 1.61 2013/02/11 14:34:44 kensington Exp $ + +*katepart-4.10.0-r1 (11 Feb 2013) + + 11 Feb 2013; Michael Palimaka <kensington@gentoo.org> + +files/katepart-4.10.0-plugins.patch, +katepart-4.10.0-r1.ebuild: + Backport patch from upstream to fix loading of the highlight-selection plugin, + wrt bug #456660. 06 Feb 2013; Naohiro Aota <naota@gentoo.org> katepart-4.9.5.ebuild: Add ~x86-fbsd wrt bug #430072 diff --git a/kde-base/katepart/files/katepart-4.10.0-plugins.patch b/kde-base/katepart/files/katepart-4.10.0-plugins.patch new file mode 100644 index 000000000000..3b52bfae6a6c --- /dev/null +++ b/kde-base/katepart/files/katepart-4.10.0-plugins.patch @@ -0,0 +1,55 @@ +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 + diff --git a/kde-base/katepart/katepart-4.10.0-r1.ebuild b/kde-base/katepart/katepart-4.10.0-r1.ebuild new file mode 100644 index 000000000000..5ca8784e1a2e --- /dev/null +++ b/kde-base/katepart/katepart-4.10.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/katepart/katepart-4.10.0-r1.ebuild,v 1.1 2013/02/11 14:34:44 kensington Exp $ + +EAPI=5 + +KDE_HANDBOOK="optional" +KMNAME="kate" +KMMODULE="part" +inherit kde4-meta + +DESCRIPTION="KDE Editor KPart" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="debug" + +RESTRICT="test" +# bug 392993 + +add_blocker kdelibs 4.6.50 + +PATCHES=( "${FILESDIR}/${P}-plugins.patch" ) + +src_configure() { + local mycmakeargs=( + "-DKDE4_BUILD_TESTS=OFF" + ) + + kde4-meta_src_configure +} |