[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: b93320426242a4e1c4a6d7d623c4fda0bb944e93
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  6 12:26:16 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  7 20:38:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9332042

kde-frameworks/ktexteditor: Drop unused dependency

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/ktexteditor-5.96.0-unused-dep.patch  | 24 ++
 .../ktexteditor/ktexteditor-5.96.0-r1.ebuild   | 56 ++
 2 files changed, 80 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch
new file mode 100644
index ..8107b3cbc12f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch
@@ -0,0 +1,24 @@
+From 509ca8a46ff46ef3e06407b90a8b48af9655fcce Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann 
+Date: Sat, 2 Jul 2022 22:34:15 +0200
+Subject: [PATCH] remove unused library
+
+---
+ CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e9d77e8..c6d9a327 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -69,7 +69,6 @@ find_package(KF5KIO ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Parts ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5Sonnet ${KF_DEP_VERSION} REQUIRED)
+ find_package(KF5SyntaxHighlighting ${KF_DEP_VERSION} REQUIRED)
+-find_package(KF5TextWidgets ${KF_DEP_VERSION} REQUIRED)
+ 
+ if (ENABLE_KAUTH)
+ find_package(KF5Auth ${KF_DEP_VERSION} REQUIRED)
+-- 
+GitLab
+

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild 
b/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild
new file mode 100644
index ..851a891a7b6a
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="+editorconfig"
+
+RESTRICT="test"
+
+DEPEND="
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   =kde-frameworks/karchive-${PVCUT}*:5
+   =kde-frameworks/kauth-${PVCUT}*:5
+   =kde-frameworks/kcodecs-${PVCUT}*:5
+   =kde-frameworks/kcompletion-${PVCUT}*:5
+   =kde-frameworks/kconfig-${PVCUT}*:5
+   =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+   =kde-frameworks/kcoreaddons-${PVCUT}*:5
+   =kde-frameworks/kguiaddons-${PVCUT}*:5
+   =kde-frameworks/ki18n-${PVCUT}*:5
+   =kde-frameworks/kiconthemes-${PVCUT}*:5
+   =kde-frameworks/kio-${PVCUT}*:5
+   =kde-frameworks/kitemviews-${PVCUT}*:5
+   =kde-frameworks/kjobwidgets-${PVCUT}*:5
+   =kde-frameworks/kparts-${PVCUT}*:5
+   =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+   =kde-frameworks/kxmlgui-${PVCUT}*:5
+   =kde-frameworks/sonnet-${PVCUT}*:5
+   =kde-frameworks/syntax-highlighting-${PVCUT}*:5
+   editorconfig? ( app-text/editorconfig-core-c )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
+
+PATCHES=( "${FILESDIR}/${P}-unused-dep.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package editorconfig EditorConfig)
+   )
+
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: 04a3f091de5fc81e28e024ebe732081e6598fcea
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  9 15:37:28 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  9 16:03:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a3f091

kde-frameworks/ktexteditor: Fix crash and comment toggling

Upstream commit ad82b876016367bd9765185dba84600985e5d0fd
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=451593

Upstream commit 1173d5184e8b073790556dbdba92a8b8abdd62dc
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=451471

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...xteditor-5.92.0-fix-crash-w-stale-indexes.patch |  29 ++
 .../ktexteditor-5.92.0-fix-toggle-comment.patch| 112 +
 .../ktexteditor/ktexteditor-5.92.0-r1.ebuild   |  60 +++
 3 files changed, 201 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
new file mode 100644
index ..b77a72a3e502
--- /dev/null
+++ 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
@@ -0,0 +1,29 @@
+From ad82b876016367bd9765185dba84600985e5d0fd Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed 
+Date: Fri, 18 Mar 2022 10:14:28 +0500
+Subject: [PATCH] Fix crash with stale indexes
+
+BUG: 451593
+---
+ src/completion/katecompletionmodel.cpp | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/completion/katecompletionmodel.cpp 
b/src/completion/katecompletionmodel.cpp
+index 1e241f0d..d9bb8421 100644
+--- a/src/completion/katecompletionmodel.cpp
 b/src/completion/katecompletionmodel.cpp
+@@ -914,6 +914,11 @@ QModelIndex KateCompletionModel::mapToSource(const 
QModelIndex ) cons
+ }
+ 
+ if (Group *g = groupOfParent(proxyIndex)) {
++if (!m_rowTable.contains(g)) {
++qWarning() << Q_FUNC_INFO << "Stale proxy index for which there 
is no group";
++return {};
++}
++
+ if (proxyIndex.row() >= 0 && proxyIndex.row() < 
(int)g->filtered.size()) {
+ ModelRow source = g->filtered[proxyIndex.row()].sourceRow();
+ return source.second.sibling(source.second.row(), 
proxyIndex.column());
+-- 
+GitLab
+

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
new file mode 100644
index ..bac8cd017e68
--- /dev/null
+++ 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
@@ -0,0 +1,112 @@
+From 1173d5184e8b073790556dbdba92a8b8abdd62dc Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed 
+Date: Mon, 14 Mar 2022 09:44:54 +0500
+Subject: [PATCH] Fix toggle comment with space at the start
+
+BUG: 451471
+---
+ autotests/src/katedocument_test.cpp | 48 +
+ autotests/src/katedocument_test.h   |  1 +
+ src/document/katedocument.cpp   | 10 +-
+ 3 files changed, 58 insertions(+), 1 deletion(-)
+
+diff --git a/autotests/src/katedocument_test.cpp 
b/autotests/src/katedocument_test.cpp
+index f0946829..a842f960 100644
+--- a/autotests/src/katedocument_test.cpp
 b/autotests/src/katedocument_test.cpp
+@@ -851,4 +851,52 @@ void KateDocumentTest::testKeepUndoOverReload()
+ QCOMPARE(doc.text(), insertedText + initialText);
+ }
+ 
++void KateDocumentTest::testToggleComment()
++{
++{ // BUG: 451471
++KTextEditor::DocumentPrivate doc;
++QVERIFY(doc.highlightingModes().contains(QStringLiteral("Python")));
++doc.setHighlightingMode(QStringLiteral("Python"));
++const QString original = QStringLiteral("import hello;\n def 
method():");
++doc.setText(original);
++QVERIFY(doc.lines() == 2);
++
++doc.commentSelection(doc.documentRange(), {1, 2}, false, 0); // 0 == 
ToggleComment
++QCOMPARE(doc.text(), QStringLiteral("#import hello;\n #def 
method():"));
++
++doc.commentSelection(doc.documentRange(), {1, 2}, false, 0); // 0 == 
ToggleComment
++QCOMPARE(doc.text(), original);
++}
++
++{ // Comment C++;
++KTextEditor::DocumentPrivate doc;
++QVERIFY(doc.highlightingModes().contains(QStringLiteral("C++")));
++doc.setHighlightingMode(QStringLiteral("C++"));
++QString original = QStringLiteral("#include\nint 
main()\n{\nreturn 0;\n}\n");
++doc.setText(original);
++QVERIFY(doc.lines() == 6);
++
++doc.commentSelection(doc.documentRange(), {5, 0}, false, 0); // 0 == 
ToggleComment
++QCOMPARE(doc.text(), QStringLiteral("// #include\n// int 
main()\n// {\n// return 0;\n// }\n"));
++
++doc.commentSelection(doc.documentRange(), {5, 0}, false, 0); // 0 == 
ToggleComment
++QCOMPARE(doc.text(), original);
++
++// Comment just a portion

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: 78da9a262a6a2f2a9ba878a24c0aaf808f6727ae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 20 11:41:07 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 20 13:24:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78da9a26

kde-frameworks/ktexteditor: Revert text select regression from 5.88.0

Upstream commit 3b31919427baf3da1ab1a24f682a4cefc7e5106f
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446189
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=447525

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/ktexteditor-5.90.0-revert-5dce70a9.patch | 138 +
 .../ktexteditor/ktexteditor-5.90.0-r1.ebuild   |  59 +
 2 files changed, 197 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
new file mode 100644
index ..140bc0cf7111
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
@@ -0,0 +1,138 @@
+From 3b31919427baf3da1ab1a24f682a4cefc7e5106f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann 
+Date: Sun, 16 Jan 2022 18:29:57 +0100
+Subject: [PATCH] Revert "Do not cancel mouse selection when using the
+ keyboard"
+
+This reverts commit 5dce70a9693f8cce37f733b4687bb9b303376742.
+
+=> this leads to regressions
+
+if somebody has time to properly reproduce and fix that, we can reapply
+this, otherwise it is better to have some always working state without
+this small usability improvement
+
+BUG: 447525
+BUG: 446189
+
+frameworks/ktexteditor#11
+---
+ src/view/kateview.cpp | 20 ++--
+ src/view/kateviewinternal.cpp |  5 -
+ src/view/kateviewinternal.h   |  2 --
+ 3 files changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
+index 6b88eb75..56348480 100644
+--- a/src/view/kateview.cpp
 b/src/view/kateview.cpp
+@@ -3063,9 +3063,9 @@ void KTextEditor::ViewPrivate::shiftCursorRight()
+ void KTextEditor::ViewPrivate::wordLeft()
+ {
+ if (currentTextLine().isRightToLeft()) {
+-m_viewInternal->wordNext(m_viewInternal->isUserSelecting());
++m_viewInternal->wordNext();
+ } else {
+-m_viewInternal->wordPrev(m_viewInternal->isUserSelecting());
++m_viewInternal->wordPrev();
+ }
+ }
+ 
+@@ -3081,9 +3081,9 @@ void KTextEditor::ViewPrivate::shiftWordLeft()
+ void KTextEditor::ViewPrivate::wordRight()
+ {
+ if (currentTextLine().isRightToLeft()) {
+-m_viewInternal->wordPrev(m_viewInternal->isUserSelecting());
++m_viewInternal->wordPrev();
+ } else {
+-m_viewInternal->wordNext(m_viewInternal->isUserSelecting());
++m_viewInternal->wordNext();
+ }
+ }
+ 
+@@ -3098,7 +3098,7 @@ void KTextEditor::ViewPrivate::shiftWordRight()
+ 
+ void KTextEditor::ViewPrivate::home()
+ {
+-m_viewInternal->home(m_viewInternal->isUserSelecting());
++m_viewInternal->home();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftHome()
+@@ -3108,7 +3108,7 @@ void KTextEditor::ViewPrivate::shiftHome()
+ 
+ void KTextEditor::ViewPrivate::end()
+ {
+-m_viewInternal->end(m_viewInternal->isUserSelecting());
++m_viewInternal->end();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftEnd()
+@@ -3118,7 +3118,7 @@ void KTextEditor::ViewPrivate::shiftEnd()
+ 
+ void KTextEditor::ViewPrivate::up()
+ {
+-m_viewInternal->cursorUp(m_viewInternal->isUserSelecting());
++m_viewInternal->cursorUp();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftUp()
+@@ -3128,7 +3128,7 @@ void KTextEditor::ViewPrivate::shiftUp()
+ 
+ void KTextEditor::ViewPrivate::down()
+ {
+-m_viewInternal->cursorDown(m_viewInternal->isUserSelecting());
++m_viewInternal->cursorDown();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftDown()
+@@ -3168,7 +3168,7 @@ void KTextEditor::ViewPrivate::shiftBottomOfView()
+ 
+ void KTextEditor::ViewPrivate::pageUp()
+ {
+-m_viewInternal->pageUp(m_viewInternal->isUserSelecting());
++m_viewInternal->pageUp();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftPageUp()
+@@ -3178,7 +3178,7 @@ void KTextEditor::ViewPrivate::shiftPageUp()
+ 
+ void KTextEditor::ViewPrivate::pageDown()
+ {
+-m_viewInternal->pageDown(m_viewInternal->isUserSelecting());
++m_viewInternal->pageDown();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftPageDown()
+diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp
+index d642938a..c8d479d6 100644
+--- a/src/view/kateviewinternal.cpp
 b/src/view/kateviewinternal.cpp
+@@ -4077,11 +4077,6 @@ void KateViewInternal::viewSelectionChanged()
+ m_selectionCached.setStart(KTextEditor::Cursor::invalid());
+ }
+ 
+-bool KateViewInternal::isUserSelecting() const
+-{
+-return m_selChangedByUser;
+-}
+-
+ KateLayoutCache *KateViewInternal::cache() const
+ {
+ return m_layoutCache;
+diff 

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: 3a021a3cf32b7e37971959da38b381d8304ab951
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan 20 11:45:18 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan 20 13:24:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a021a3c

kde-frameworks/ktexteditor: Find: Update working range when replacing

Upstream commit 863f606b1fcf3b91b256d9167a00539289246188
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=447972

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/ktexteditor-5.90.0-KDEBUG-447972.patch   | 26 ++
 .../ktexteditor/ktexteditor-5.90.0-r1.ebuild   |  1 +
 2 files changed, 27 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch
new file mode 100644
index ..05cfbd107cd9
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch
@@ -0,0 +1,26 @@
+From 863f606b1fcf3b91b256d9167a00539289246188 Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed 
+Date: Tue, 11 Jan 2022 20:03:12 +0500
+Subject: [PATCH] Find: Update working range when replacing
+
+BUG: 447972
+---
+ src/search/katesearchbar.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/search/katesearchbar.cpp b/src/search/katesearchbar.cpp
+index ed52c4cb..c1c85bd4 100644
+--- a/src/search/katesearchbar.cpp
 b/src/search/katesearchbar.cpp
+@@ -843,6 +843,8 @@ void KateSearchBar::findOrReplaceAll()
+ 
+ // Replace
+ lastRange = match.replace(m_replacement, false, 
++m_matchCounter);
++// update working range as text must have changed now
++workingRangeCopy = m_workingRange->toRange();
+ } else {
+ lastRange = match.range();
+ ++m_matchCounter;
+-- 
+GitLab
+

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild 
b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild
index d591be3b2abf..f784d0803db8 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild
@@ -48,6 +48,7 @@ BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
 
 PATCHES=(
"${FILESDIR}/${P}-revert-5dce70a9.patch" # KDE-bugs 446189, 447525
+   "${FILESDIR}/${P}-KDEBUG-447972.patch"
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: d848b9364fc50423708e15e081042702399c1bb8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  4 12:59:30 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  4 13:19:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d848b936

kde-frameworks/ktexteditor: Fix mini-map location highlighting

Upstream commit bdd195792b7752e4c5a0ff74cb5b01a6accee517

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434690
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...-5.80.0-fix-minimap-location-highlighting.patch | 35 
 .../ktexteditor/ktexteditor-5.80.0-r1.ebuild   | 63 ++
 2 files changed, 98 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.80.0-fix-minimap-location-highlighting.patch
 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.80.0-fix-minimap-location-highlighting.patch
new file mode 100644
index 000..ffc94e9c97a
--- /dev/null
+++ 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.80.0-fix-minimap-location-highlighting.patch
@@ -0,0 +1,35 @@
+From bdd195792b7752e4c5a0ff74cb5b01a6accee517 Mon Sep 17 00:00:00 2001
+From: Jan Paul Batrina 
+Date: Thu, 25 Mar 2021 19:31:39 +0800
+Subject: [PATCH] Use QPalette::highlight for the scrollbar minimap slider
+
+Previously, QPalette::link() was used which is the color for hyperlinks.
+Most themes set this to a shade of blue, so the slider will almost
+always be blue even when, for example, the main color
+of a theme is green.
+
+The selection highlight color was chosen because it is also the color
+used for indicating the active tab and is, generally, often attuned
+to a theme's main color.
+
+BUG: 434690
+---
+ src/view/kateviewhelpers.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/view/kateviewhelpers.cpp b/src/view/kateviewhelpers.cpp
+index 365e07e0..48e94609 100644
+--- a/src/view/kateviewhelpers.cpp
 b/src/view/kateviewhelpers.cpp
+@@ -750,7 +750,7 @@ void KateScrollBar::miniMapPaintEvent(QPaintEvent *e)
+ // calculate colors
+ const QColor backgroundColor = 
m_view->defaultStyleAttribute(KTextEditor::dsNormal)->background().color();
+ const QColor foregroundColor = 
m_view->defaultStyleAttribute(KTextEditor::dsNormal)->foreground().color();
+-const QColor highlightColor = palette().link().color();
++const QColor highlightColor = palette().highlight().color();
+ 
+ const int backgroundLightness = backgroundColor.lightness();
+ const int foregroundLightness = foregroundColor.lightness();
+-- 
+GitLab
+

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.80.0-r1.ebuild 
b/kde-frameworks/ktexteditor/ktexteditor-5.80.0-r1.ebuild
new file mode 100644
index 000..da29d0a8c42
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.80.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="+editorconfig git"
+
+RESTRICT+=" test"
+
+BDEPEND="
+   test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+DEPEND="
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   =kde-frameworks/karchive-${PVCUT}*:5
+   =kde-frameworks/kauth-${PVCUT}*:5
+   =kde-frameworks/kcodecs-${PVCUT}*:5
+   =kde-frameworks/kcompletion-${PVCUT}*:5
+   =kde-frameworks/kconfig-${PVCUT}*:5
+   =kde-frameworks/kconfigwidgets-${PVCUT}*:5
+   =kde-frameworks/kcoreaddons-${PVCUT}*:5
+   =kde-frameworks/kguiaddons-${PVCUT}*:5
+   =kde-frameworks/ki18n-${PVCUT}*:5
+   =kde-frameworks/kiconthemes-${PVCUT}*:5
+   =kde-frameworks/kio-${PVCUT}*:5
+   =kde-frameworks/kitemviews-${PVCUT}*:5
+   =kde-frameworks/kjobwidgets-${PVCUT}*:5
+   =kde-frameworks/kparts-${PVCUT}*:5
+   =kde-frameworks/ktextwidgets-${PVCUT}*:5
+   =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+   =kde-frameworks/kxmlgui-${PVCUT}*:5
+   =kde-frameworks/sonnet-${PVCUT}*:5
+   =kde-frameworks/syntax-highlighting-${PVCUT}*:5
+   editorconfig? ( app-text/editorconfig-core-c )
+   git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-minimap-location-highlighting.patch # KDE-bug 
434690
+)
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package editorconfig EditorConfig)
+   $(cmake_use_find_package git LibGit2)
+   )
+
+   ecm_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: 30c5f7e692e0bd2022e60263cb0b878f375ed5dc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  1 19:37:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  1 19:39:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c5f7e6

kde-frameworks/ktexteditor: Fix runtime crash

See also: 
https://mail.kde.org/pipermail/kde-distro-packagers/2019-October/000389.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=413474
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/ktexteditor-5.63.0-crashfix.patch| 27 ++
 .../ktexteditor/ktexteditor-5.63.0-r1.ebuild   | 58 ++
 2 files changed, 85 insertions(+)

diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
new file mode 100644
index 000..f6c867cad65
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
@@ -0,0 +1,27 @@
+From f6e72a23052339253daa79095391625cf01c96f1 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann 
+Date: Mon, 28 Oct 2019 20:32:13 +0100
+Subject: fix crash
+
+BUG: 413474
+---
+ src/utils/katevariableexpansionhelpers.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils/katevariableexpansionhelpers.cpp 
b/src/utils/katevariableexpansionhelpers.cpp
+index db71d0f..89aab3d 100644
+--- a/src/utils/katevariableexpansionhelpers.cpp
 b/src/utils/katevariableexpansionhelpers.cpp
+@@ -278,7 +278,9 @@ 
KateVariableExpansionDialog::KateVariableExpansionDialog(QWidget *parent)
+ connect(m_listView, ::activated, [this, lblDescription, 
lblCurrentValue](const QModelIndex ) {
+ if (index.isValid()) {
+ const auto  = 
m_variables[m_filterModel->mapToSource(index).row()];
+-const auto name = QStringLiteral("%{") + var.name() + 
QLatin1Char('}');
++
++// not auto, don't fall for string builder, see bug 413474
++const QString name = QStringLiteral("%{") + var.name() + 
QLatin1Char('}');
+ 
+ if (parentWidget() && parentWidget()->window()) {
+ auto currentWidget = parentWidget()->window()->focusWidget();
+-- 
+cgit v1.1

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild 
b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
new file mode 100644
index 000..371a1c9b8ec
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="editorconfig git"
+
+BDEPEND="
+   test? ( $(add_frameworks_dep kservice) )
+"
+DEPEND="
+   $(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:= )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package editorconfig EditorConfig)
+   $(cmake-utils_use_find_package git LibGit2)
+   )
+
+   kde5_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Andreas Sturmlechner]

commit: aff1af8e4bca8bdc6b3dd078b3bd4e9ed0ad6e73
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  9 07:18:17 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  9 07:18:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff1af8e

kde-frameworks/ktexteditor: Fix CVE-2018-10361

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/ktexteditor-5.46.0-CVE-2018-10361.patch  | 187 +
 .../ktexteditor/ktexteditor-5.46.0-r1.ebuild   |  58 +++
 2 files changed, 245 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
new file mode 100644
index 000..d3b9b5d480a
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.46.0-CVE-2018-10361.patch
@@ -0,0 +1,187 @@
+From c81af5aa1d4f6e0f8c44b2e85ca007ba2a1e4590 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann 
+Date: Thu, 7 Jun 2018 16:12:25 +0200
+Subject: CVE-2018-10361: privilege escalation
+
+improve handling of temporary file to avoid possible race-condition
+
+Differential Revision: https://phabricator.kde.org/D12513
+---
+ src/buffer/katesecuretextbuffer.cpp | 99 +
+ src/buffer/katesecuretextbuffer_p.h |  4 --
+ 2 files changed, 46 insertions(+), 57 deletions(-)
+
+diff --git a/src/buffer/katesecuretextbuffer.cpp 
b/src/buffer/katesecuretextbuffer.cpp
+index 0647bee..c014608 100644
+--- a/src/buffer/katesecuretextbuffer.cpp
 b/src/buffer/katesecuretextbuffer.cpp
+@@ -53,39 +53,37 @@ ActionReply SecureTextBuffer::savefile(const QVariantMap 
)
+ bool SecureTextBuffer::saveFileInternal(const QString , const 
QString ,
+ const QByteArray , const 
uint ownerId, const uint groupId)
+ {
+-QFileInfo targetFileInfo(targetFile);
+-if (!QDir::setCurrent(targetFileInfo.dir().path())) {
++/**
++ * open source file for reading
++ * if not possible, signal error
++ */
++QFile readFile(sourceFile);
++if (!readFile.open(QIODevice::ReadOnly)) {
+ return false;
+ }
+ 
+-// get information about target file
+-const QString targetFileName = targetFileInfo.fileName();
+-targetFileInfo.setFile(targetFileName);
+-const bool newFile = !targetFileInfo.exists();
+-
+-// open source and target file
+-QFile readFile(sourceFile);
+-//TODO use QSaveFile for saving contents and automatic atomic move on 
commit() when QSaveFile's security problem
+-// (default temporary file permissions) is fixed
+-//
+-// We will first generate temporary filename and then use it relatively 
to prevent an attacker
+-// to trick us to write contents to a different file by changing 
underlying directory.
+-QTemporaryFile tempFile(targetFileName);
++/**
++ * construct file info for target file
++ * we need to know things like path/exists/permissions
++ */
++const QFileInfo targetFileInfo(targetFile);
++
++/**
++ * create temporary file in current directory to be able to later do an 
atomic rename
++ * we need to pass full path, else QTemporaryFile uses the temporary 
directory
++ * if not possible, signal error, this catches e.g. a non-existing target 
directory, too
++ */
++QTemporaryFile tempFile(targetFileInfo.absolutePath() + 
QStringLiteral("/secureXX"));
+ if (!tempFile.open()) {
+ return false;
+ }
+-tempFile.close();
+-QString tempFileName = QFileInfo(tempFile).fileName();
+-tempFile.setFileName(tempFileName);
+-if (!readFile.open(QIODevice::ReadOnly) || !tempFile.open()) {
+-return false;
+-}
+-const int tempFileDescriptor = tempFile.handle();
+ 
+-// prepare checksum maker
++/**
++ * copy contents + do checksumming
++ * if not possible, signal error
++ */
+ QCryptographicHash cryptographicHash(checksumAlgorithm);
+-
+-// copy contents
++const qint64 bufferLength = 4096;
+ char buffer[bufferLength];
+ qint64 read = -1;
+ while ((read = readFile.read(buffer, bufferLength)) > 0) {
+@@ -95,30 +93,43 @@ bool SecureTextBuffer::saveFileInternal(const QString 
, const QString
+ }
+ }
+ 
+-// check that copying was successful and checksum matched
+-QByteArray localChecksum = cryptographicHash.result();
+-if (read == -1 || localChecksum != checksum || !tempFile.flush()) {
++/**
++ * check that copying was successful and checksum matched
++ * we need to flush the file, as QTemporaryFile keeps the handle open
++ * and we later do things like renaming of the file!
++ * if not possible, signal error
++ */
++if ((read == -1) || (cryptographicHash.result() != checksum) || 
!tempFile.flush()) {
+ return false;
+ }
+ 
+-tempFile.close();
+-
+-if (newFile) {
++/**
++ * try to preserve the 

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/

[Michael Palimaka]

commit: 33a18042925667eb8c267a441b5cfa8830c3039e
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Sep 28 21:07:42 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep 29 11:39:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a18042

kde-frameworks/ktexteditor: Add more fixes from upstream

Fixes two regressions since 5.23 and one EOL detection bug.

Package-Manager: portage-2.3.0

 .../ktexteditor-5.26.0-fix-eol-detection.patch |  27 
 .../files/ktexteditor-5.26.0-fix-searchbar.patch   |  58 
 .../files/ktexteditor-5.26.0-runtime-crash1.patch  | 149 +
 .../ktexteditor/ktexteditor-5.26.0-r2.ebuild   |  60 +
 4 files changed, 294 insertions(+)

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-eol-detection.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-eol-detection.patch
new file mode 100644
index ..7b51ddb
--- /dev/null
+++ 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-eol-detection.patch
@@ -0,0 +1,27 @@
+From: Christoph Cullmann 
+Date: Tue, 06 Sep 2016 20:47:41 +
+Subject: fix eol setting in mode lines
+X-Git-Url: 
http://quickgit.kde.org/?p=ktexteditor.git=commitdiff=07b003e5a87b44d4618204bbcff257c59a446025
+---
+fix eol setting in mode lines
+turn off auto-detection if set
+BUG: 365705
+---
+
+
+--- a/src/document/katedocument.cpp
 b/src/document/katedocument.cpp
+@@ -4578,7 +4578,12 @@
+ QStringList l;
+ l << QStringLiteral("unix") << QStringLiteral("dos") << 
QStringLiteral("mac");
+ if ((n = l.indexOf(val.toLower())) != -1) {
++/**
++ * set eol + avoid that it is overwritten by 
auto-detection again!
++ * this fixes e.g. .kateconfig files with // kate: eol 
dos; to work, bug 365705
++ */
+ m_config->setEol(n);
++m_config->setAllowEolDetection(false);
+ }
+ } else if (var == QLatin1String("bom") || var == 
QLatin1String("byte-order-marker")) {
+ if (checkBoolValue(val, )) {
+

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-searchbar.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-searchbar.patch
new file mode 100644
index ..22b3e0f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-searchbar.patch
@@ -0,0 +1,58 @@
+From: Roman Gilg 
+Date: Thu, 08 Sep 2016 10:51:51 +
+Subject: KateNormalInputMode needs to rerun SearchBar enter methods
+X-Git-Url: 
http://quickgit.kde.org/?p=ktexteditor.git=commitdiff=2c4feeb0c9107732399f8ae3dacea3124572f345
+---
+KateNormalInputMode needs to rerun SearchBar enter methods
+
+This is a fix for a regression resulting from commit
+9223ac51c9453017c9b11718eed858050697cfbd.
+
+REVIEW: 128859
+---
+
+
+--- a/src/inputmode/katenormalinputmode.cpp
 b/src/inputmode/katenormalinputmode.cpp
+@@ -184,7 +184,7 @@
+ const bool wantPowerMode = (mode == PowerSearchBar);
+ 
+ /**
+- * create search bar as not there? use right mode
++ * create search bar is not there? use right mode
+  */
+ if (!m_searchBar) {
+ m_searchBar = new KateSearchBar(wantPowerMode, view(), 
KateViewConfig::global());
+@@ -193,11 +193,12 @@
+ /**
+  * else: switch mode if needed!
+  */
+-else if ((mode != IncrementalSearchBarOrKeepMode) && (wantPowerMode != 
m_searchBar->isPower())) {
+-if (wantPowerMode)
++else if (mode != IncrementalSearchBarOrKeepMode) {
++if (wantPowerMode) {
+ m_searchBar->enterPowerMode();
+-else
++} else {
+ m_searchBar->enterIncrementalMode();
++}
+ }
+ 
+ return m_searchBar;
+
+--- a/src/inputmode/katenormalinputmode.h
 b/src/inputmode/katenormalinputmode.h
+@@ -78,9 +78,9 @@
+ private:
+ /**
+  * Search bar mode:
+- *   - Incremental mode
+- *   - Power mode, aka find & replace
+- *   - Incremental mode, but don't change mode if already there
++ *   - Setup Incremental mode, among other things: potential new search 
pattern
++ *   - Setup Power mode, aka find & replace: Also potential new search 
pattern
++ *   - Use current mode and current search pattern or if no Search bar 
exists, launch Incremental mode
+  */
+ enum SearchBarMode {
+ IncrementalSearchBar,
+

diff --git 
a/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash1.patch 
b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash1.patch
new file mode 100644
index ..e28fc7e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash1.patch
@@ -0,0 +1,149 @@
+From: Dominik Haumann 
+Date: Wed, 07 Sep 2016 10:27:00 +
+Subject: Fix crash when showing top or bottom