From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- kde-apps/konsole/Manifest | 11 +-- ....3-default-navigation-be-TabbedNavigation.patch | 32 --------- ...ole-21.04.3-dont-close-window-while-split.patch | 76 -------------------- ...ionFinished-only-in-TabbedNavigation-mode.patch | 53 -------------- ...konsole-21.04.3-no-flash-on-session-close.patch | 81 ---------------------- kde-apps/konsole/konsole-21.04.3-r4.ebuild | 81 ---------------------- kde-apps/konsole/konsole-21.04.3.ebuild | 74 -------------------- kde-apps/konsole/konsole-21.08.3.ebuild | 2 +- kde-apps/konsole/konsole-21.11.90.ebuild | 68 ++++++++++++++++++ 9 files changed, 72 insertions(+), 406 deletions(-) delete mode 100644 kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch delete mode 100644 kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch delete mode 100644 kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch delete mode 100644 kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch delete mode 100644 kde-apps/konsole/konsole-21.04.3-r4.ebuild delete mode 100644 kde-apps/konsole/konsole-21.04.3.ebuild create mode 100644 kde-apps/konsole/konsole-21.11.90.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 4bcab4df5a99..e9cbf60e5a90 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,10 +1,5 @@ -AUX konsole-21.04.3-default-navigation-be-TabbedNavigation.patch 1164 BLAKE2B 86135101dab8a96f2c621ca2f326fb3ec7a630fd446bf30ed63c13fa25835d72b68230c1f7a368e13f78a550f50d8ece45ff7303f65569c9eb170f798afdc2de SHA512 a0d0d5e02b2333add47e68e0540ab2c4fcaa2446883c1a740d1721fa22fb28afe97f74913a2af4c345edf20499eed4c72d253b9e59fd6984de3da99eca53c10d -AUX konsole-21.04.3-dont-close-window-while-split.patch 2592 BLAKE2B 22c438734d6e3959f965b54dd76fc683566ed17ef8d368984c5d54b9ec6f95612ab2c993f1266367933b2327e937164eb655d386dce9cd82178f229a136c5789 SHA512 641eb0010bd320868538ebb3254e5883b84e4e17d06bd0ddea961e49b00eb3f811c0a163fc50096ac4d194a53a22db5ad9d3b6c007a85a40299eab03f36ba394 -AUX konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch 1960 BLAKE2B 8c13a8f2e200c07d0cb036257aae342e3b1046e55a259d2161cd2af24f788e225f661bb27e917b90081998cd7e2d290ecb609366e11bd22b0a70ae267c862356 SHA512 ad6de009a9f2d0ce39fbe13e32d4b821c5f6a96840173e26cf89e9f3b03f0f9b09bc7891d2efa457532926a3aa0f721655d549ca75d93ab5a91fed05ce07d543 -AUX konsole-21.04.3-no-flash-on-session-close.patch 2711 BLAKE2B 0a50eb56a282be8189cb6c0c54abdab9d674fd2fa01842786af558671e2a51d752298ad084e285e1bef96a99ab28cdd5714f28cf9032238e8e172f497b9ee92f SHA512 577b3ebfc91543a3e4a5eebc9fed4db9414daab630b8e31c6530ea5d5de3b8944738527627ba7f47b9ca30fe4d428cd3d98beb7e73d7dd1097b09867256e774e -DIST konsole-21.04.3.tar.xz 1336960 BLAKE2B 2cbcdb3edaae0fec913d82dd0eb2ca80aca70e2b9d749ae1c22512946df8bf5e99aa8444996e41b7bc162727119c8f9216b28b5b15051dd0c6a89221fcbbd355 SHA512 490271a51304d5a64111f6ae74422a6b3143a5349359e55af0845c04a6e6d405fadd1f300dc4d866b7730c0cb852bebfddbb33b0ca9e68d22f264e379d1868e8 DIST konsole-21.08.3.tar.xz 1386972 BLAKE2B 37f29c8827e60c43eb7dcf7324d15a96e065259f32314fb5bce90429920242110aa26f4e88708b1e1fbd6dbbd9e87391241dee52b426eb63a41f62473235a4b8 SHA512 9a01678b609ca0a9f74327bb315957c2d395f80d4da14442ee0b58ba3eef54c5c4ac49b5c4d6a8ef5914502395e8d0b730472b93dea7eaa7b69cc526d2feb6c5 -EBUILD konsole-21.04.3-r4.ebuild 2121 BLAKE2B f80e85ff25f9af9427d11c4a4bbe897f26dd0c05255343f819150550ca92a9f74f78f67248479eee77b498a4443b6897657e3e5f554a01b5f3640eb7dd0adbc0 SHA512 37438811f7283834b7256de430e3b2e6c3a1ce59283ef512e586cd876869a8b482fb7e42cdc6b3ac2165b5308932fc0644ef0a637513132cae9248c8496b65de -EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991 -EBUILD konsole-21.08.3.ebuild 1700 BLAKE2B adfc8f43c6e020d42cb76d127136531acb8d3c0ba5ec97d957ccb7c9ebcab86077c13b0028e19b18c39b7650a4a089fb2ee40b0da0449f43bcd7b3ea6f3f6d29 SHA512 1156c87cc9634828795fd9b6fddf9e65b74183e54f0007f4bad11d666db374e457c82e973b2b3e279c665dfcf77f495d1c7ef2f7f98d11013f31d929ac47f240 +DIST konsole-21.11.90.tar.xz 1386432 BLAKE2B a6cdc6756d0dade915e87f6502be26ac4aa46413ebc4f7b3e0cc37c0e785bcf43723ad18c50611c25f6eff67e26b0a18e02315777d131f92a5026b31863071bd SHA512 a1e01e640bee399d6ce9d33255cd582b0827b8066b952adae5fea48746f737e7cab1205bc3a2628fd14d4fe3a4fc9495131f1c69eba8813a9b6b579a62dcbbaa +EBUILD konsole-21.08.3.ebuild 1697 BLAKE2B bddcf8c28a392df68384d69244e164a1392e1430bc99a2bcb59dd003c8743f34a319b4576a0568b53f615588b04ef1dbd1432dc723a133caeb98988c92d7e6c6 SHA512 e1e789d94daee358a367f59a3f6ca7e3b9afa21fd3e4b2cbd7c46420e979067ea4f857cfda4672c979951da409260b6b7051fa4bb4a7dbbab4b0d55554e3d75b +EBUILD konsole-21.11.90.ebuild 1700 BLAKE2B 5251b36024d381896076806c351edb255fd20627262864a221795ecdb7d85cbcfb13daead6f633433f7b4b349c60c6a3d46888db631e792435d5b9a0cf015723 SHA512 cf6ecdb7a896872b2b2342ffe3545b345f991f3cba3ccb551847e50eb35fbc66e6acf46c997d963d569bb63bca56b081657c1465904ab26c7b3f58bcb224d5ac MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch deleted file mode 100644 index 0eeaef378990..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Wed, 1 Sep 2021 11:38:29 +0200 -Subject: [PATCH] The default navigation method should be TabbedNavigation - -TabbedNavigation is when we have a MainWindow, i.e. the typical use case; -whereas NoNavigation is when using Konsole Part. The code in Part calls -setNavigationMethod(NoNavigation), so things should work as before. - -I made a wrong assumption that TabbedNavigation was already the default. - -CCBUG: 432077 ---- - src/ViewManager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 2ba77e9f0..3ffbe6ba0 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -52,7 +52,7 @@ ViewManager::ViewManager(QObject *parent, KActionCollection *collection) : - _pluggedController(nullptr), - _sessionMap(QHash()), - _actionCollection(collection), -- _navigationMethod(NoNavigation), -+ _navigationMethod(TabbedNavigation), - _navigationVisibility(NavigationNotSet), - _managerId(0), - _terminalDisplayHistoryIndex(-1) --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch b/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch deleted file mode 100644 index 20762b109574..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-dont-close-window-while-split.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 2591a9489a4d3a43c7a7f00764e9f84822d4946c Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Sun, 15 Aug 2021 15:51:33 +0200 -Subject: [PATCH] When closing a session, don't close the whole window if there - are splits - -When closing a session, we check if that is the last tab, and make the code -close the whole window, but we also need to make sure it's the last view, -i.e. no split views. - -CCBUG: 440976 -FIXED-IN: 21.08.1 -(cherry picked from commit 4a3cab03f5d853f4dd48531979fc3fb57dde5e2e) ---- - src/ViewManager.cpp | 6 +++--- - src/widgets/ViewContainer.cpp | 9 +++++++++ - src/widgets/ViewContainer.h | 6 ++++++ - 3 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 9c006e2bd..426040b78 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -494,9 +494,9 @@ void ViewManager::sessionFinished() - return; - } - -- // The last session/tab? emit empty() so that close() is called in -- // MainWindow, fixes #432077 -- if (_viewContainer->count() == 1) { -+ // The last session/tab, and only one view (no splits), emit empty() -+ // so that close() is called in MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { - Q_EMIT empty(); - return; - } -diff --git a/src/widgets/ViewContainer.cpp b/src/widgets/ViewContainer.cpp -index 2d7bfd13b..b25c00cdd 100644 ---- a/src/widgets/ViewContainer.cpp -+++ b/src/widgets/ViewContainer.cpp -@@ -145,6 +145,15 @@ ViewSplitter *TabbedViewContainer::viewSplitterAt(int index) - return qobject_cast(widget(index)); - } - -+int TabbedViewContainer::currentTabViewCount() -+{ -+ if (auto *splitter = activeViewSplitter()) { -+ return splitter->findChildren().count(); -+ } -+ -+ return 1; -+} -+ - void TabbedViewContainer::moveTabToWindow(int index, QWidget *window) - { - auto splitter = viewSplitterAt(index); -diff --git a/src/widgets/ViewContainer.h b/src/widgets/ViewContainer.h -index 3cbacf2cf..8e0a0986a 100644 ---- a/src/widgets/ViewContainer.h -+++ b/src/widgets/ViewContainer.h -@@ -135,6 +135,12 @@ public: - */ - ViewSplitter *viewSplitterAt(int index); - -+ /** -+ * Returns the number of split views (i.e. TerminalDisplay widgets) -+ * in this tab; if there are no split views, 1 is returned. -+ */ -+ int currentTabViewCount(); -+ - void connectTerminalDisplay(TerminalDisplay *display); - void disconnectTerminalDisplay(TerminalDisplay *display); - void moveTabLeft(); --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch b/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch deleted file mode 100644 index d02846ace5aa..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2684bc7fa5ac0b740b3e8661c3a0ae0136fde0a7 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Sun, 22 Aug 2021 20:02:52 +0200 -Subject: [PATCH] Only emit empty() in SessionFinished() when in - TabbedNavigation mode - -empty() is emitted so that MainWindow calls close() and we get rid of the -colours-flashing bug when closing the last session/tab in a window, see -commit bbec72250d080. However all that isn't relevant when we are in -konsole Part mode, where there are no tabs or MainWindows. - -This fixes a crash in Dolphin when closing its window while the embedded -Konsole Part is open. The crash would happen as calling -ViewContainer::currentTabViewCount() would end up in the ViewSplitter code -path, which is no-op in Konsole Part. - -To test: -- Open dolphin, make sure the terminal panel isn't open to begin with -- open the terminal panel -- close the dolphin window while the terminal panel is open - -BUG: 441206 -FIXED-IN: 21.08.1 ---- - src/ViewManager.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 92d2951fc..2ba77e9f0 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -494,11 +494,13 @@ void ViewManager::sessionFinished() - return; - } - -- // The last session/tab, and only one view (no splits), emit empty() -- // so that close() is called in MainWindow, fixes #432077 -- if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { -- Q_EMIT empty(); -- return; -+ if (_navigationMethod == TabbedNavigation) { -+ // The last session/tab, and only one view (no splits), emit empty() -+ // so that close() is called in MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1 && _viewContainer->currentTabViewCount() == 1) { -+ Q_EMIT empty(); -+ return; -+ } - } - - auto *session = qobject_cast(sender()); --- -GitLab - diff --git a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch b/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch deleted file mode 100644 index d8b14f2f1660..000000000000 --- a/kde-apps/konsole/files/konsole-21.04.3-no-flash-on-session-close.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 302c16791935cc3cf262aee355afce13d694b00f Mon Sep 17 00:00:00 2001 -From: Ahmad Samir -Date: Thu, 12 Aug 2021 13:58:20 +0200 -Subject: [PATCH] Prevent window "flashing" when closing the last session - -There are two scenarios when closing a window: -A) clicking the close button on the title bar (or Ctrl+Shift+Q): -~MainWindow() -~ViewManager() -~TabbedViewContainer() -~TerminalDisplay() -~Session() - -B) closing the last session/tab in a window: -SessionController::sessionFinished() -~Session() -~TerminalDisplay() -~TabbedViewContainer() -~MainWindow() -~ViewManager() - -the issue with the second case is that the TerminalDisplay is torn down -first, which exposes the TabbedViewContainer widget, the latter has the same -Qt::Window colour as the system colour scheme window background colour, if -you're using a dark terminal colour scheme and a light-coloured system colour -scheme, you could see some "flashing" when you close the last session with -e.g. Ctrl+D. - -To fix this, in sessionFinished() check if TabbedViewContainer::count() is -1 (i.e. closing last tab/session), and emit the empty() signal in that case, -which is connected to MainwWindow::close(), then the order of tear down -becomes: -SessionController::sessionFinished() -~Session() -~MainWindow() -~ViewManager() -~TabbedViewContainer() -~TerminalDisplay() - -BUG: 432077 -FIXED-IN: 21.12 -(cherry picked from commit bbec72250d080ce286a6762fb9beee4b6e7981c9) ---- - src/MainWindow.cpp | 2 +- - src/ViewManager.cpp | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp -index cc38b3990..0fae334de 100644 ---- a/src/MainWindow.cpp -+++ b/src/MainWindow.cpp -@@ -102,7 +102,7 @@ MainWindow::MainWindow() : - - // create view manager - _viewManager = new ViewManager(this, actionCollection()); -- connect(_viewManager, &Konsole::ViewManager::empty, this, &Konsole::MainWindow::close); -+ connect(_viewManager, &Konsole::ViewManager::empty, this, &QWidget::close); - connect(_viewManager, &Konsole::ViewManager::activeViewChanged, this, - &Konsole::MainWindow::activeViewChanged); - connect(_viewManager, &Konsole::ViewManager::unplugController, this, -diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp -index 751684dc8..4d33a4cf8 100644 ---- a/src/ViewManager.cpp -+++ b/src/ViewManager.cpp -@@ -461,6 +461,13 @@ void ViewManager::sessionFinished() - return; - } - -+ // The last session/tab? emit empty() so that close() is called in -+ // MainWindow, fixes #432077 -+ if (_viewContainer->count() == 1) { -+ Q_EMIT empty(); -+ return; -+ } -+ - auto *session = qobject_cast(sender()); - Q_ASSERT(session); - --- -GitLab - diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild deleted file mode 100644 index 0a2128895e36..000000000000 --- a/kde-apps/konsole/konsole-21.04.3-r4.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.80.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="X" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-no-flash-on-session-close.patch" # bug 807933 - "${FILESDIR}/${P}-dont-close-window-while-split.patch" # bug 808510 - "${FILESDIR}/${P}-emit-empty-in-SessionFinished-only-in-TabbedNavigation-mode.patch" # bug 810598 - "${FILESDIR}/${P}-default-navigation-be-TabbedNavigation.patch" # bug 807933 -) - -src_prepare() { - ecm_src_prepare - ecm_punt_bogus_dep KF5 Completion -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} - -src_test() { - # drkonqi process interferes. bug 702690 - local myctestargs=( - -E "(DBusTest)" - ) - - ecm_src_test -} diff --git a/kde-apps/konsole/konsole-21.04.3.ebuild b/kde-apps/konsole/konsole-21.04.3.ebuild deleted file mode 100644 index ba5b2d4855ba..000000000000 --- a/kde-apps/konsole/konsole-21.04.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=5.80.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE's terminal emulator" -HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="X" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - X? ( x11-libs/libX11 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - ecm_src_prepare - ecm_punt_bogus_dep KF5 Completion -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} - -src_test() { - # drkonqi process interferes. bug 702690 - local myctestargs=( - -E "(DBusTest)" - ) - - ecm_src_test -} diff --git a/kde-apps/konsole/konsole-21.08.3.ebuild b/kde-apps/konsole/konsole-21.08.3.ebuild index 85e60971ebfe..aacfe2b35b4a 100644 --- a/kde-apps/konsole/konsole-21.08.3.ebuild +++ b/kde-apps/konsole/konsole-21.08.3.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="X" DEPEND=" diff --git a/kde-apps/konsole/konsole-21.11.90.ebuild b/kde-apps/konsole/konsole-21.11.90.ebuild new file mode 100644 index 000000000000..817d083cfb91 --- /dev/null +++ b/kde-apps/konsole/konsole-21.11.90.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.88.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://apps.kde.org/konsole/ https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="X" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kpty-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + X? ( x11-libs/libX11 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +src_test() { + # drkonqi process interferes. bug 702690 + local myctestargs=( + -E "(DBusTest)" + ) + + ecm_src_test +} -- cgit v1.2.3