diff options
Diffstat (limited to 'kde-apps/konsole')
-rw-r--r-- | kde-apps/konsole/Manifest | 4 | ||||
-rw-r--r-- | kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch | 32 | ||||
-rw-r--r-- | kde-apps/konsole/konsole-21.04.3-r4.ebuild | 81 | ||||
-rw-r--r-- | kde-apps/konsole/konsole-21.08.1-r1.ebuild (renamed from kde-apps/konsole/konsole-21.08.1.ebuild) | 6 |
4 files changed, 121 insertions, 2 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 47d81c19873e..4c938e176a57 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,9 +1,11 @@ +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.1.tar.xz 1374720 BLAKE2B b686def9a04b92b7de71d47fa16f0c1172baf6304dff6b0fcb3ebb11276190b1294ee77bc4245494f874bf39e33f39b5f791d96b8ea6150987ef1fb373b10f47 SHA512 ebac48f71bde793e39fc2f3c0dc39f8fc24e6f9ba8447988ee793ef33154bcbc7f97dfe863b708acc85c472e424c4190625fc8139417f4a98520c4c9a903903d EBUILD konsole-21.04.3-r3.ebuild 2043 BLAKE2B 678772cfa9534224af8933a8f00e215f05e7c24677ee4df2f747e77289b25a8f10710ace4904b8fc14b39a2ac383c3939b91dd3a8c62b8464e3d4c69122b5284 SHA512 fc01e7d0efbf1256c679101339f364ca3dcbc7db98f4d60bf41ae6a693367613a9570b677da7354dbbb208c3cb9af66f5e36c4422f25681a244fe9d36fc1e814 +EBUILD konsole-21.04.3-r4.ebuild 2123 BLAKE2B 3729dd83460e0e05f9640084b677f1d27c07e4f95b835fe5424545aa3eca1df38d673e227d7809a684af7e6e4442ded598711a88b433dc67164049c51741bdd6 SHA512 83d96897a10dd5907fa981e2dfc86f638cbd2acddff5b356574ea98463486e801674175b4832c9e7a6100dce5c6f494d08d1257e0ae742267159291687a348af EBUILD konsole-21.04.3.ebuild 1796 BLAKE2B e7db09011bb97c8aab943455427555f3c6058969f80ff517c8e8176a53660e6a30e6a7820a32497715d304c5c5f3c18d26460522c778f57fd653144ef1ed5141 SHA512 c06b7598f239d43263bf5dcc5741bb9c0c2eff6b741b44fa925097fb63bd21496950c87d7035b71fe1c4932cca3fe252f02f7bff5c060e26cc33903b617d7991 -EBUILD konsole-21.08.1.ebuild 1693 BLAKE2B 6b601b18eb9e4100732886a54ae34a3a87efc548e861e0b8e65fd262228ffbb900a15c6a782d23960d5475774bec0ca02c090274c358f83796c4579f4e6e2843 SHA512 289aa49b2c9f16b6c878755cd4c2cc3b835cd2e1db7c8eaf53f9ba0cfd2805593e8574be683856e12bbaf608ff8b16a625ab978b7c1225aa9bffb016d949eee6 +EBUILD konsole-21.08.1-r1.ebuild 1800 BLAKE2B b377c0b18a1118c473cba3927a0b601d932b31f8176f56284ae9f8def5a160224098a33976b3e6a767ba98f282011289868764c5e4cfc410161a07994478b461 SHA512 065684dda647050f87d7207791676f9f5dbefa61d3eba3a286277635835e7f164c3f80fc0bd430b4c9e6c983e02cfbdf7f7a6fc3f98f74a39ac015eb8136ddf8 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 new file mode 100644 index 000000000000..0eeaef378990 --- /dev/null +++ b/kde-apps/konsole/files/konsole-21.04.3-default-navigation-be-TabbedNavigation.patch @@ -0,0 +1,32 @@ +From e693f2d7f1977ca227589154a5cd8c18d8ce44b7 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <a.samirh78@gmail.com> +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<TerminalDisplay *, Session *>()), + _actionCollection(collection), +- _navigationMethod(NoNavigation), ++ _navigationMethod(TabbedNavigation), + _navigationVisibility(NavigationNotSet), + _managerId(0), + _terminalDisplayHistoryIndex(-1) +-- +GitLab + diff --git a/kde-apps/konsole/konsole-21.04.3-r4.ebuild b/kde-apps/konsole/konsole-21.04.3-r4.ebuild new file mode 100644 index 000000000000..c44e2eb15d3b --- /dev/null +++ b/kde-apps/konsole/konsole-21.04.3-r4.ebuild @@ -0,0 +1,81 @@ +# 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.08.1.ebuild b/kde-apps/konsole/konsole-21.08.1-r1.ebuild index 88085c295f8b..57a1100aff15 100644 --- a/kde-apps/konsole/konsole-21.08.1.ebuild +++ b/kde-apps/konsole/konsole-21.08.1-r1.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 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="X" DEPEND=" @@ -50,6 +50,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-21.04.3-default-navigation-be-TabbedNavigation.patch" # bug 807933 +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package X X11) |