commit: 2258bf7ecaeafe1a2b025c4a34802c606cfd38a0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 7 08:34:52 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 7 08:48:43 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2258bf7e
net-irc/konversation: Delay tray setup until mainwindow state restored KDE-bug: https://bugs.kde.org/show_bug.cgi?id=482622 Upstream commit b7a551d6fd07c901d81b25f46f0782a9846c7c23 Add new dependency KDE-bug: https://bugs.kde.org/show_bug.cgi?id=349675 Upstream commit b7a551d6fd07c901d81b25f46f0782a9846c7c23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../konversation-24.02.0-delay-tray-setup.patch | 36 +++++++++++ .../konversation/konversation-24.02.0-r1.ebuild | 74 ++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch b/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch new file mode 100644 index 000000000000..fd8f438cc01b --- /dev/null +++ b/net-irc/konversation/files/konversation-24.02.0-delay-tray-setup.patch @@ -0,0 +1,36 @@ +From 1d554cb2c29e57bfd58b9aed7643dcb60fbf8659 Mon Sep 17 00:00:00 2001 +From: Eli MacKenzie <argo...@gmail.com> +Date: Sun, 3 Mar 2024 17:33:42 -0500 +Subject: [PATCH] Delay tray setup until mainwindow state restored + +Otherwise the the KSNI appears to lose track of the main window. + +BUG: 482316 +--- + src/mainwindow.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index c1a029b5a..6faf7d90c 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -571,13 +571,13 @@ MainWindow::MainWindow() : KXmlGuiWindow(nullptr) + new KonviBookmarkHandler(menu, this); + actionCollection()->addAction(QStringLiteral("bookmarks") , action); + +- // decide whether to show the tray icon or not +- updateTrayIcon(); +- + createGUI(); + + setAutoSaveSettings(); + ++ // decide whether to show the tray icon or not ++ updateTrayIcon(); ++ + // Apply menubar show/hide pref + m_showMenuBarAction->setChecked(Preferences::self()->showMenuBar()); + toggleMenubar(true); +-- +GitLab + diff --git a/net-irc/konversation/konversation-24.02.0-r1.ebuild b/net-irc/konversation/konversation-24.02.0-r1.ebuild new file mode 100644 index 000000000000..f6945fca8ab9 --- /dev/null +++ b/net-irc/konversation/konversation-24.02.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="User friendly IRC Client" +HOMEPAGE="https://konversation.kde.org https://apps.kde.org/konversation/"; + +LICENSE="GPL-2" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+crypt" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtmultimedia-${QTMIN}:6 + >=dev-qt/qttools-${QTMIN}:6[qdbus] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + crypt? ( >=app-crypt/qca-2.3.7:2[qt6] ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtsvg-${QTMIN}:6 + crypt? ( >=app-crypt/qca-2.3.7:2[qt6,ssl] ) +" +BDEPEND="sys-devel/gettext" + +PATCHES=( "${FILESDIR}/${P}-delay-tray-setup.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package crypt Qca-qt6) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # Bug 616162 + insinto /etc/xdg + doins "${FILESDIR}"/konversationrc +}
