From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- kde-apps/konsole/Manifest | 4 + .../files/konsole-19.12.3-kf5bookmarks-5.69.patch | 117 +++++++++++++++++++++ kde-apps/konsole/konsole-19.12.3-r1.ebuild | 69 ++++++++++++ kde-apps/konsole/konsole-20.04.0.ebuild | 62 +++++++++++ 4 files changed, 252 insertions(+) create mode 100644 kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch create mode 100644 kde-apps/konsole/konsole-19.12.3-r1.ebuild create mode 100644 kde-apps/konsole/konsole-20.04.0.ebuild (limited to 'kde-apps/konsole') diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 3826e06bf933..afa335f9e421 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,5 +1,9 @@ AUX konsole-19.12.2-darkbackground-detect.patch 823 BLAKE2B 8b28b3823c2b42b9cc511c7535efc539ad869216374fb89c7a8ee17df460fbcae5fc0ca556d63cb2c39a248947aca2fcb6c49100c53985c0af032ad8a20f606a SHA512 e2a91949ff80579a50c3e16d83d493f42258cf889e443dde464f23f158428157a9b049d7bf684acf5914436dcef12b664516d8d9fd76ccf2f66d138dc0aec3dc +AUX konsole-19.12.3-kf5bookmarks-5.69.patch 4409 BLAKE2B a10546cf5708b4e47d237075446db413b714c4a07a6a2d3dd1a7f9e8a22b5e433db06521c3f3ce1d465ccf0a336c199bd3d10ecafe92f5324865f61bd4baa2cb SHA512 2188f1a982ff4395221003b15aec37293e5b18f2c588b3138838770f8795d7b2ea73f40a00ae5793cb1de1f1518b7887d56c5037f50442f77ae4bb8540a13679 AUX konsole-19.12.3-no-ccache.patch 1784 BLAKE2B 39b0a9e6406a614dd49434ab0f872f9956d2f3f54e3a9fb1693f2db6aefa779ad83d8cacea0503ed3459edcfec230588f14e747fb973678c41518630f9d0ca4c SHA512 83c99ca0c6b3b3562691c5d77746c85f3ef6a736cfa573420c716cefe806138dde5737e94132488e8b2d9938f7b5052ed63ace674cef82a8a668548033b60ec7 DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289 +DIST konsole-20.04.0.tar.xz 1165700 BLAKE2B a9bc9d914da8e780fca19787723e8e97d3875908dea132a982fb6a07902af8e6733cde50d4b3d0c76c5be9837cc0e68d4fcc8672f0189e16209bd7a6c29576a7 SHA512 eb260752cf62c418349a8a2ee91e5a9a8f0450190f6d8ffe3c6ac4d7131e858e84f0f520c447588f60143564eaac9b5f340d90562fe507ec27846a82d0bc73f4 +EBUILD konsole-19.12.3-r1.ebuild 1900 BLAKE2B 5b824c82204d3daf16c82a8b97a61a690566a72f209c81ff6fb0d7f0be1d5233dcca32319f27aa28d973268debafcf2446b1dd4274e7632de8cf61a930444592 SHA512 35f7907c04db82a73eacc94b384cadd09b3c0ce3fac38e9119330189e4ebb559ff26dca41d23f0ad40e988c53c971498df8c25a711ab629cc954a0427f3b77db EBUILD konsole-19.12.3.ebuild 1779 BLAKE2B 9ec486214a5937bfdaaf10fa071f2a6912e95c3e153ea41fd2cccc60e289dcc31ddb6f6108b8c3451a1b0d95539f058121fb2fc11e8358077f3c45c6e0aeecbe SHA512 a37d4007bd1ceed603fec0f10c3f90994a873844101bf472008dc893812c5a4d48563d1ac8a6494ddcbccfdc7237bd372d2cb6d437e1bb8eefc4724988ebcea8 +EBUILD konsole-20.04.0.ebuild 1664 BLAKE2B e69a84561d0e7bc86fa4dbc4100bd3c69e5f94e56ef3ac8636d258f8cf0b7a4f7860313606ac0a66e61ff1d6f957e7697931d8920ea2cc9033a6e681da1420b8 SHA512 9238b5e586b662e31e8ec8a62b3d7d712feed14d37e3cd6673ba4953772c1dd854e6e7bc057a393272962d865167c924afc1467f6a8d88c3a12e6c1af9b89005 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch new file mode 100644 index 000000000000..d70a50ea0551 --- /dev/null +++ b/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch @@ -0,0 +1,117 @@ +From e56c31a961b182663decd44bc57729576446315b Mon Sep 17 00:00:00 2001 +From: Ahmad Samir +Date: Mon, 13 Apr 2020 11:30:47 +0200 +Subject: [PATCH] [BookmarkMenu] Adapt the code to KBookmarks 5.69 changes + +Starting from KBookmarks 5.69 the ctor that took a KActionCollection +parameter has been deprecated, and we need to manually add the various +bookmark actions to the actionCollection so that they show up in the +shortcusts editor. + +Move the code that overrides the add bookmark shortcut, Ctrl+B, to the +BookmarkMenu class, so that all the relevant code is in one place. + +BUG: 419981 +(cherry picked from commit 6db7f8d2593ccb0238b2b547ed6eaf7da6a26c4c) +(cherry picked from commit dcf8cf3f2255293da170648f633873aa7c4afcf1) +--- + src/BookmarkMenu.cpp | 34 +++++++++++++++++++++++++++++----- + src/BookmarkMenu.h | 2 +- + src/MainWindow.cpp | 10 ---------- + 3 files changed, 30 insertions(+), 16 deletions(-) + +diff --git a/src/BookmarkMenu.cpp b/src/BookmarkMenu.cpp +index 77344ad1..5b83ece9 100644 +--- a/src/BookmarkMenu.cpp ++++ b/src/BookmarkMenu.cpp +@@ -21,24 +21,48 @@ + + // Own + #include "BookmarkMenu.h" ++#include "Shortcut_p.h" + + // KDE + #include ++#include ++#include ++#include + + // Qt + #include +-#include +-#include ++#include + + #include // std::any_of + +-BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collec) : +- KBookmarkMenu (mgr, owner, parentMenu, collec) ++BookmarkMenu::BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collection) : ++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0) ++ KBookmarkMenu (mgr, owner, parentMenu, collection) ++#else ++ KBookmarkMenu (mgr, owner, parentMenu) ++#endif + { ++ QAction *bookmarkAction; ++#if KBOOKMARKS_VERSION < QT_VERSION_CHECK(5, 69, 0) ++ bookmarkAction = collection->action(QStringLiteral("add_bookmark")); ++#else ++ collection->addActions(parentMenu->actions()); ++ ++ bookmarkAction = addBookmarkAction(); ++#endif ++ ++ Q_ASSERT(bookmarkAction); ++ + // We need to hijack the action - note this only hijacks top-level action +- QAction *bookmarkAction = collec->action(QStringLiteral("add_bookmark")); + disconnect(bookmarkAction, nullptr, this, nullptr); + connect(bookmarkAction, &QAction::triggered, this, &BookmarkMenu::maybeAddBookmark); ++ ++ // replace Ctrl+B shortcut for bookmarks only if user hasn't already ++ // changed the shortcut; however, if the user changed it to Ctrl+B ++ // this will still get changed to Ctrl+Shift+B ++ if (bookmarkAction->shortcut() == QKeySequence(Konsole::ACCEL + Qt::Key_B)) { ++ collection->setDefaultShortcut(bookmarkAction, Konsole::ACCEL + Qt::SHIFT + Qt::Key_B); ++ } + } + + void BookmarkMenu::maybeAddBookmark() +diff --git a/src/BookmarkMenu.h b/src/BookmarkMenu.h +index a42eab23..fde893c0 100644 +--- a/src/BookmarkMenu.h ++++ b/src/BookmarkMenu.h +@@ -39,7 +39,7 @@ class KONSOLEPRIVATE_EXPORT BookmarkMenu : public KBookmarkMenu + Q_OBJECT + + public: +- BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collec); ++ BookmarkMenu (KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, KActionCollection *collection); + + private Q_SLOTS: + void maybeAddBookmark(); +diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp +index 461b9e54..90bbf5ed 100644 +--- a/src/MainWindow.cpp ++++ b/src/MainWindow.cpp +@@ -190,16 +190,6 @@ void MainWindow::correctStandardShortcuts() + if (helpAction != nullptr) { + actionCollection()->setDefaultShortcut(helpAction, QKeySequence()); + } +- +- // replace Ctrl+B shortcut for bookmarks only if user hasn't already +- // changed the shortcut; however, if the user changed it to Ctrl+B +- // this will still get changed to Ctrl+Shift+B +- QAction *bookmarkAction = actionCollection()->action(QStringLiteral("add_bookmark")); +- if ((bookmarkAction != nullptr) +- && bookmarkAction->shortcut() == QKeySequence(Konsole::ACCEL + Qt::Key_B)) { +- actionCollection()->setDefaultShortcut(bookmarkAction, +- Konsole::ACCEL + Qt::SHIFT + Qt::Key_B); +- } + } + + ViewManager *MainWindow::viewManager() const +-- +2.26.1 + diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild b/kde-apps/konsole/konsole-19.12.3-r1.ebuild new file mode 100644 index 000000000000..d3f4cb95ef1e --- /dev/null +++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.63.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://kde.org/applications/system/org.kde.konsole +https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="X" + +# drop kbookmarks subslot operator when KFMIN >= 5.69.0 +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/kcompletion-${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}/${PN}-19.12.2-darkbackground-detect.patch" + "${FILESDIR}/${P}-no-ccache.patch" + "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 419981 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} diff --git a/kde-apps/konsole/konsole-20.04.0.ebuild b/kde-apps/konsole/konsole-20.04.0.ebuild new file mode 100644 index 000000000000..1cad6a566fec --- /dev/null +++ b/kde-apps/konsole/konsole-20.04.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=5.69.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE's terminal emulator" +HOMEPAGE="https://kde.org/applications/system/org.kde.konsole +https://konsole.kde.org" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~ppc64" +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/kcompletion-${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_configure() { + local mycmakeargs=( + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} -- cgit v1.2.3