summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-18 11:22:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-08-04 08:34:46 +0200
commitee0a2d0a73b7a99fcfbf1411fcca73a42295a34b (patch)
tree042b4cea695aaa1ca905411cd3dd41df187a7495 /kde-apps/konsole
parentkde-apps/khelpcenter: drop 19.12.3* (diff)
downloadgentoo-ee0a2d0a73b7a99fcfbf1411fcca73a42295a34b.tar.gz
gentoo-ee0a2d0a73b7a99fcfbf1411fcca73a42295a34b.tar.bz2
gentoo-ee0a2d0a73b7a99fcfbf1411fcca73a42295a34b.zip
kde-apps/konsole: drop 19.12.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/konsole')
-rw-r--r--kde-apps/konsole/Manifest1
-rw-r--r--kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch27
-rw-r--r--kde-apps/konsole/files/konsole-19.12.3-kf5bookmarks-5.69.patch117
-rw-r--r--kde-apps/konsole/files/konsole-19.12.3-no-ccache.patch45
-rw-r--r--kde-apps/konsole/konsole-19.12.3-r1.ebuild78
5 files changed, 0 insertions, 268 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 184132002b7..d6f00e099d9 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,2 +1 @@
-DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
DIST konsole-20.04.3.tar.xz 1174128 BLAKE2B bfd5ca2a01441666e4d72288b5b662f50b212e2c23847ff59c17e142d81ef9d48c6d4edfc18d051d8431e92d1f8b29db74d987115264a418c754fd6cabbff6b2 SHA512 37607f7aab099b48478179eeb7e40e25a75c3c0b1b20496ae34ccd883d6f30644206d7ee95ebd56e9620b88b80700a03157671dfecf538767e6cad476632d813
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 990bad142c3..00000000000
--- 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 d70a50ea055..00000000000
--- 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 9419ea5c612..00000000000
--- 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-19.12.3-r1.ebuild
deleted file mode 100644
index 6799320faf8..00000000000
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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
-}
-
-src_test() {
- # drkonqi process interferes. bug 702690
- local myctestargs=(
- -E "(DBusTest)"
- )
-
- ecm_src_test
-}