From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- kde-frameworks/ktexteditor/Manifest | 8 +- .../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.92.0-r1.ebuild | 2 +- 7 files changed, 2 insertions(+), 392 deletions(-) delete mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch delete mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch delete mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch delete mode 100644 kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch delete mode 100644 kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild (limited to 'kde-frameworks/ktexteditor') diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest index eff168aeeda0..d33ad4c26ad1 100644 --- a/kde-frameworks/ktexteditor/Manifest +++ b/kde-frameworks/ktexteditor/Manifest @@ -1,13 +1,7 @@ -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 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-r1.ebuild 1665 BLAKE2B a62e3fa840815bb756539e76766f19e0e9560dfb422caa4aaa7ad3e19d0fac7d8cc04e66378e556e91d84c92ebecb584506f62c9592e2ddace205a57deb0f84c SHA512 1d92414f4f41dcb3fe1bf33f369bcd132e4fffeeebd40df1bebbdfb9d1500c12489850a7abf675e1e5a839b7743b33e5e10c9d7d51607ad6c2aead17a2f40acb +EBUILD ktexteditor-5.92.0-r1.ebuild 1662 BLAKE2B b0cf93eabd029c5831da8dfbc1c1dfd042687c05473a42417279665cabfb121ff80614b5e0066698185d2ea09e65a9d3757e475935052f9c9378f9b6aba15e2d SHA512 f19e21b3b1e2116ee64143eb2a79ba79670ea449cc152ddb964b0ded9abfa4184ea099440ad53aa54c2df3624567e1c8d270a8970dcab5a3eccfc00136e7c108 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.90.0-CVE-2022-23853-1.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch deleted file mode 100644 index 854cf0da4b2e..000000000000 --- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -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 deleted file mode 100644 index 8cccfe3a95b0..000000000000 --- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch +++ /dev/null @@ -1,55 +0,0 @@ -From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -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 deleted file mode 100644 index 05cfbd107cd9..000000000000 --- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 863f606b1fcf3b91b256d9167a00539289246188 Mon Sep 17 00:00:00 2001 -From: Waqar Ahmed -Date: Tue, 11 Jan 2022 20:03:12 +0500 -Subject: [PATCH] Find: Update working range when replacing - -BUG: 447972 ---- - src/search/katesearchbar.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/search/katesearchbar.cpp b/src/search/katesearchbar.cpp -index ed52c4cb..c1c85bd4 100644 ---- a/src/search/katesearchbar.cpp -+++ b/src/search/katesearchbar.cpp -@@ -843,6 +843,8 @@ void KateSearchBar::findOrReplaceAll() - - // Replace - lastRange = match.replace(m_replacement, false, ++m_matchCounter); -+ // update working range as text must have changed now -+ workingRangeCopy = m_workingRange->toRange(); - } else { - lastRange = match.range(); - ++m_matchCounter; --- -GitLab - diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch deleted file mode 100644 index 140bc0cf7111..000000000000 --- a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 3b31919427baf3da1ab1a24f682a4cefc7e5106f Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann -Date: Sun, 16 Jan 2022 18:29:57 +0100 -Subject: [PATCH] Revert "Do not cancel mouse selection when using the - keyboard" - -This reverts commit 5dce70a9693f8cce37f733b4687bb9b303376742. - -=> this leads to regressions - -if somebody has time to properly reproduce and fix that, we can reapply -this, otherwise it is better to have some always working state without -this small usability improvement - -BUG: 447525 -BUG: 446189 - -frameworks/ktexteditor#11 ---- - src/view/kateview.cpp | 20 ++++++++++---------- - src/view/kateviewinternal.cpp | 5 ----- - src/view/kateviewinternal.h | 2 -- - 3 files changed, 10 insertions(+), 17 deletions(-) - -diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp -index 6b88eb75..56348480 100644 ---- a/src/view/kateview.cpp -+++ b/src/view/kateview.cpp -@@ -3063,9 +3063,9 @@ void KTextEditor::ViewPrivate::shiftCursorRight() - void KTextEditor::ViewPrivate::wordLeft() - { - if (currentTextLine().isRightToLeft()) { -- m_viewInternal->wordNext(m_viewInternal->isUserSelecting()); -+ m_viewInternal->wordNext(); - } else { -- m_viewInternal->wordPrev(m_viewInternal->isUserSelecting()); -+ m_viewInternal->wordPrev(); - } - } - -@@ -3081,9 +3081,9 @@ void KTextEditor::ViewPrivate::shiftWordLeft() - void KTextEditor::ViewPrivate::wordRight() - { - if (currentTextLine().isRightToLeft()) { -- m_viewInternal->wordPrev(m_viewInternal->isUserSelecting()); -+ m_viewInternal->wordPrev(); - } else { -- m_viewInternal->wordNext(m_viewInternal->isUserSelecting()); -+ m_viewInternal->wordNext(); - } - } - -@@ -3098,7 +3098,7 @@ void KTextEditor::ViewPrivate::shiftWordRight() - - void KTextEditor::ViewPrivate::home() - { -- m_viewInternal->home(m_viewInternal->isUserSelecting()); -+ m_viewInternal->home(); - } - - void KTextEditor::ViewPrivate::shiftHome() -@@ -3108,7 +3108,7 @@ void KTextEditor::ViewPrivate::shiftHome() - - void KTextEditor::ViewPrivate::end() - { -- m_viewInternal->end(m_viewInternal->isUserSelecting()); -+ m_viewInternal->end(); - } - - void KTextEditor::ViewPrivate::shiftEnd() -@@ -3118,7 +3118,7 @@ void KTextEditor::ViewPrivate::shiftEnd() - - void KTextEditor::ViewPrivate::up() - { -- m_viewInternal->cursorUp(m_viewInternal->isUserSelecting()); -+ m_viewInternal->cursorUp(); - } - - void KTextEditor::ViewPrivate::shiftUp() -@@ -3128,7 +3128,7 @@ void KTextEditor::ViewPrivate::shiftUp() - - void KTextEditor::ViewPrivate::down() - { -- m_viewInternal->cursorDown(m_viewInternal->isUserSelecting()); -+ m_viewInternal->cursorDown(); - } - - void KTextEditor::ViewPrivate::shiftDown() -@@ -3168,7 +3168,7 @@ void KTextEditor::ViewPrivate::shiftBottomOfView() - - void KTextEditor::ViewPrivate::pageUp() - { -- m_viewInternal->pageUp(m_viewInternal->isUserSelecting()); -+ m_viewInternal->pageUp(); - } - - void KTextEditor::ViewPrivate::shiftPageUp() -@@ -3178,7 +3178,7 @@ void KTextEditor::ViewPrivate::shiftPageUp() - - void KTextEditor::ViewPrivate::pageDown() - { -- m_viewInternal->pageDown(m_viewInternal->isUserSelecting()); -+ m_viewInternal->pageDown(); - } - - void KTextEditor::ViewPrivate::shiftPageDown() -diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp -index d642938a..c8d479d6 100644 ---- a/src/view/kateviewinternal.cpp -+++ b/src/view/kateviewinternal.cpp -@@ -4077,11 +4077,6 @@ void KateViewInternal::viewSelectionChanged() - m_selectionCached.setStart(KTextEditor::Cursor::invalid()); - } - --bool KateViewInternal::isUserSelecting() const --{ -- return m_selChangedByUser; --} -- - KateLayoutCache *KateViewInternal::cache() const - { - return m_layoutCache; -diff --git a/src/view/kateviewinternal.h b/src/view/kateviewinternal.h -index 66b137b6..8639dcef 100644 ---- a/src/view/kateviewinternal.h -+++ b/src/view/kateviewinternal.h -@@ -228,8 +228,6 @@ public: - return m_leftBorder; - } - -- bool isUserSelecting() const; -- - // EVENT HANDLING STUFF - IMPORTANT - private: - void fixDropEvent(QDropEvent *event); --- -GitLab - diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild deleted file mode 100644 index 3c7a77ac1c3a..000000000000 --- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework providing a full text editor component" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="+editorconfig" - -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kguiaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kio-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/kparts-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/sonnet-${PVCUT}*:5 - =kde-frameworks/syntax-highlighting-${PVCUT}*:5 - editorconfig? ( app-text/editorconfig-core-c ) -" -RDEPEND="${DEPEND}" -BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )" - -PATCHES=( - "${FILESDIR}"/${P}-revert-5dce70a9.patch # KDE-bugs 446189, 447525 - "${FILESDIR}"/${P}-KDEBUG-447972.patch - "${FILESDIR}"/${P}-CVE-2022-23853-{1,2}.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package editorconfig EditorConfig) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild index a09c6631374b..6671981ff5f7 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-5.92.0-r1.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org DESCRIPTION="Framework providing a full text editor component" LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" IUSE="+editorconfig" RESTRICT="test" -- cgit v1.2.3