* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2017-10-19 9:04 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2017-10-19 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 32bc5b32a7bbdd43668a55342c83b7f3be931aaf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 08:58:15 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 08:58:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32bc5b32
kde-frameworks/ktexteditor: Fix 5.39 indenting regression
Upstream commit aeebeadb5f5955995c17de56cf83ba7166a132dd
Package-Manager: Portage-2.3.11, Repoman-2.3.3
.../files/ktexteditor-5.39.0-indents.patch | 32 ++++++++++++
.../ktexteditor/ktexteditor-5.39.0-r1.ebuild | 58 ++++++++++++++++++++++
2 files changed, 90 insertions(+)
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
index 00000000000..fc5d9d9d363
--- /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
index 00000000000..4b9342f6918
--- /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
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2019-01-30 17:28 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-01-30 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 16d166ea8aae5d5f4246c1ef3bdf1fd88b7e3b8d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 30 16:24:09 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 30 16:24:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d166ea
kde-frameworks/ktexteditor: Allow changing the marker size again
Fixes a regression from 5.54.0.
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=403422
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...exteditor-5.54.0-allow-change-marker-size.patch | 78 ++++++++++++++++++++++
.../ktexteditor/ktexteditor-5.54.0-r1.ebuild | 57 ++++++++++++++++
2 files changed, 135 insertions(+)
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
new file mode 100644
index 00000000000..032fbc99367
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.54.0-allow-change-marker-size.patch
@@ -0,0 +1,78 @@
+From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Wed, 30 Jan 2019 17:16:32 +0100
+Subject: Fix bug 403422: Allow changing the marker size again
+
+This bug was introduced with https://phabricator.kde.org/D17661
+with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8
+
+FIXED-IN: 5.55
+BUG: 403422
+---
+ src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui
+index 02a0d54..cc44a39 100644
+--- a/src/dialogs/textareaappearanceconfigwidget.ui
++++ b/src/dialogs/textareaappearanceconfigwidget.ui
+@@ -185,10 +185,10 @@
+ <string>Size of the visible highlight marker.</string>
+ </property>
+ <property name="minimum">
+- <number>-1</number>
++ <number>1</number>
+ </property>
+ <property name="maximum">
+- <number>-1</number>
++ <number>5</number>
+ </property>
+ <property name="singleStep">
+ <number>1</number>
+@@ -301,6 +301,21 @@ beginning of a file.</string>
+ <header>kcombobox.h</header>
+ </customwidget>
+ </customwidgets>
++ <tabstops>
++ <tabstop>gbWordWrap</tabstop>
++ <tabstop>chkDynWrapAtStaticMarker</tabstop>
++ <tabstop>cmbDynamicWordWrapIndicator</tabstop>
++ <tabstop>sbDynamicWordWrapDepth</tabstop>
++ <tabstop>chkShowTabs</tabstop>
++ <tabstop>chkShowSpaces</tabstop>
++ <tabstop>sliSetMarkerSize</tabstop>
++ <tabstop>chkShowIndentationLines</tabstop>
++ <tabstop>chkShowWholeBracketExpression</tabstop>
++ <tabstop>chkAnimateBracketMatching</tabstop>
++ <tabstop>chkFoldFirstLine</tabstop>
++ <tabstop>chkShowWordCount</tabstop>
++ <tabstop>chkShowLineCount</tabstop>
++ </tabstops>
+ <resources/>
+ <connections>
+ <connection>
+@@ -314,8 +329,8 @@ beginning of a file.</string>
+ <y>7</y>
+ </hint>
+ <hint type="destinationlabel">
+- <x>340</x>
+- <y>44</y>
++ <x>559</x>
++ <y>117</y>
+ </hint>
+ </hints>
+ </connection>
+@@ -330,8 +345,8 @@ beginning of a file.</string>
+ <y>6</y>
+ </hint>
+ <hint type="destinationlabel">
+- <x>385</x>
+- <y>72</y>
++ <x>559</x>
++ <y>162</y>
+ </hint>
+ </hints>
+ </connection>
+--
+cgit v1.1
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
new file mode 100644
index 00000000000..72fcd5e1261
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.54.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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}
+ test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package editorconfig EditorConfig)
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2019-04-22 10:41 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2019-04-22 10:41 UTC (permalink / raw
To: gentoo-commits
commit: 8fd8607af6f895a621afcb00f0ba152e9e78c396
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 20:43:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 22 10:41:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd8607a
kde-frameworks/ktexteditor: Fix shortcut conflict for switching tabs
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=383721
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/ktexteditor-5.57.0-shortcuts.patch | 54 ++++++++++++++++++++
.../ktexteditor/ktexteditor-5.57.0-r1.ebuild | 58 ++++++++++++++++++++++
2 files changed, 112 insertions(+)
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch
new file mode 100644
index 00000000000..2f979d68122
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.57.0-shortcuts.patch
@@ -0,0 +1,54 @@
+From 9f2ffd36c5873f4d2645f07129ead7970871808c Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sun, 14 Apr 2019 14:38:31 +0200
+Subject: avoid conflicting shortcuts for switching tabs
+
+Summary: use ALT + Home/End for top/bottom of view
+
+Subscribers: kwrite-devel, kde-frameworks-devel
+
+Tags: #kate, #frameworks
+
+Differential Revision: https://phabricator.kde.org/D20534
+---
+ src/view/kateview.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
+index 7220d26..55457c7 100644
+--- a/src/view/kateview.cpp
++++ b/src/view/kateview.cpp
+@@ -1046,13 +1046,13 @@ void KTextEditor::ViewPrivate::setupEditActions()
+
+ a = ac->addAction(QStringLiteral("move_top_of_view"));
+ a->setText(i18n("Move to Top of View"));
+- ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_PageUp));
++ ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::Key_Home));
+ connect(a, SIGNAL(triggered(bool)), SLOT(topOfView()));
+ m_editActions << a;
+
+ a = ac->addAction(QStringLiteral("select_top_of_view"));
+ a->setText(i18n("Select to Top of View"));
+- ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp));
++ ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_Home));
+ connect(a, SIGNAL(triggered(bool)), SLOT(shiftTopOfView()));
+ m_editActions << a;
+
+@@ -1070,13 +1070,13 @@ void KTextEditor::ViewPrivate::setupEditActions()
+
+ a = ac->addAction(QStringLiteral("move_bottom_of_view"));
+ a->setText(i18n("Move to Bottom of View"));
+- ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_PageDown));
++ ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::Key_End));
+ connect(a, SIGNAL(triggered(bool)), SLOT(bottomOfView()));
+ m_editActions << a;
+
+ a = ac->addAction(QStringLiteral("select_bottom_of_view"));
+ a->setText(i18n("Select to Bottom of View"));
+- ac->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown));
++ ac->setDefaultShortcut(a, QKeySequence(Qt::ALT + Qt::SHIFT + Qt::Key_End));
+ connect(a, SIGNAL(triggered(bool)), SLOT(shiftBottomOfView()));
+ m_editActions << a;
+
+--
+cgit v1.1
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.57.0-r1.ebuild
new file mode 100644
index 00000000000..550a3354398
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.57.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}-shortcuts.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package editorconfig EditorConfig)
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2021-11-27 11:08 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2021-11-27 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 259a5f4e6ef30f04c535eadefbc5422fd22a4a24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 27 10:13:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 27 11:07:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259a5f4e
kde-frameworks/ktexteditor: Revert "completion: invoke always"
Regression from KF 5.87, see also:
https://invent.kde.org/frameworks/ktexteditor/-/merge_requests/224
Upstream commit 3be743ebd34cfb1992d52ffe38ac5512e36aae12
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444883
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ktexteditor-5.88.0-revert-invoke-always.patch | 36 +++++++++++++
.../ktexteditor/ktexteditor-5.88.0-r1.ebuild | 63 ++++++++++++++++++++++
2 files changed, 99 insertions(+)
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
new file mode 100644
index 000000000000..543a2f8e0a65
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
@@ -0,0 +1,36 @@
+From 3be743ebd34cfb1992d52ffe38ac5512e36aae12 Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Thu, 11 Nov 2021 11:14:47 +0500
+Subject: [PATCH] Revert "completion: invoke always"
+
+This reverts commit d116503df2ca1b159c13ae77aac88cdb08408659.
+---
+ src/completion/katecompletionwidget.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/completion/katecompletionwidget.cpp b/src/completion/katecompletionwidget.cpp
+index 3af1f2b5..73a36423 100644
+--- a/src/completion/katecompletionwidget.cpp
++++ b/src/completion/katecompletionwidget.cpp
+@@ -35,7 +35,6 @@
+ #include <QToolButton>
+
+ const bool hideAutomaticCompletionOnExactMatch = true;
+-const bool invokeCompletionAlways = true;
+
+ // If this is true, the completion-list is navigated up/down when 'tab' is pressed, instead of doing partial completion
+ const bool shellLikeTabCompletion = false;
+@@ -418,9 +417,7 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range &word,
+ }
+ if (m_completionRanges.contains(model)) {
+ if (*m_completionRanges[model].range == range) {
+- if (!invokeCompletionAlways) {
+- continue; // Leave it running as it is
+- }
++ continue; // Leave it running as it is
+ } else { // delete the range that was used previously
+ KTextEditor::MovingRange *oldRange = m_completionRanges[model].range;
+ // qCDebug(LOG_KTE)<<"removing completion range 2";
+--
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
new file mode 100644
index 000000000000..65508f4a0393
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 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 git"
+
+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 )
+ git? ( dev-libs/libgit2:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-revert-invoke-always.patch" # KDE-bug 444883
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package editorconfig EditorConfig)
+ $(cmake_use_find_package git LibGit2)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2022-01-31 20:06 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-01-31 20:06 UTC (permalink / raw
To: gentoo-commits
commit: e4477d2d7f49b2c48ae89e34e860b103e215d748
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 20:00:06 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 20:02:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4477d2d
kde-frameworks/ktexteditor: Fix CVE-2022-23853
See also:
https://kde.org/info/security/advisory-20220131-1.txt
https://mail.kde.org/pipermail/kde-devel/2022-January/000943.html
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../ktexteditor-5.90.0-CVE-2022-23853-1.patch | 104 +++++++++++++++++++++
.../ktexteditor-5.90.0-CVE-2022-23853-2.patch | 55 +++++++++++
.../ktexteditor/ktexteditor-5.90.0-r2.ebuild | 61 ++++++++++++
3 files changed, 220 insertions(+)
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
new file mode 100644
index 000000000000..854cf0da4b2e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
@@ -0,0 +1,104 @@
+From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 20 Jan 2022 09:46:34 +0100
+Subject: [PATCH] only start programs in user's path
+
+don't use QProcess with just program name
+first search the right program in the user's path
+---
+ src/document/katedocument.cpp | 29 ++++++++++++++++------------
+ src/swapfile/kateswapdiffcreator.cpp | 17 ++++++++++++----
+ 2 files changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
+index 01f74da1..05d0e91b 100644
+--- a/src/document/katedocument.cpp
++++ b/src/document/katedocument.cpp
+@@ -72,6 +72,7 @@
+ #include <QMimeDatabase>
+ #include <QProcess>
+ #include <QRegularExpression>
++#include <QStandardPaths>
+ #include <QTemporaryFile>
+ #include <QTextCodec>
+ #include <QTextStream>
+@@ -5054,18 +5055,22 @@ void KTextEditor::DocumentPrivate::slotDelayedHandleModOnHd()
+ // skip that, if document is modified!
+ // only do that, if the file is still there, else reload makes no sense!
+ if (m_modOnHd && !isModified() && QFile::exists(url().toLocalFile())) {
+- QProcess git;
+- const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
+- git.start(QStringLiteral("git"), args);
+- if (git.waitForStarted()) {
+- git.closeWriteChannel();
+- if (git.waitForFinished()) {
+- if (git.exitCode() == 0) {
+- // this hash exists still in git => just reload
+- m_modOnHd = false;
+- m_modOnHdReason = OnDiskUnmodified;
+- m_prevModOnHdReason = OnDiskUnmodified;
+- documentReload();
++ // we only want to use git from PATH, cache this
++ static const QString fullGitPath = QStandardPaths::findExecutable(QStringLiteral("git"));
++ if (!fullGitPath.isEmpty()) {
++ QProcess git;
++ const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
++ git.start(fullGitPath, args);
++ if (git.waitForStarted()) {
++ git.closeWriteChannel();
++ if (git.waitForFinished()) {
++ if (git.exitCode() == 0) {
++ // this hash exists still in git => just reload
++ m_modOnHd = false;
++ m_modOnHdReason = OnDiskUnmodified;
++ m_prevModOnHdReason = OnDiskUnmodified;
++ documentReload();
++ }
+ }
+ }
+ }
+diff --git a/src/swapfile/kateswapdiffcreator.cpp b/src/swapfile/kateswapdiffcreator.cpp
+index 5c515c45..a185123a 100644
+--- a/src/swapfile/kateswapdiffcreator.cpp
++++ b/src/swapfile/kateswapdiffcreator.cpp
+@@ -14,6 +14,7 @@
+ #include <KMessageBox>
+
+ #include <QDir>
++#include <QStandardPaths>
+ #include <QTextCodec>
+
+ // BEGIN SwapDiffCreator
+@@ -85,17 +86,25 @@ void SwapDiffCreator::viewDiff()
+ connect(&m_proc, &QProcess::readyRead, this, &SwapDiffCreator::slotDataAvailable, Qt::UniqueConnection);
+ connect(&m_proc, &QProcess::finished, this, &SwapDiffCreator::slotDiffFinished, Qt::UniqueConnection);
+
+- // try to start diff process, if we can't be started be done with error
+- m_proc.start(QStringLiteral("diff"), QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
+- if (!m_proc.waitForStarted()) {
++ // use diff from PATH only => inform if not found at all
++ const QString fullDiffPath = QStandardPaths::findExecutable(QStringLiteral("diff"));
++ if (fullDiffPath.isEmpty()) {
+ KMessageBox::sorry(nullptr,
+- i18n("The diff command could not be started. Please make sure that "
++ i18n("The diff command could not be found. Please make sure that "
+ "diff(1) is installed and in your PATH."),
+ i18n("Error Creating Diff"));
+ deleteLater();
+ return;
+ }
+
++ // try to start the diff program, might fail, too
++ m_proc.start(fullDiffPath, QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
++ if (!m_proc.waitForStarted()) {
++ KMessageBox::sorry(nullptr, i18n("The diff command '%1' could not be started.").arg(fullDiffPath), i18n("Error Creating Diff"));
++ deleteLater();
++ return;
++ }
++
+ // process is up and running, we can write data to it
+ QTextStream ts(&m_proc);
+ int lineCount = recoverDoc.lines();
+--
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
new file mode 100644
index 000000000000..8cccfe3a95b0
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
@@ -0,0 +1,55 @@
+From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 20 Jan 2022 10:30:20 +0100
+Subject: [PATCH] only execute diff in path
+
+---
+ src/dialogs/katedialogs.cpp | 5 +++--
+ src/dialogs/katedialogs.h | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp
+index 5b949f36..63a58aee 100644
+--- a/src/dialogs/katedialogs.cpp
++++ b/src/dialogs/katedialogs.cpp
+@@ -1317,6 +1317,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
+ : QObject(doc)
+ , m_doc(doc)
+ , m_modtype(modtype)
++ , m_fullDiffPath(QStandardPaths::findExecutable(QStringLiteral("diff")))
+ , m_proc(nullptr)
+ , m_diffFile(nullptr)
+ , m_diffAction(nullptr)
+@@ -1334,7 +1335,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
+ m_message->addAction(aAutoReload, false);
+ connect(aAutoReload, &QAction::triggered, this, &KateModOnHdPrompt::autoReloadTriggered);
+
+- if (!QStandardPaths::findExecutable(QStringLiteral("diff")).isEmpty()) {
++ if (!m_fullDiffPath.isEmpty()) {
+ m_diffAction = new QAction(i18n("View &Difference"), this);
+ m_diffAction->setIcon(QIcon::fromTheme(QStringLiteral("document-multiple")));
+ m_diffAction->setToolTip(i18n("Shows a diff of the changes"));
+@@ -1394,7 +1395,7 @@ void KateModOnHdPrompt::slotDiff()
+ // Start a KProcess that creates a diff
+ m_proc = new KProcess(this);
+ m_proc->setOutputChannelMode(KProcess::MergedChannels);
+- *m_proc << QStringLiteral("diff") << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
++ *m_proc << m_fullDiffPath << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
+ connect(m_proc, &KProcess::readyRead, this, &KateModOnHdPrompt::slotDataAvailable);
+ connect(m_proc, &KProcess::finished, this, &KateModOnHdPrompt::slotPDone);
+
+diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h
+index 80b611d9..e5574023 100644
+--- a/src/dialogs/katedialogs.h
++++ b/src/dialogs/katedialogs.h
+@@ -376,6 +376,7 @@ private:
+ KTextEditor::DocumentPrivate *m_doc;
+ QPointer<KTextEditor::Message> m_message;
+ KTextEditor::ModificationInterface::ModifiedOnDiskReason m_modtype;
++ QString m_fullDiffPath;
+ KProcess *m_proc;
+ QTemporaryFile *m_diffFile;
+ QAction *m_diffAction;
+--
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
new file mode 100644
index 000000000000..4b7520cf0d9f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
@@ -0,0 +1,61 @@
+# 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
+ "${FILESDIR}"/${P}-KDEBUG-447972.patch
+ "${FILESDIR}"/${P}-CVE-2022-23853-{1,2}.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package editorconfig EditorConfig)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2022-02-10 9:13 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-02-10 9:13 UTC (permalink / raw
To: gentoo-commits
commit: 164f9ef42c0fd49cab16b428e75b47e92327ca50
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 08:20:49 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 09:11:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164f9ef4
kde-frameworks/ktexteditor: drop 5.88.0*
Bug: https://bugs.gentoo.org/832447
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/ktexteditor/Manifest | 1 -
.../ktexteditor-5.88.0-revert-invoke-always.patch | 36 -------------
.../ktexteditor/ktexteditor-5.88.0-r1.ebuild | 63 ----------------------
3 files changed, 100 deletions(-)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 1c50ca067e5f..817802ccbcd8 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1 @@
-DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b
DIST ktexteditor-5.90.0.tar.xz 2340540 BLAKE2B eceb56847e43c7d8e8883bc219228ec365bf85cb5279ef255f59d3005a5e1fb6cbc55309b9791b5cdc088201283a08f5b0ab9c0fd840604c349442e60bfa4a0f SHA512 7c63802a4d904d2e5eff6e3c957e9a94848993898bdd37eb033842d4033985820348d81080a3701db19aef1a5762ebdc8a4a4749c931d79f00c986837faa5837
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
deleted file mode 100644
index 543a2f8e0a65..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.88.0-revert-invoke-always.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3be743ebd34cfb1992d52ffe38ac5512e36aae12 Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-Date: Thu, 11 Nov 2021 11:14:47 +0500
-Subject: [PATCH] Revert "completion: invoke always"
-
-This reverts commit d116503df2ca1b159c13ae77aac88cdb08408659.
----
- src/completion/katecompletionwidget.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/completion/katecompletionwidget.cpp b/src/completion/katecompletionwidget.cpp
-index 3af1f2b5..73a36423 100644
---- a/src/completion/katecompletionwidget.cpp
-+++ b/src/completion/katecompletionwidget.cpp
-@@ -35,7 +35,6 @@
- #include <QToolButton>
-
- const bool hideAutomaticCompletionOnExactMatch = true;
--const bool invokeCompletionAlways = true;
-
- // If this is true, the completion-list is navigated up/down when 'tab' is pressed, instead of doing partial completion
- const bool shellLikeTabCompletion = false;
-@@ -418,9 +417,7 @@ void KateCompletionWidget::startCompletion(const KTextEditor::Range &word,
- }
- if (m_completionRanges.contains(model)) {
- if (*m_completionRanges[model].range == range) {
-- if (!invokeCompletionAlways) {
-- continue; // Leave it running as it is
-- }
-+ continue; // Leave it running as it is
- } else { // delete the range that was used previously
- KTextEditor::MovingRange *oldRange = m_completionRanges[model].range;
- // qCDebug(LOG_KTE)<<"removing completion range 2";
---
-GitLab
-
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
deleted file mode 100644
index 7f4f80bebbc0..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.88.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 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 git"
-
-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 )
- git? ( dev-libs/libgit2:= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- test? ( >=kde-frameworks/kservice-${PVCUT}:5 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-revert-invoke-always.patch" # KDE-bug 444883
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package editorconfig EditorConfig)
- $(cmake_use_find_package git LibGit2)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2022-05-04 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-05-04 20:50 UTC (permalink / raw
To: gentoo-commits
commit: baf8b2ac95077160b63c80e2bc37929742c7b424
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 21:36:58 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:49:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf8b2ac
kde-frameworks/ktexteditor: drop 5.90.0*
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/ktexteditor/Manifest | 1 -
.../ktexteditor-5.90.0-CVE-2022-23853-1.patch | 104 ----------------
.../ktexteditor-5.90.0-CVE-2022-23853-2.patch | 55 --------
.../files/ktexteditor-5.90.0-KDEBUG-447972.patch | 26 ----
.../files/ktexteditor-5.90.0-revert-5dce70a9.patch | 138 ---------------------
.../ktexteditor/ktexteditor-5.90.0-r2.ebuild | 61 ---------
6 files changed, 385 deletions(-)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index ed403c33039f..ebe34c54e8eb 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,3 +1,2 @@
-DIST ktexteditor-5.90.0.tar.xz 2340540 BLAKE2B eceb56847e43c7d8e8883bc219228ec365bf85cb5279ef255f59d3005a5e1fb6cbc55309b9791b5cdc088201283a08f5b0ab9c0fd840604c349442e60bfa4a0f SHA512 7c63802a4d904d2e5eff6e3c957e9a94848993898bdd37eb033842d4033985820348d81080a3701db19aef1a5762ebdc8a4a4749c931d79f00c986837faa5837
DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
DIST ktexteditor-5.93.0.tar.xz 2376176 BLAKE2B b0c0591adcf745eab3c2b0f016ec879834b5923aa76e4031843b9de72c35ac03ab3258dd313dd643bbe98aaf68af481e6f99e95320e98bfa5b5ad0acca938024 SHA512 a50a0bf02bea5c27460aaf2074a4e1226279bf8d540afec8dcfca5cb96250718a4c40b6fba1522d293f458a497aef3bfe804e57539edf8af9e460d88ee75db68
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
deleted file mode 100644
index 854cf0da4b2e..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 20 Jan 2022 09:46:34 +0100
-Subject: [PATCH] only start programs in user's path
-
-don't use QProcess with just program name
-first search the right program in the user's path
----
- src/document/katedocument.cpp | 29 ++++++++++++++++------------
- src/swapfile/kateswapdiffcreator.cpp | 17 ++++++++++++----
- 2 files changed, 30 insertions(+), 16 deletions(-)
-
-diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
-index 01f74da1..05d0e91b 100644
---- a/src/document/katedocument.cpp
-+++ b/src/document/katedocument.cpp
-@@ -72,6 +72,7 @@
- #include <QMimeDatabase>
- #include <QProcess>
- #include <QRegularExpression>
-+#include <QStandardPaths>
- #include <QTemporaryFile>
- #include <QTextCodec>
- #include <QTextStream>
-@@ -5054,18 +5055,22 @@ void KTextEditor::DocumentPrivate::slotDelayedHandleModOnHd()
- // skip that, if document is modified!
- // only do that, if the file is still there, else reload makes no sense!
- if (m_modOnHd && !isModified() && QFile::exists(url().toLocalFile())) {
-- QProcess git;
-- const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
-- git.start(QStringLiteral("git"), args);
-- if (git.waitForStarted()) {
-- git.closeWriteChannel();
-- if (git.waitForFinished()) {
-- if (git.exitCode() == 0) {
-- // this hash exists still in git => just reload
-- m_modOnHd = false;
-- m_modOnHdReason = OnDiskUnmodified;
-- m_prevModOnHdReason = OnDiskUnmodified;
-- documentReload();
-+ // we only want to use git from PATH, cache this
-+ static const QString fullGitPath = QStandardPaths::findExecutable(QStringLiteral("git"));
-+ if (!fullGitPath.isEmpty()) {
-+ QProcess git;
-+ const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
-+ git.start(fullGitPath, args);
-+ if (git.waitForStarted()) {
-+ git.closeWriteChannel();
-+ if (git.waitForFinished()) {
-+ if (git.exitCode() == 0) {
-+ // this hash exists still in git => just reload
-+ m_modOnHd = false;
-+ m_modOnHdReason = OnDiskUnmodified;
-+ m_prevModOnHdReason = OnDiskUnmodified;
-+ documentReload();
-+ }
- }
- }
- }
-diff --git a/src/swapfile/kateswapdiffcreator.cpp b/src/swapfile/kateswapdiffcreator.cpp
-index 5c515c45..a185123a 100644
---- a/src/swapfile/kateswapdiffcreator.cpp
-+++ b/src/swapfile/kateswapdiffcreator.cpp
-@@ -14,6 +14,7 @@
- #include <KMessageBox>
-
- #include <QDir>
-+#include <QStandardPaths>
- #include <QTextCodec>
-
- // BEGIN SwapDiffCreator
-@@ -85,17 +86,25 @@ void SwapDiffCreator::viewDiff()
- connect(&m_proc, &QProcess::readyRead, this, &SwapDiffCreator::slotDataAvailable, Qt::UniqueConnection);
- connect(&m_proc, &QProcess::finished, this, &SwapDiffCreator::slotDiffFinished, Qt::UniqueConnection);
-
-- // try to start diff process, if we can't be started be done with error
-- m_proc.start(QStringLiteral("diff"), QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
-- if (!m_proc.waitForStarted()) {
-+ // use diff from PATH only => inform if not found at all
-+ const QString fullDiffPath = QStandardPaths::findExecutable(QStringLiteral("diff"));
-+ if (fullDiffPath.isEmpty()) {
- KMessageBox::sorry(nullptr,
-- i18n("The diff command could not be started. Please make sure that "
-+ i18n("The diff command could not be found. Please make sure that "
- "diff(1) is installed and in your PATH."),
- i18n("Error Creating Diff"));
- deleteLater();
- return;
- }
-
-+ // try to start the diff program, might fail, too
-+ m_proc.start(fullDiffPath, QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
-+ if (!m_proc.waitForStarted()) {
-+ KMessageBox::sorry(nullptr, i18n("The diff command '%1' could not be started.").arg(fullDiffPath), i18n("Error Creating Diff"));
-+ deleteLater();
-+ return;
-+ }
-+
- // process is up and running, we can write data to it
- QTextStream ts(&m_proc);
- int lineCount = recoverDoc.lines();
---
-GitLab
-
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
deleted file mode 100644
index 8cccfe3a95b0..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-Date: Thu, 20 Jan 2022 10:30:20 +0100
-Subject: [PATCH] only execute diff in path
-
----
- src/dialogs/katedialogs.cpp | 5 +++--
- src/dialogs/katedialogs.h | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp
-index 5b949f36..63a58aee 100644
---- a/src/dialogs/katedialogs.cpp
-+++ b/src/dialogs/katedialogs.cpp
-@@ -1317,6 +1317,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
- : QObject(doc)
- , m_doc(doc)
- , m_modtype(modtype)
-+ , m_fullDiffPath(QStandardPaths::findExecutable(QStringLiteral("diff")))
- , m_proc(nullptr)
- , m_diffFile(nullptr)
- , m_diffAction(nullptr)
-@@ -1334,7 +1335,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
- m_message->addAction(aAutoReload, false);
- connect(aAutoReload, &QAction::triggered, this, &KateModOnHdPrompt::autoReloadTriggered);
-
-- if (!QStandardPaths::findExecutable(QStringLiteral("diff")).isEmpty()) {
-+ if (!m_fullDiffPath.isEmpty()) {
- m_diffAction = new QAction(i18n("View &Difference"), this);
- m_diffAction->setIcon(QIcon::fromTheme(QStringLiteral("document-multiple")));
- m_diffAction->setToolTip(i18n("Shows a diff of the changes"));
-@@ -1394,7 +1395,7 @@ void KateModOnHdPrompt::slotDiff()
- // Start a KProcess that creates a diff
- m_proc = new KProcess(this);
- m_proc->setOutputChannelMode(KProcess::MergedChannels);
-- *m_proc << QStringLiteral("diff") << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
-+ *m_proc << m_fullDiffPath << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
- connect(m_proc, &KProcess::readyRead, this, &KateModOnHdPrompt::slotDataAvailable);
- connect(m_proc, &KProcess::finished, this, &KateModOnHdPrompt::slotPDone);
-
-diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h
-index 80b611d9..e5574023 100644
---- a/src/dialogs/katedialogs.h
-+++ b/src/dialogs/katedialogs.h
-@@ -376,6 +376,7 @@ private:
- KTextEditor::DocumentPrivate *m_doc;
- QPointer<KTextEditor::Message> m_message;
- KTextEditor::ModificationInterface::ModifiedOnDiskReason m_modtype;
-+ QString m_fullDiffPath;
- KProcess *m_proc;
- QTemporaryFile *m_diffFile;
- QAction *m_diffAction;
---
-GitLab
-
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
deleted file mode 100644
index 05cfbd107cd9..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 863f606b1fcf3b91b256d9167a00539289246188 Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-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/files/ktexteditor-5.90.0-revert-5dce70a9.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
deleted file mode 100644
index 140bc0cf7111..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 3b31919427baf3da1ab1a24f682a4cefc7e5106f Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.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-r2.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
deleted file mode 100644
index 3c7a77ac1c3a..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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
- "${FILESDIR}"/${P}-KDEBUG-447972.patch
- "${FILESDIR}"/${P}-CVE-2022-23853-{1,2}.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package editorconfig EditorConfig)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2022-08-06 7:44 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-08-06 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 66330a02cabfcd7eccc04e99e4eb7d6bfd7e0f31
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 06:59:20 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 6 07:18:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66330a02
kde-frameworks/ktexteditor: drop 5.92.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/ktexteditor/Manifest | 1 -
...xteditor-5.92.0-fix-crash-w-stale-indexes.patch | 29 ------
| 112 ---------------------
.../ktexteditor/ktexteditor-5.92.0-r1.ebuild | 60 -----------
4 files changed, 202 deletions(-)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 75039f499304..f7b05348da57 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1 @@
-DIST ktexteditor-5.92.0.tar.xz 2347752 BLAKE2B c4e2356132f535dccbea1bae2355f3455b91d98c1cd99735db0ec39f0b2bc68f062e60e85f085e3614420d673487ea436243be485b321576022243736dec9f57 SHA512 5455fd579047db0010036afe0490620089687e206440ff77af270d9dcc25c1d48b3b8d763144f416cc539038c29e0e70703a1300b7ad78d0db59320a0712c402
DIST ktexteditor-5.96.0.tar.xz 2404504 BLAKE2B 3d35559a25a111b3a21ea48f8512b237f343fe31e4cce5031a60b6efd3eb1f832255ed327ec63c6d5e81bc2be2f7eac3eb524ef7b354516273f070a5057effa1 SHA512 83528972d06bdebbd5f00ff17b40bf6f413b29590127ab7ef2d842bf7bf248e18dfb9dfef4ad3501b2689fe14d6b0444ee654a06c4f58a0dc23bdebae2f7ea04
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
deleted file mode 100644
index b77a72a3e502..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ad82b876016367bd9765185dba84600985e5d0fd Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-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 &proxyIndex) 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
deleted file mode 100644
index bac8cd017e68..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 1173d5184e8b073790556dbdba92a8b8abdd62dc Mon Sep 17 00:00:00 2001
-From: Waqar Ahmed <waqar.17a@gmail.com>
-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<iostream>\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<iostream>\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
-+ doc.commentSelection(Range(1, 0, 1, 3), Cursor(1, 3), false, 0);
-+ QCOMPARE(doc.text(), QStringLiteral("#include<iostream>\n/*int*/ main()\n{\nreturn 0;\n}\n"));
-+ doc.commentSelection(Range(1, 0, 1, 7), Cursor(1, 3), false, 0);
-+ QCOMPARE(doc.text(), original);
-+
-+ // mixed, one line commented, one not => both get commented
-+ original = QStringLiteral(" // int main()\n{}");
-+ doc.setText(original);
-+ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0);
-+ QCOMPARE(doc.text(), QStringLiteral("// // int main()\n// {}"));
-+ doc.commentSelection(doc.documentRange(), {1, 2}, false, 0);
-+ // after uncommenting, we get original text back with one line commented
-+ QCOMPARE(doc.text(), original);
-+ }
-+}
-+
- #include "katedocument_test.moc"
-diff --git a/autotests/src/katedocument_test.h b/autotests/src/katedocument_test.h
-index c3b24b4c..0076f879 100644
---- a/autotests/src/katedocument_test.h
-+++ b/autotests/src/katedocument_test.h
-@@ -46,6 +46,7 @@ private Q_SLOTS:
- void testIndentOnPaste();
- void testAboutToSave();
- void testKeepUndoOverReload();
-+ void testToggleComment();
- };
-
- #endif // KATE_DOCUMENT_TEST_H
-diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
-index 56e8fc7d..b72592b6 100644
---- a/src/document/katedocument.cpp
-+++ b/src/document/katedocument.cpp
-@@ -3995,7 +3995,11 @@ bool KTextEditor::DocumentPrivate::removeStartLineCommentFromSelection(KTextEdit
- bool allLinesAreCommented = true;
- for (int line = endLine; line >= startLine; line--) {
- const auto ln = m_buffer->plainLine(line);
-- if (!ln->startsWith(shortCommentMark) && !ln->startsWith(longCommentMark)) {
-+ const QString &text = ln->text();
-+ QStringView textView(text.data(), text.size());
-+ // Must trim any spaces at the beginning
-+ textView = textView.trimmed();
-+ if (!textView.startsWith(shortCommentMark) && !textView.startsWith(longCommentMark)) {
- allLinesAreCommented = false;
- break;
- }
-@@ -4031,6 +4035,10 @@ void KTextEditor::DocumentPrivate::commentSelection(KTextEditor::Range selection
-
- int startAttrib = 0;
- Kate::TextLine ln = kateTextLine(line);
-+ if (!ln) {
-+ qWarning() << __FUNCTION__ << __LINE__ << "Unexpected null TextLine for " << line << " lineCount: " << lines();
-+ return;
-+ }
-
- if (selectionCol < ln->length()) {
- startAttrib = ln->attribute(selectionCol);
---
-GitLab
-
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
deleted file mode 100644
index 6671981ff5f7..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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}-fix-crash-w-stale-indexes.patch" # KDE-bug 451593
- "${FILESDIR}/${P}-fix-toggle-comment.patch" # KDE-bug 451471
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package editorconfig EditorConfig)
- )
-
- ecm_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2022-11-27 11:20 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2022-11-27 11:20 UTC (permalink / raw
To: gentoo-commits
commit: 11e5363666c7695520033d92aa7d6e4032855360
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:13:49 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:20:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11e53636
kde-frameworks/ktexteditor: drop 5.96.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/ktexteditor/Manifest | 1 -
.../files/ktexteditor-5.96.0-unused-dep.patch | 24 ----------
.../ktexteditor/ktexteditor-5.96.0-r1.ebuild | 56 ----------------------
3 files changed, 81 deletions(-)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 930b5d4ca341..a55e6458c4aa 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,3 +1,2 @@
DIST ktexteditor-5.100.0.tar.xz 2743652 BLAKE2B 59031d1698824a9174799e6e40fc1aa77e1e45e3bd3ddb11e41e5b444526bbbb4e43ec5dcab8a2f3926e7470b8bdd711f1c459ea9235c651878a398170785467 SHA512 065dca15fa7df6e300cf0b53b99ddd824a93c17d4524638011e6b3f3670b89459c97724d3d813148096829f1677f7ab2643986694d517b0563794d814f382dce
-DIST ktexteditor-5.96.0.tar.xz 2404504 BLAKE2B 3d35559a25a111b3a21ea48f8512b237f343fe31e4cce5031a60b6efd3eb1f832255ed327ec63c6d5e81bc2be2f7eac3eb524ef7b354516273f070a5057effa1 SHA512 83528972d06bdebbd5f00ff17b40bf6f413b29590127ab7ef2d842bf7bf248e18dfb9dfef4ad3501b2689fe14d6b0444ee654a06c4f58a0dc23bdebae2f7ea04
DIST ktexteditor-5.99.0.tar.xz 2428464 BLAKE2B 8e65c6975bc2db94373d94d9a1ae08aac4aa75f9a2cb1b2c40774c09409af23a30c692452539413003e161e93e90bb927535c5f0cdb2e00a6f5f45235781bc11 SHA512 f521ff9f7143a36c41e9710eb74de904884557952e90ed817c0fdab6abb9554ed5a9532d88d1d6e35e7d60fd9793bd92780ba9d4577c675d6d7f1c76ec4d464f
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
deleted file mode 100644
index 8107b3cbc12f..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-5.96.0-unused-dep.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 509ca8a46ff46ef3e06407b90a8b48af9655fcce Mon Sep 17 00:00:00 2001
-From: Christoph Cullmann <cullmann@kde.org>
-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
deleted file mode 100644
index 851a891a7b6a..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.96.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/
@ 2024-11-06 19:52 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2024-11-06 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 4194414477473b6da6031425fbb52cf403b2c6f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 5 23:49:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 6 19:51:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41944144
kde-frameworks/ktexteditor: Fix segfaults
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=494826
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/ktexteditor-6.7.0-fix-segfault.patch | 70 ++++++++++++++++++++++
.../ktexteditor/ktexteditor-6.7.0-r1.ebuild | 54 +++++++++++++++++
2 files changed, 124 insertions(+)
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch b/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch
new file mode 100644
index 000000000000..9ae8ebff41b0
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch
@@ -0,0 +1,70 @@
+From 43c148b2664e15e2c517ba1eb53dc04447b7d499 Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Wed, 16 Oct 2024 10:32:36 +0500
+Subject: [PATCH] Fix multiblock range handling when unwrapping line
+
+BUG: 494826
+(cherry picked from commit 2c7e0711efd65e68687d530240bb46a1cf8de122)
+---
+ src/buffer/katetextblock.cpp | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/buffer/katetextblock.cpp b/src/buffer/katetextblock.cpp
+index 90ed4e480..d1e767dfd 100644
+--- a/src/buffer/katetextblock.cpp
++++ b/src/buffer/katetextblock.cpp
+@@ -219,7 +219,7 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+
+ // move all cursors because of the unwrapped line
+ // remember all ranges modified, optimize for the standard case of a few ranges
+- QVarLengthArray<TextRange *, 32> changedRanges;
++ QVarLengthArray<QPair<TextRange *, bool>, 32> changedRanges;
+ for (TextCursor *cursor : m_cursors) {
+ // this is the unwrapped line
+ if (cursor->lineInBlock() == 0) {
+@@ -230,7 +230,7 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+ auto range = cursor->kateRange();
+ if (range && !range->isValidityCheckRequired()) {
+ range->setValidityCheckRequired();
+- changedRanges.push_back(range);
++ changedRanges.push_back({range, false});
+ }
+ }
+ }
+@@ -239,15 +239,18 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+ for (auto it = previousBlock->m_cursors.begin(); it != previousBlock->m_cursors.end();) {
+ auto cursor = *it;
+ if (cursor->lineInBlock() == lastLineOfPreviousBlock) {
++ Kate::TextRange *range = cursor->kateRange();
++ // get the value before changing the block
++ const bool spansMultipleBlocks = range && range->spansMultipleBlocks();
+ cursor->m_line = 0;
+ cursor->m_block = this;
+ m_cursors.insert(cursor);
+
+ // remember range, if any, avoid double insert
+- auto range = cursor->kateRange();
+ if (range && !range->isValidityCheckRequired()) {
+ range->setValidityCheckRequired();
+- changedRanges.push_back(range);
++ // the range might not span multiple blocks anymore
++ changedRanges.push_back({range, spansMultipleBlocks});
+ }
+
+ // remove from previous block
+@@ -261,7 +264,11 @@ void TextBlock::unwrapLine(int line, TextBlock *previousBlock, int fixStartLines
+ // fixup the ranges that might be effected, because they moved from last line to this block
+ // we might need to invalidate ranges or notify about their changes
+ // checkValidity might trigger delete of the range!
+- for (TextRange *range : std::as_const(changedRanges)) {
++ for (auto [range, wasMultiblock] : changedRanges) {
++ // if the range doesn't span multiple blocks anymore remove it from buffer multiline range cache
++ if (!range->spansMultipleBlocks() && wasMultiblock) {
++ m_buffer->removeMultilineRange(range);
++ }
+ // afterwards check validity, might delete this range!
+ range->checkValidity();
+ }
+--
+2.47.0
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild
new file mode 100644
index 000000000000..9a041c7561e2
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org
+
+DESCRIPTION="Framework providing a full text editor component"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+editorconfig"
+
+RESTRICT="test"
+
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtspeech-${QTMIN}:6
+ =kde-frameworks/karchive-${PVCUT}*:6
+ =kde-frameworks/kauth-${PVCUT}*:6
+ =kde-frameworks/kcodecs-${PVCUT}*:6
+ =kde-frameworks/kcompletion-${PVCUT}*:6
+ =kde-frameworks/kconfig-${PVCUT}*:6
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:6
+ =kde-frameworks/kcoreaddons-${PVCUT}*:6
+ =kde-frameworks/kguiaddons-${PVCUT}*:6
+ =kde-frameworks/ki18n-${PVCUT}*:6
+ =kde-frameworks/kiconthemes-${PVCUT}*:6
+ =kde-frameworks/kio-${PVCUT}*:6
+ =kde-frameworks/kitemviews-${PVCUT}*:6
+ =kde-frameworks/kjobwidgets-${PVCUT}*:6
+ =kde-frameworks/kparts-${PVCUT}*:6
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:6
+ =kde-frameworks/kwindowsystem-${PVCUT}*:6
+ =kde-frameworks/kxmlgui-${PVCUT}*:6
+ =kde-frameworks/sonnet-${PVCUT}*:6
+ =kde-frameworks/syntax-highlighting-${PVCUT}*:6
+ editorconfig? ( app-text/editorconfig-core-c )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-segfault.patch" ) # KDE-bug 494826
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package editorconfig EditorConfig)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-11-06 19:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-04 20:50 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/, kde-frameworks/ktexteditor/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-06 19:52 Andreas Sturmlechner
2022-11-27 11:20 Andreas Sturmlechner
2022-08-06 7:44 Andreas Sturmlechner
2022-02-10 9:13 Andreas Sturmlechner
2022-01-31 20:06 Andreas Sturmlechner
2021-11-27 11:08 Andreas Sturmlechner
2019-04-22 10:41 Andreas Sturmlechner
2019-01-30 17:28 Andreas Sturmlechner
2017-10-19 9:04 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox