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

[Andreas Sturmlechner]

commit:     78da9a262a6a2f2a9ba878a24c0aaf808f6727ae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 11:41:07 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 13:24:17 2022 +0000
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 <asturm <AT> 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 000000000000..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 <cullmann@×××.org>
+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 --git a/src/view/kateviewinternal.h b/src/view/kateviewinternal.h
+index 66b137b6..8639dcef 100644
+--- a/src/view/kateviewinternal.h
++++ b/src/view/kateviewinternal.h
+@@ -228,8 +228,6 @@ public:
+         return m_leftBorder;
+     }
+ 
+-    bool isUserSelecting() const;
+-
+     // EVENT HANDLING STUFF - IMPORTANT
+ private:
+     void fixDropEvent(QDropEvent *event);
+-- 
+GitLab
+

diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild
new file mode 100644
index 000000000000..d591be3b2abf
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r1.ebuild
@@ -0,0 +1,59 @@
+# 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.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~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/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 )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-revert-5dce70a9.patch" # KDE-bugs 446189, 447525
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package editorconfig EditorConfig)
+	)
+
+	ecm_src_configure
+}