kde-frameworks/ktexteditor: Fix 5.39 indenting regression

Upstream commit aeebeadb5f5955995c17de56cf83ba7166a132dd

Package-Manager: Portage-2.3.11, Repoman-2.3.3

diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch
new file mode 100644 (file)
index 0000000..fc5d9d9
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.39.0-indents.patch
@@ -0,0 +1,32 @@
+From aeebeadb5f5955995c17de56cf83ba7166a132dd Mon Sep 17 00:00:00 2001
+From: Sven Brauch <mail@svenbrauch.de>
+Date: Mon, 16 Oct 2017 18:35:50 +0200
+Subject: fix some indenters from indenting on random characters
+
+If triggerCharacters was not set, toString() would return "undefined",
+making indenters trigger on u, n, d, e, f, i and n.
+
+Differential Revision: https://phabricator.kde.org/D8333
+---
+ src/script/kateindentscript.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/script/kateindentscript.cpp b/src/script/kateindentscript.cpp
+index 15ce387..380bd45 100644
+--- a/src/script/kateindentscript.cpp
++++ b/src/script/kateindentscript.cpp
+@@ -46,7 +46,10 @@ const QString &KateIndentScript::triggerCharacters()
+ 
+     m_triggerCharactersSet = true;
+ 
+-    m_triggerCharacters = global(QStringLiteral("triggerCharacters")).toString();
++    auto triggerCharacters = global(QStringLiteral("triggerCharacters"));
++    if ( !triggerCharacters.isUndefined() ) {
++        m_triggerCharacters = triggerCharacters.toString();
++    }
+ 
+     //qCDebug(LOG_KTE) << "trigger chars: '" << m_triggerCharacters << "'";
+ 
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild
new file mode 100644 (file)
index 0000000..4b9342f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.39.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+RDEPEND="
+       $(add_frameworks_dep karchive)
+       $(add_frameworks_dep kauth)
+       $(add_frameworks_dep kcodecs)
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kguiaddons)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kiconthemes)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kitemviews)
+       $(add_frameworks_dep kjobwidgets)
+       $(add_frameworks_dep kparts)
+       $(add_frameworks_dep ktextwidgets)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep sonnet)
+       $(add_frameworks_dep syntax-highlighting)
+       $(add_qt_dep qtdeclarative)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtxml)
+       editorconfig? ( app-text/editorconfig-core-c )
+       git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+       $(add_qt_dep qtxmlpatterns)
+       test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-indents.patch" )
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_find_package editorconfig EditorConfig)
+               $(cmake-utils_use_find_package git LibGit2)
+       )
+
+       kde5_src_configure
+}