* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2016-09-29 11:39 Michael Palimaka
0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2016-09-29 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 33a18042925667eb8c267a441b5cfa8830c3039e
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 21:07:42 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 11:39:06 2016 +0000
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 00000000..7b51ddb
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-eol-detection.patch
@@ -0,0 +1,27 @@
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Tue, 06 Sep 2016 20:47:41 +0000
+Subject: fix eol setting in mode lines
+X-Git-Url: http://quickgit.kde.org/?p=ktexteditor.git&a=commitdiff&h=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, &state)) {
+
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 00000000..22b3e0f
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-fix-searchbar.patch
@@ -0,0 +1,58 @@
+From: Roman Gilg <subdiff@gmail.com>
+Date: Thu, 08 Sep 2016 10:51:51 +0000
+Subject: KateNormalInputMode needs to rerun SearchBar enter methods
+X-Git-Url: http://quickgit.kde.org/?p=ktexteditor.git&a=commitdiff&h=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 00000000..e28fc7e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.26.0-runtime-crash1.patch
@@ -0,0 +1,149 @@
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Wed, 07 Sep 2016 10:27:00 +0000
+Subject: Fix crash when showing top or bottom messages mutliple times
+X-Git-Url: http://quickgit.kde.org/?p=ktexteditor.git&a=commitdiff&h=86f1dde943389bbf211ec1cde3f27c9681351d3f
+---
+Fix crash when showing top or bottom messages mutliple times
+
+Unfortunately, this regression was introduced in KF 5.24-5.26.
+Will be fixed with KF 5.27.
+---
+
+
+--- a/autotests/src/messagetest.cpp
++++ b/autotests/src/messagetest.cpp
+@@ -66,7 +66,7 @@
+ QVERIFY(message != 0);
+ delete message;
+ QTest::qWait(600); // fadeout animation takes 500 ms
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testAutoHide()
+@@ -98,7 +98,7 @@
+
+ // message widget should be hidden after 2 seconds
+ QTest::qWait(500);
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testAutoHideAfterUserInteraction()
+@@ -142,7 +142,7 @@
+
+ // after a total of 3.6 seconds, widget should be hidden
+ QTest::qWait(500);
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testMessageQueue()
+@@ -200,7 +200,7 @@
+
+ // after a total of 3.1s, animation is finished and widget is hidden
+ QTest::qWait(500);
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testPriority()
+@@ -305,8 +305,8 @@
+ // delete message, then check after fadeout time 0f 0.5s whether message is gone
+ delete m1;
+ QTest::qWait(600);
+- QVERIFY(!v1->messageWidget());
+- QVERIFY(!v2->messageWidget());
++ QVERIFY(!v1->messageWidget()->isVisible());
++ QVERIFY(!v2->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testHideView()
+@@ -353,7 +353,7 @@
+ // wait another 0.5s, then message widget should be hidden
+ QTest::qWait(500);
+ QVERIFY(message.data() == 0);
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+ void MessageTest::testHideViewAfterUserInteraction()
+@@ -414,6 +414,6 @@
+
+ // another 0.5s, and the message widget should be hidden
+ QTest::qWait(600);
+- QVERIFY(!view->messageWidget());
++ QVERIFY(!view->messageWidget()->isVisible());
+ }
+
+-
+
+--- a/src/view/katemessagewidget.cpp
++++ b/src/view/katemessagewidget.cpp
+@@ -78,7 +78,6 @@
+ // if not message to show, just stop
+ if (m_messageQueue.size() == 0) {
+ hide();
+- deleteLater();
+ return;
+ }
+
+--- a/src/view/kateview.cpp
++++ b/src/view/kateview.cpp
+@@ -51,6 +51,7 @@
+ #include "script/katescriptmanager.h"
+ #include "script/katescriptaction.h"
+ #include "export/exporter.h"
++#include "katemessagewidget.h"
+ #include "katetemplatehandler.h"
+ #include "katepartdebug.h"
+ #include "printing/kateprinter.h"
+--- a/src/view/kateview.h
++++ b/src/view/kateview.h
+@@ -38,7 +38,6 @@
+ #include "katetextrange.h"
+ #include "katetextfolding.h"
+ #include "katerenderer.h"
+-#include "katemessagewidget.h"
+
+ namespace KTextEditor
+ {
+@@ -58,6 +57,7 @@
+ class KateGotoBar;
+ class KateDictionaryBar;
+ class KateSpellingMenu;
++class KateMessageWidget;
+ class KateIconBorder;
+ class KateStatusBar;
+ class KateViewEncodingAction;
+@@ -873,13 +873,13 @@
+
+ private:
+ /** Message widget showing KTextEditor::Messages above the View. */
+- QPointer<KateMessageWidget> m_topMessageWidget;
++ KateMessageWidget *m_topMessageWidget;
+ /** Message widget showing KTextEditor::Messages below the View. */
+- QPointer<KateMessageWidget> m_bottomMessageWidget;
++ KateMessageWidget *m_bottomMessageWidget;
+ /** Message widget showing KTextEditor::Messages as view overlay in top right corner. */
+- QPointer<KateMessageWidget> m_floatTopMessageWidget;
++ KateMessageWidget *m_floatTopMessageWidget;
+ /** Message widget showing KTextEditor::Messages as view overlay in bottom left corner. */
+- QPointer<KateMessageWidget> m_floatBottomMessageWidget;
++ KateMessageWidget *m_floatBottomMessageWidget;
+ /** Layout for floating notifications */
+ QVBoxLayout *m_notificationLayout;
+
+--- a/src/view/kateviewinternal.cpp
++++ b/src/view/kateviewinternal.cpp
+@@ -484,7 +484,9 @@
+ if (!calledExternally && qAbs(viewLinesScrolled) < lines &&
+ // NOTE: on some machines we must update if the floating widget is visible
+ // otherwise strange painting bugs may occur during scrolling...
+- !(m_view->m_floatTopMessageWidget || m_view->m_bottomMessageWidget))
++ !((m_view->m_floatTopMessageWidget && m_view->m_floatTopMessageWidget->isVisible()) ||
++ (m_view->m_floatBottomMessageWidget && m_view->m_floatBottomMessageWidget->isVisible()))
++ )
+ {
+ updateView(false, viewLinesScrolled);
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r2.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r2.ebuild
new file mode 100644
index 00000000..a1001a7
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.26.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="git"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(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_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ $(add_qt_dep qtxmlpatterns)
+ test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-eol-detection.patch"
+ "${FILESDIR}/${P}-fix-searchbar.patch"
+ "${FILESDIR}/${P}-runtime-crash.patch"
+ "${FILESDIR}/${P}-runtime-crash1.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2018-06-09 7:18 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2018-06-09 7:18 UTC (permalink / raw
To: gentoo-commits
commit: aff1af8e4bca8bdc6b3dd078b3bd4e9ed0ad6e73
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 9 07:18:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 9 07:18:17 2018 +0000
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 00000000000..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 <cullmann@kde.org>
+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 &args)
+ bool SecureTextBuffer::saveFileInternal(const QString &sourceFile, const QString &targetFile,
+ const QByteArray &checksum, 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("/secureXXXXXX"));
+ 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 &sourceFile, 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 permissions
++ */
++ if (!targetFileInfo.exists()) {
+ // ensure new file is readable by anyone
+ tempFile.setPermissions(tempFile.permissions() | QFile::Permission::ReadGroup | QFile::Permission::ReadOther);
+ } else {
+ // ensure the same file permissions
+ tempFile.setPermissions(targetFileInfo.permissions());
++
+ // ensure file has the same owner and group as before
+- setOwner(tempFileDescriptor, ownerId, groupId);
++ setOwner(tempFile.handle(), ownerId, groupId);
+ }
+
+- // rename temporary file to the target file
+- if (moveFile(tempFileName, targetFileName)) {
++ /**
++ * try to (atomic) rename temporary file to the target file
++ */
++ if (moveFile(tempFile.fileName(), targetFileInfo.filePath())) {
+ // temporary file was renamed, there is nothing to remove anymore
+ tempFile.setAutoRemove(false);
+ return true;
+ }
++
++ /**
++ * we failed
++ * QTemporaryFile will handle cleanup
++ */
+ return false;
+ }
+
+@@ -141,28 +152,10 @@ bool SecureTextBuffer::moveFile(const QString &sourceFile, const QString &target
+ {
+ #if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID)
+ const int result = std::rename(QFile::encodeName(sourceFile).constData(), QFile::encodeName(targetFile).constData());
+- if (result == 0) {
+- syncToDisk(QFile(targetFile).handle());
+- return true;
+- }
+- return false;
++ return (result == 0);
+ #else
+ // use racy fallback for windows
+ QFile::remove(targetFile);
+ return QFile::rename(sourceFile, targetFile);
+ #endif
+ }
+-
+-void SecureTextBuffer::syncToDisk(const int fd)
+-{
+-#ifndef Q_OS_WIN
+-#if HAVE_FDATASYNC
+- fdatasync(fd);
+-#else
+- fsync(fd);
+-#endif
+-#else
+- // no-op for windows
+-#endif
+-}
+-
+diff --git a/src/buffer/katesecuretextbuffer_p.h b/src/buffer/katesecuretextbuffer_p.h
+index a38285b..e00721c 100644
+--- a/src/buffer/katesecuretextbuffer_p.h
++++ b/src/buffer/katesecuretextbuffer_p.h
+@@ -56,8 +56,6 @@ public:
+ static const QCryptographicHash::Algorithm checksumAlgorithm = QCryptographicHash::Algorithm::Sha512;
+
+ private:
+- static const qint64 bufferLength = 4096;
+-
+ /**
+ * Saves file contents using sets permissions.
+ */
+@@ -66,8 +64,6 @@ private:
+
+ static bool moveFile(const QString &sourceFile, const QString &targetFile);
+
+- static void syncToDisk(const int fd);
+-
+ public Q_SLOTS:
+ /**
+ * KAuth action to perform both prepare or move work based on given parameters.
+--
+cgit v0.11.2
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
new file mode 100644
index 00000000000..6920f6f7c32
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.46.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 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}-CVE-2018-10361.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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2019-11-01 19:39 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2019-11-01 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 30c5f7e692e0bd2022e60263cb0b878f375ed5dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 1 19:37:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 1 19:39:05 2019 +0000
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 <asturm <AT> 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 00000000000..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 <cullmann@kde.org>
+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, &QAbstractItemView::activated, [this, lblDescription, lblCurrentValue](const QModelIndex &index) {
+ if (index.isValid()) {
+ const auto &var = 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 00000000000..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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2021-04-04 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: d848b9364fc50423708e15e081042702399c1bb8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 12:59:30 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:19:41 2021 +0000
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 <asturm <AT> 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 00000000000..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 <jpmbatrina01@gmail.com>
+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 00000000000..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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2022-01-20 13:26 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-01-20 13:26 UTC (permalink / raw
To: gentoo-commits
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@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-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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2022-01-20 13:26 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-01-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: 3a021a3cf32b7e37971959da38b381d8304ab951
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 11:45:18 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 13:24:18 2022 +0000
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 <asturm <AT> 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 000000000000..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 <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/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() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2022-04-09 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-04-09 16:07 UTC (permalink / raw
To: gentoo-commits
commit: 04a3f091de5fc81e28e024ebe732081e6598fcea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 9 15:37:28 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 9 16:03:04 2022 +0000
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 <asturm <AT> gentoo.org>
...xteditor-5.92.0-fix-crash-w-stale-indexes.patch | 29 ++++++
| 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 000000000000..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 <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
+
--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 000000000000..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 <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
new file mode 100644
index 000000000000..a09c6631374b
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild
@@ -0,0 +1,60 @@
+# 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2022-08-07 20:58 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2022-08-07 20:58 UTC (permalink / raw
To: gentoo-commits
commit: b93320426242a4e1c4a6d7d623c4fda0bb944e93
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 6 12:26:16 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 7 20:38:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9332042
kde-frameworks/ktexteditor: Drop unused dependency
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 000000000000..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 <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
new file mode 100644
index 000000000000..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
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/
@ 2025-01-27 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 9+ messages in thread
From: Andreas Sturmlechner @ 2025-01-27 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 0a7e4ee19b7e1491800b820825ca79bf1b7ada75
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 18:16:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 18:42:33 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a7e4ee1
kde-frameworks/ktexteditor: drop 6.7.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-frameworks/ktexteditor/Manifest | 1 -
.../files/ktexteditor-6.7.0-fix-segfault.patch | 70 ----------------------
.../ktexteditor/ktexteditor-6.7.0-r1.ebuild | 54 -----------------
3 files changed, 125 deletions(-)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 826d2ca722c7..6fa8bc825ae3 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,4 +1,3 @@
DIST ktexteditor-5.116.0.tar.xz 2791176 BLAKE2B 7fb32bb7d18ccf43e33f66b0401fc086597145e3838e84a4333f99b3725e64c82ea5f78daf5fc58dfb13ea0452e85a64d1d03a503b363bba8247e26c922fd396 SHA512 9d17558e4f7adc5de1dec0af9ba32b2eb086def576dd32d3458b91d9f0424aa86505a57ab092a71f5274197bfd18927b7ccddf221551cd42d2a96f22394495e0
DIST ktexteditor-6.10.0.tar.xz 2927232 BLAKE2B ca85b14863e9467bc17d31f79dbb10e1e21af63fc680c5a8fb0e698c4d65f26d0f46442b5752d07e837b14579dd600e271e41ed40e82678b37324934afb0699d SHA512 3c2d03ac4993931c3230addeeb650d21950231e4b40b4daed4e81d90ad87fef8d551fc88ab247182097de5ddd05f7c8eab1ea6f9928410671fd06012e372c221
-DIST ktexteditor-6.7.0.tar.xz 2880020 BLAKE2B 96f73b03b7510530a7a1caa4c276ffc9e99ea544d4754a4adb2e09f372d8835a0fafe31c550d902484c4710e2bd87b6c2ba4a7b72634d1984386e51af951c742 SHA512 cfa51dc60d20cdbdf1b88c92c14a12bbb71aa7302376f4670fc940c4c6927dd74836bb66b47c0ac23018af9e5f445f551bf7b9f1623b785b46b7bfe2c496fec1
DIST ktexteditor-6.9.0.tar.xz 2896588 BLAKE2B 9a5002f7fd5bc02c2c9859e177ec14f634d79462beef4c37dc58d75151441b7d050c89744f9c12f58cc51b8cbdc3e8d4796936f6aa5140024ba9bb4d5e83e12c SHA512 95608360a71e5647428fa6617f4be96b31886171a4586242be1fcaf23258318e4a38105d1f0c5b2be11bf722239fc2d4ce908378c551561868a42721958adc47
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
deleted file mode 100644
index 9ae8ebff41b0..000000000000
--- a/kde-frameworks/ktexteditor/files/ktexteditor-6.7.0-fix-segfault.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index 4fd6925c6bb8..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-6.7.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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] 9+ messages in thread
end of thread, other threads:[~2025-01-27 18:43 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-07 20:58 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/ktexteditor/files/, kde-frameworks/ktexteditor/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-01-27 18:43 Andreas Sturmlechner
2022-04-09 16:07 Andreas Sturmlechner
2022-01-20 13:26 Andreas Sturmlechner
2022-01-20 13:26 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2019-11-01 19:39 Andreas Sturmlechner
2018-06-09 7:18 Andreas Sturmlechner
2016-09-29 11:39 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox