summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 01:04:53 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 08:51:28 +0200
commitf526313c9eae34b8f7a41b1f02e705f6ad84c515 (patch)
treeb1c5c0752f63d58d862f18a62c7e279c79fcdd10 /kde-apps/konsole
parentkde-apps: Add KDE Release Service 20.04.2 (diff)
downloadgentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.gz
gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.tar.bz2
gentoo-f526313c9eae34b8f7a41b1f02e705f6ad84c515.zip
kde-apps: Drop KDE Release Service 20.04.1
Package-Manager: Portage-2.3.100, Repoman-2.3.22 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-20.04.1-crash-on-close.patch57
-rw-r--r--kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch109
-rw-r--r--kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch44
-rw-r--r--kde-apps/konsole/konsole-20.04.1-r2.ebuild77
5 files changed, 0 insertions, 288 deletions
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 2e34a1e78fa..dc2dba864aa 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,3 +1,2 @@
DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
-DIST konsole-20.04.1.tar.xz 1165784 BLAKE2B 160dc2c0f4f5560e060e13ffc2eac0a02ed33060e66778e92eaea2c7c03060fbf2e8107d26f401ea7f96b33838f23de13737f48db11cce7b5b1eff4bae9ffc8e SHA512 608bc4e9652e1129b219867c01b40ea2aba4044b9827b6b39ef0d2fed436dfd091c3cd4f568673122761ceb3106e8304d490b0ad5b73210d1890a5ec9e516fa3
DIST konsole-20.04.2.tar.xz 1165856 BLAKE2B 614194ace08ea69dcd2e923a41f83ad807c14f719df9b9516a99f962940af4914e7e29b5ed179ad92a85047bf72bef4e41956d16a81462c99b4b71009ebd728e SHA512 0f998c6f69bac905385b51c2d2af3b4ed1e835e1a33208c59238e3950c6c5cf3580a435ea5acacfbd031eecf2308e2c96e9df30f1ccf44154a2a637ca073906d
diff --git a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
deleted file mode 100644
index 51e1d0c5dcd..00000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-crash-on-close.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From fdfae25665731882687da8721e58c3c56a3babf8 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Thu, 28 May 2020 09:28:06 -0400
-Subject: Fix crash when closing session in KonsolePart via menu
-
-This close method is also used when closing a Konsole session
-via the X on the tabbar and tabheader.
-
-FIXED-IN: 20.08.0
-BUG: 420817
-BUG: 420695
-BUG: 415762
-
-See merge request !87
----
- src/SessionController.cpp | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index 006ba8b..e72f342 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -999,16 +999,23 @@ void SessionController::closeSession()
- return;
- }
-
-- if (confirmClose()) {
-- if (_session->closeInNormalWay()) {
-+ if (!confirmClose()) {
-+ return;
-+ }
-+
-+ if (!_session->closeInNormalWay()) {
-+ if (!confirmForceClose()) {
- return;
-- } else if (confirmForceClose()) {
-- if (_session->closeInForceWay()) {
-- return;
-- } else {
-- qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
-- }
- }
-+
-+ if (!_session->closeInForceWay()) {
-+ qCDebug(KonsoleDebug) << "Konsole failed to close a session in any way.";
-+ return;
-+ }
-+ }
-+
-+ if (factory()) {
-+ factory()->removeClient(this);
- }
- }
-
---
-cgit v1.1
-
diff --git a/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch b/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
deleted file mode 100644
index 78e5559d047..00000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 72e76de072aa4c7960396856e72681a00c4f67d9 Mon Sep 17 00:00:00 2001
-From: Ahmad Samir <a.samirh78@gmail.com>
-Date: Thu, 28 May 2020 21:40:29 +0200
-Subject: [PATCH] [SessionController] Fix crash caused by text encoding menu
-
-QMenu since 5.15 is hidden when an action is triggered, this caused a
-crash in Konsole when trying to access the text encoding menu.
-
-Now Session emits a signal when the text encoding is changed, the
-SessionController can connect to that singal to set the current codec in
-the KCodecAction object.
-
-Also fix the EditProfileDialog so that when the KCodecAction menu is
-shown the currently set codec is selected.
-
-BUG: 419526
-
-FIXED-IN: 20.08
----
- src/EditProfileDialog.cpp | 1 +
- src/Session.cpp | 2 ++
- src/Session.h | 5 +++++
- src/SessionController.cpp | 7 ++++---
- src/SessionController.h | 2 +-
- 5 files changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/src/EditProfileDialog.cpp b/src/EditProfileDialog.cpp
-index a64136934..f93e9e166 100644
---- a/src/EditProfileDialog.cpp
-+++ b/src/EditProfileDialog.cpp
-@@ -1725,6 +1725,7 @@ void EditProfileDialog::setupAdvancedPage(const Profile::Ptr &profile)
-
- // encoding options
- auto codecAction = new KCodecAction(this);
-+ codecAction->setCurrentCodec(profile->defaultEncoding());
- _advancedUi->selectEncodingButton->setMenu(codecAction->menu());
- connect(codecAction,
- QOverload<QTextCodec *>::of(&KCodecAction::triggered), this,
-diff --git a/src/Session.cpp b/src/Session.cpp
-index 1103f6e1b..483d8fd6a 100644
---- a/src/Session.cpp
-+++ b/src/Session.cpp
-@@ -252,6 +252,8 @@ void Session::setCodec(QTextCodec* codec)
- }
-
- emulation()->setCodec(codec);
-+
-+ emit sessionCodecChanged(codec);
- }
-
- bool Session::setCodec(const QByteArray& name)
-diff --git a/src/Session.h b/src/Session.h
-index 1b7da1b3b..c1af3c05d 100644
---- a/src/Session.h
-+++ b/src/Session.h
-@@ -661,6 +661,11 @@ Q_SIGNALS:
- */
- void currentDirectoryChanged(const QString &dir);
-
-+ /**
-+ * Emitted when the session text encoding changes.
-+ */
-+ void sessionCodecChanged(QTextCodec *codec);
-+
- /** Emitted when a bell event occurs in the session. */
- void bellRequest(const QString &message);
-
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index e72f342c4..f74969f85 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -691,7 +691,8 @@ void SessionController::setupCommonActions()
- _codecAction = new KCodecAction(i18n("Set &Encoding"), this);
- _codecAction->setIcon(QIcon::fromTheme(QStringLiteral("character-set")));
- collection->addAction(QStringLiteral("set-encoding"), _codecAction);
-- connect(_codecAction->menu(), &QMenu::aboutToShow, this, &Konsole::SessionController::updateCodecAction);
-+ _codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
-+ connect(_session.data(), &Konsole::Session::sessionCodecChanged, this, &Konsole::SessionController::updateCodecAction);
- connect(_codecAction,
- QOverload<QTextCodec*>::of(&KCodecAction::triggered), this,
- &Konsole::SessionController::changeCodec);
-@@ -846,9 +847,9 @@ void SessionController::prepareSwitchProfileMenu()
- _switchProfileMenu->menu()->clear();
- _switchProfileMenu->menu()->addActions(_profileList->actions());
- }
--void SessionController::updateCodecAction()
-+void SessionController::updateCodecAction(QTextCodec *codec)
- {
-- _codecAction->setCurrentCodec(QString::fromUtf8(_session->codec()));
-+ _codecAction->setCurrentCodec(codec);
- }
-
- void SessionController::changeCodec(QTextCodec* codec)
-diff --git a/src/SessionController.h b/src/SessionController.h
-index 057a31446..5062833b7 100644
---- a/src/SessionController.h
-+++ b/src/SessionController.h
-@@ -260,7 +260,7 @@ private Q_SLOTS:
- // other
- void setupSearchBar();
- void prepareSwitchProfileMenu();
-- void updateCodecAction();
-+ void updateCodecAction(QTextCodec *codec);
- void showDisplayContextMenu(const QPoint &position);
- void movementKeyFromSearchBarReceived(QKeyEvent *event);
- void sessionNotificationsChanged(Session::Notification notification, bool enabled);
---
-2.26.2
-
diff --git a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch b/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
deleted file mode 100644
index 55213878ad2..00000000000
--- a/kde-apps/konsole/files/konsole-20.04.1-segfault-on-close.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5e5129d51fa85036832f1af44ec5b875d426392f Mon Sep 17 00:00:00 2001
-From: Maximilian Schiller <manimax3@outlook.de>
-Date: Thu, 28 May 2020 22:57:29 +0200
-Subject: [PATCH] Fix konsolepart Segfault when closed
-
-Assign the _view as the parent to the KXMLGuiFactory because the factory
-is referencing the view widget as its associated widget. Since the
-TerminalDisplay gets destructed first this is now a dangling pointer.
-If the view is set as the parent the factory gets cleaned up correctly.
-
-Also cleanup the created clientBuilder after destruction because it
-cant have a parent and would probably leak memory.
-
-BUG: 415762
-BUG: 421226
-BUG: 421194
-BUG: 421138
----
- src/SessionController.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/SessionController.cpp b/src/SessionController.cpp
-index e72f342c4..99e185f5e 100644
---- a/src/SessionController.cpp
-+++ b/src/SessionController.cpp
-@@ -1732,11 +1732,13 @@ void SessionController::showDisplayContextMenu(const QPoint& position)
- if (factory() == nullptr) {
- if (clientBuilder() == nullptr) {
- setClientBuilder(new KXMLGUIBuilder(_view));
-+
-+ // Client builder does not get delted automatically
-+ connect(this, &QObject::destroyed, this, [this]{ delete clientBuilder(); });
- }
-
-- auto factory = new KXMLGUIFactory(clientBuilder(), this);
-+ auto factory = new KXMLGUIFactory(clientBuilder(), _view);
- factory->addClient(this);
-- ////qDebug() << "Created xmlgui factory" << factory;
- }
-
- QPointer<QMenu> popup = qobject_cast<QMenu*>(factory()->container(QStringLiteral("session-popup-menu"), this));
---
-2.26.2
-
diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
deleted file mode 100644
index c532b9d1b71..00000000000
--- a/kde-apps/konsole/konsole-20.04.1-r2.ebuild
+++ /dev/null
@@ -1,77 +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.70.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"
-
-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}/${P}-crash-on-close.patch" # bug 723214, in 20.04.2
- "${FILESDIR}/${P}-qt-5.15-set-text-encoding-crash.patch" # KDE-Bug 419526; pending
- "${FILESDIR}/${P}-segfault-on-close.patch" # KDE-Bug 415762; pending
-)
-
-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
-}