gentoo resync : 16.04.2022

5 files changed, 206 insertions, 1 deletions

diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 2b3d5fc7a9a8..eff168aeeda0 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -2,8 +2,12 @@ AUX ktexteditor-5.90.0-CVE-2022-23853-1.patch 4837 BLAKE2B e5e33538c06f2a8b6e1aa
 AUX ktexteditor-5.90.0-CVE-2022-23853-2.patch 2513 BLAKE2B de206fc9fb6e9996b544d74b86614849fb75b44420fedef86a81f325f5137a4adffbb34eebec21f275945ee94835b5bed4921179c4ca515c781ba6b1cfa2d5fe SHA512 9186b4ce88dc4eec04cf4367e04c089c72edc26074dcbea7c7c8755b29ffbb6c33c98c22ad16d763b04320caa0a60eca900e050b98fb3c9cca41517d9a42765d
 AUX ktexteditor-5.90.0-KDEBUG-447972.patch 891 BLAKE2B 460bcc4e9469a0ab8712e0ee7b1dc3b8e4e6b042a595014f7e24ce950455c1adda1463ca8fabedd20e255eb59a663d0cda0f84af65993b80ab58e47ef0a8531a SHA512 81cbfdc26b3e04380f6a2ffe7821a7ce7177df05773af5973c1eab84a42076ed027e911ec3552029a9450564cf35a2850b8c4f2708b1bff68995e9cf87353886
 AUX ktexteditor-5.90.0-revert-5dce70a9.patch 4113 BLAKE2B 7f92be945f002118463b1144116f88ff20fb2ab2d7d3ba51e7db41280900bea435e26b6c99854d040b026994f037996ac407afbcf826bc0f5eaff6135f1bcfcc SHA512 8118a66e4824a90db477f6dd1b7f31f7237b840c270f3464c975f11df4f051b8e9c4f35cb1cefa53ed61164f3eade67491bc32052c658d2e86eae426aab0bd4f
+AUX ktexteditor-5.92.0-fix-crash-w-stale-indexes.patch 1094 BLAKE2B 803b7094d6dd25034e1d5d9ab7d33d06fd1527700f8ae49b57e7d345ff93acea37cda10e4cc3f5bae936fbd66ef44d7e6109912f04ff76b9ee7594cb94889706 SHA512 df3401f4f415a24038b8394e7053dd260e0dd6ea9b2accf857daedb95bf34f5a48e96795cd90488f51db09bc865590fca9e0f8fbe5b81eba2acaf9df521e20f3
+AUX ktexteditor-5.92.0-fix-toggle-comment.patch 4843 BLAKE2B 7723bd5bc04bcc97779c04b34fa2403bbd0084fa26e2f92d83719216e36b4162660153eabda30bb1616240fc164dfef27118ece97633096ff1d711037dcbe3ee SHA512 170277709bc93ab650085f7bed3930cb391a5926da31cd030a0eb0565d645a7a028db93a12ed09ae88119730bfb5364f282b41a82557616878d04a8c0259986e
 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
 EBUILD ktexteditor-5.90.0-r2.ebuild 1686 BLAKE2B d25227a128b59ceadf91d08127e6fa4668189be1869f2c82b741c4a50cc4949951cc4cdc4579b652de63a63521de7e51f68cee886057deb9c59ad2e0c97c899d SHA512 f39f4a84c7d60339746b9817e1619d6041c0cc23817bffa86861a5fcf4112d4bf9ebc25e6ace7818c9e4a5399d765a2817f7b496306b47905107afdfe1d5a12b
-EBUILD ktexteditor-5.92.0.ebuild 1521 BLAKE2B 5369b952a0611ed8e1bae5a7425a182988241595eeef627f476a39a742f939c0a410ec0e6d892b7bd2826a2847eb2435be0e1c6b067b5e36a191ec2e5c5fd801 SHA512 b20a89b54095ee48027493bd13dc64f778763f0e847b5bf2ce51aa738bfe7c05360445385287dd12ca67a58b886a8f4ed4d7c6ce757982e28c4a914458495f4e
+EBUILD ktexteditor-5.92.0-r1.ebuild 1665 BLAKE2B a62e3fa840815bb756539e76766f19e0e9560dfb422caa4aaa7ad3e19d0fac7d8cc04e66378e556e91d84c92ebecb584506f62c9592e2ddace205a57deb0f84c SHA512 1d92414f4f41dcb3fe1bf33f369bcd132e4fffeeebd40df1bebbdfb9d1500c12489850a7abf675e1e5a839b7743b33e5e10c9d7d51607ad6c2aead17a2f40acb
+EBUILD ktexteditor-5.93.0.ebuild 1521 BLAKE2B 5369b952a0611ed8e1bae5a7425a182988241595eeef627f476a39a742f939c0a410ec0e6d892b7bd2826a2847eb2435be0e1c6b067b5e36a191ec2e5c5fd801 SHA512 b20a89b54095ee48027493bd13dc64f778763f0e847b5bf2ce51aa738bfe7c05360445385287dd12ca67a58b886a8f4ed4d7c6ce757982e28c4a914458495f4e
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
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
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.92.0-fix-toggle-comment.patch
new file mode 100644
index 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
+}
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.92.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.93.0.ebuild
index 76c58654bcfd..76c58654bcfd 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.92.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.93.0.ebuild