From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- kde-frameworks/ktexteditor/Manifest | 6 +- .../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 +++++++++ .../ktexteditor/ktexteditor-5.90.0.ebuild | 55 -------- 7 files changed, 389 insertions(+), 56 deletions(-) create mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch create mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch create mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch create mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch create mode 100644 kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild delete mode 100644 kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild (limited to 'kde-frameworks/ktexteditor') diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest index a645b116827d..40345d7e9aad 100644 --- a/kde-frameworks/ktexteditor/Manifest +++ b/kde-frameworks/ktexteditor/Manifest @@ -1,6 +1,10 @@ AUX ktexteditor-5.88.0-revert-invoke-always.patch 1534 BLAKE2B 836612b2e41a73a7099e4bb775427854901b999f471d02eb2f19ca1e516eaa6f5f35799cd9d038a1a2ac8f7b9e7d6160cd4d42776d471fe49291d2c761ca320f SHA512 41d99f771817daceff02a9589c78d4af6987e819437bbd923ccc8108baf89f40e5fdfc0512bba0a816a778710e41626391ea53087a162f591baef8715e689a84 +AUX ktexteditor-5.90.0-CVE-2022-23853-1.patch 4837 BLAKE2B e5e33538c06f2a8b6e1aa319357f17889ecf58273d6c64c2eca146c9d6dc85d635a0d45177c55cf33f726ed32b3a4ea831277e74d84ac3dab1f23582e991e4cd SHA512 58c0074049e9218cf03d8adfbb60fe57c3d331e1d10c53c289f1288ba078185aff9bcbdb0946d421e01378642b40474649bb589b79b098f3c6929ba92b418ca0 +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 DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b DIST ktexteditor-5.90.0.tar.xz 2340540 BLAKE2B eceb56847e43c7d8e8883bc219228ec365bf85cb5279ef255f59d3005a5e1fb6cbc55309b9791b5cdc088201283a08f5b0ab9c0fd840604c349442e60bfa4a0f SHA512 7c63802a4d904d2e5eff6e3c957e9a94848993898bdd37eb033842d4033985820348d81080a3701db19aef1a5762ebdc8a4a4749c931d79f00c986837faa5837 EBUILD ktexteditor-5.88.0-r1.ebuild 1671 BLAKE2B 2761849095b4c0f1111a712e1e80a5303c29193699a21b2521faaa139131976048659e08a5e41ceb562b9c95d7b4994496940898c874efc61c81aec81752c722 SHA512 9189838fe20bae11fa9a3687fd8ce4bf80fa0c17fcca9bd4a8b1038ccf2e7a8fb5f37b9695886cb9d53fd211f3d096ea72a6a5140c7fa16915af9af46e636561 -EBUILD ktexteditor-5.90.0.ebuild 1521 BLAKE2B 5369b952a0611ed8e1bae5a7425a182988241595eeef627f476a39a742f939c0a410ec0e6d892b7bd2826a2847eb2435be0e1c6b067b5e36a191ec2e5c5fd801 SHA512 b20a89b54095ee48027493bd13dc64f778763f0e847b5bf2ce51aa738bfe7c05360445385287dd12ca67a58b886a8f4ed4d7c6ce757982e28c4a914458495f4e +EBUILD ktexteditor-5.90.0-r2.ebuild 1689 BLAKE2B 626f42fb2562f3151e16ca507ec57a3c9e4509ffd55fdb0a295865f20b46e6d21440cadc01a1d2bf460954010a0929364dbb93aaa7b9006b171270c51b29414a SHA512 7fb419ec40b1fb5adc43518dda100ddb5102892e071cbb48f5afa9afbb89de4cc629f978fe78e448ea3bf10ca08fcfbba01a74752895a1ba15a4e2a3d44303aa MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a 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 +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 + #include + #include ++#include + #include + #include + #include +@@ -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 + + #include ++#include + #include + + // 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 +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 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 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 +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 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 +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 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 +} diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild deleted file mode 100644 index 76c58654bcfd..000000000000 --- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild +++ /dev/null @@ -1,55 +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 )" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package editorconfig EditorConfig) - ) - - ecm_src_configure -} -- cgit v1.2.3