diff options
Diffstat (limited to 'kde-apps/konsole')
| -rw-r--r-- | kde-apps/konsole/Manifest | 11 | ||||
| -rw-r--r-- | kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch | 27 | ||||
| -rw-r--r-- | kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch | 117 | ||||
| -rw-r--r-- | kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch | 45 | ||||
| -rw-r--r-- | kde-apps/konsole/konsole-20.04.3.ebuild (renamed from kde-apps/konsole/konsole-19.12.3-r1.ebuild) | 13 | ||||
| -rw-r--r-- | kde-apps/konsole/konsole-20.08.0.ebuild (renamed from kde-apps/konsole/konsole-20.04.2.ebuild) | 4 |
6 files changed, 9 insertions, 208 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest index 64a8562fc2c6..c27116c82ad0 100644 --- a/kde-apps/konsole/Manifest +++ b/kde-apps/konsole/Manifest @@ -1,8 +1,5 @@ -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.2.tar.xz 1165856 BLAKE2B 614194ace08ea69dcd2e923a41f83ad807c14f719df9b9516a99f962940af4914e7e29b5ed179ad92a85047bf72bef4e41956d16a81462c99b4b71009ebd728e SHA512 0f998c6f69bac905385b51c2d2af3b4ed1e835e1a33208c59238e3950c6c5cf3580a435ea5acacfbd031eecf2308e2c96e9df30f1ccf44154a2a637ca073906d -EBUILD konsole-19.12.3-r1.ebuild 2012 BLAKE2B f84052caaa7cc7339f0942402e08e0b856b5f15258789fd1f9d600751d3686e83534e20de534535d15e8ffa20fa40c4f22968ce5a753b3c7fcadd7d854f9ac80 SHA512 c4ade02ceabebda1f323ada448802f7495e09922722a9dab4beda8630068c5cb533a9cf148a6df4257afa55ce1231299265e0b0212187980a1ebc2be8dd14b81 -EBUILD konsole-20.04.2.ebuild 1791 BLAKE2B a4b3696c5059fcd1f2e26a437a7ed6f8ff6bed2b929470c6e8f36a3f39fc9a95082646c469857271f6fe30ddb2e41ff4de4d44e87d151d2121770b386124bb5c SHA512 7a33e668d9250c7f43b2162f72e852842a5d40fff04f48387ae001170511524f0242f4ae191202c173cc1aa64c599d6807e2c9cbc028a58b89232b1c14088ed0 +DIST konsole-20.04.3.tar.xz 1174128 BLAKE2B bfd5ca2a01441666e4d72288b5b662f50b212e2c23847ff59c17e142d81ef9d48c6d4edfc18d051d8431e92d1f8b29db74d987115264a418c754fd6cabbff6b2 SHA512 37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813 +DIST konsole-20.08.0.tar.xz 1210628 BLAKE2B 4fb84b7ddc3b2759c1a232850b3f49b611186e5a4df846b36cfec947ac9737c5541c2176dacabe45141b2ad420f5fa89b551ef504831b395df459373d5d8cccd SHA512 4e9640ba8888d520c07ce57f838782c874b89972acb3cc8253ae72f1d2d92d074bd5e10c7a579206fcf7ab6589ac709391a593dc7335e6a85f3d17cc8c247877 +EBUILD konsole-20.04.3.ebuild 1788 BLAKE2B bd30b057633454d863858e4b7e633b42b9f22d527af75a00358198eaa3271d41bb3ab6490c7dc820a51688740184788ce09b439550eb6325fea59be8d8392c41 SHA512 b7b61c56bd92c252aca222cc1947c429074a2290295dd2e828ccf32c25bb040eddde856fb11d5effa79007253f1bb86a138be11c68b3499d764c7486be721d5e +EBUILD konsole-20.08.0.ebuild 1791 BLAKE2B b50df2290f60e42996d08d220a4593ed2cb0e59dd46242866dc30d38f42c470759bf65bc81d4d92a776aa8ec511dce99f63badf2fa9a92d77099bec2ffb86dd9 SHA512 7b4890120f0e5068f5fad7d4c03539ff545d3a38e13bce8dd9962f6b23495b536bc70c5d26344939a23dce7ea34c8638851bc457686fa1e406c809aed2adc55b MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch deleted file mode 100644 index 990bad142c3d..000000000000 --- a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e5b2ada1a6f06e0eea76af1f26ff4c0c4aad8497 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu> -Date: Thu, 23 Jan 2020 11:00:06 +0100 -Subject: ColorScheme: Fix DarkBackground Detection - -Luminance is a value between 0 and 100. - -https://bugs.kde.org/show_bug.cgi?id=416638 ---- - src/ColorScheme.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp -index 1693c22..5d6b408 100644 ---- a/src/ColorScheme.cpp -+++ b/src/ColorScheme.cpp -@@ -403,7 +403,7 @@ bool ColorScheme::hasDarkBackground() const - const double g = backgroundColor().greenF(); - const double b = backgroundColor().blueF(); - rgb2hsluv(r, g, b, &h, &s, &l); -- return l < 0.5; -+ return l < 50; - } - - void ColorScheme::setOpacity(qreal opacity) --- -cgit v1.1 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 deleted file mode 100644 index d70a50ea0551..000000000000 --- a/kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch +++ /dev/null @@ -1,117 +0,0 @@ -From e56c31a961b182663decd44bc57729576446315b Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -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 <KActionCollection> -+#include <kbookmarks_version.h> -+#include <KBookmarkManager> -+#include <KBookmark> - - // Qt - #include <QAction> --#include <KBookmarkManager> --#include <KBookmark> -+#include <QMenu> - - #include <algorithm> // 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/files/konsole-19.12.3-no-ccache.patch b/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch deleted file mode 100644 index 9419ea5c6127..000000000000 --- a/kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3529286a0a4885ad3626a4081407fb56a8a568f9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 24 Mar 2020 00:24:05 +0100 -Subject: [PATCH] Revert "CMakeLists.txt: use ccache if present" - -This was added for feature-parity with Meson-based projects; but an individual -package is the wrong place for that. To avoid the proliferation of auto- -detected ccache support in kde.org packages please submit such a proposal to -kde-frameworks-devel instead, where it could be added for the benefit of all -the projects using ECM. And more importantly, with a standard switch to disable -it for packaging environments. - -This reverts commit 007c2a08523887cf9c0445a288ad82994bd02a57. - -Differential Revision: https://phabricator.kde.org/D24805 ---- - CMakeLists.txt | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17c82b0d..45ab9f62 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -17,18 +17,6 @@ set (KF5_MIN_VERSION "5.6.0") - # Release script will create bugzilla versions - project(konsole VERSION ${RELEASE_SERVICE_VERSION}) - --find_program(CCACHE_FOUND "ccache") --set(CCACHE_SUPPORT ON CACHE BOOL "Enable ccache support") --if (CCACHE_FOUND AND CCACHE_SUPPORT) -- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC -- OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- # without this compiler messages in `make` backend would be uncolored -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto") -- endif() -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "ccache") -- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK "ccache") --endif() -- - find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) - --- -2.25.1 - diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild b/kde-apps/konsole/konsole-20.04.3.ebuild index 6799320faf82..d4bad24f924d 100644 --- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild +++ b/kde-apps/konsole/konsole-20.04.3.ebuild @@ -5,8 +5,8 @@ EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="true" -KFMIN=5.63.0 -QTMIN=5.12.3 +KFMIN=5.70.0 +QTMIN=5.14.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -19,7 +19,6 @@ 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 @@ -27,7 +26,7 @@ DEPEND=" >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5= + >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -54,12 +53,6 @@ DEPEND=" " 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) diff --git a/kde-apps/konsole/konsole-20.04.2.ebuild b/kde-apps/konsole/konsole-20.08.0.ebuild index 16efe5db588d..2cac26a28cd6 100644 --- a/kde-apps/konsole/konsole-20.04.2.ebuild +++ b/kde-apps/konsole/konsole-20.08.0.ebuild @@ -5,8 +5,8 @@ EAPI=7 ECM_HANDBOOK="optional" ECM_TEST="true" -KFMIN=5.70.0 -QTMIN=5.14.1 +KFMIN=5.72.0 +QTMIN=5.14.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org |