From ad251f8d30f4bccb9dadeb199c9b0789e4551a09 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 17 Oct 2017 06:50:15 -0500
Subject: user/ktexteditor: add indentation patch suggested by kde-packagers@

---
 user/ktexteditor/APKBUILD                       |  8 ++++---
 user/ktexteditor/improper-indentation-fix.patch | 32 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 user/ktexteditor/improper-indentation-fix.patch

(limited to 'user')

diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD
index 7206e47ee..d1a0de853 100644
--- a/user/ktexteditor/APKBUILD
+++ b/user/ktexteditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ktexteditor
 pkgver=5.39.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Reusable, programmable text editor widget"
 url="https://www.kde.org/"
 arch="all"
@@ -16,7 +16,8 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 gettext-dev doxygen
 	graphviz qt5-qttools-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkgver.tar.xz"
+source="http://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkgver.tar.xz
+	improper-indentation-fix.patch"
 builddir="$srcdir/ktexteditor-$pkgver"
 
 build() {
@@ -46,4 +47,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f  ktexteditor-5.39.0.tar.xz"
+sha512sums="a76828be990bd32275f7de2448e337750aa1766eed669aa7a8c199d3d7db002c9d2193d09cac789c73d7cee783b9b85a21f50563e5beff30fac484f414145f6f  ktexteditor-5.39.0.tar.xz
+0ffae497093583e1cae3a0d65750fc9d687b799d40fe0dd1f27a464ab1b4862fd265cb7ba0d9367e9dcd5d80c324f8453cf928ace619d1e68b3a43f9f3e7d01b  improper-indentation-fix.patch"
diff --git a/user/ktexteditor/improper-indentation-fix.patch b/user/ktexteditor/improper-indentation-fix.patch
new file mode 100644
index 000000000..fc5d9d9d3
--- /dev/null
+++ b/user/ktexteditor/improper-indentation-fix.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
+
-- 
cgit v1.2.3-60-g2f50