From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C3AD138350 for ; Fri, 17 Apr 2020 20:59:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD333E0801; Fri, 17 Apr 2020 20:59:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98780E0801 for ; Fri, 17 Apr 2020 20:59:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B037734F149 for ; Fri, 17 Apr 2020 20:59:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32A3C1DF for ; Fri, 17 Apr 2020 20:59:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587157126.cb4fb669b8ae79ade04cf3d8de395277a17cf309.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/konversation/, net-irc/konversation/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch net-irc/konversation/konversation-1.7.5-r2.ebuild X-VCS-Directories: net-irc/konversation/ net-irc/konversation/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cb4fb669b8ae79ade04cf3d8de395277a17cf309 X-VCS-Branch: master Date: Fri, 17 Apr 2020 20:59:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e0c4514a-0ea7-4e5e-b60f-7dd5484d3544 X-Archives-Hash: 4d5be0a268b4caba4ec13ece4b84cdad commit: cb4fb669b8ae79ade04cf3d8de395277a17cf309 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Apr 17 19:42:14 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Apr 17 20:58:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4fb669 net-irc/konversation: Port away from deprecated KWindowSystem API Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../konversation-1.7.5-kf5windowsystem-5.63.patch | 37 ++++++++++++++++++++++ net-irc/konversation/konversation-1.7.5-r2.ebuild | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch new file mode 100644 index 00000000000..cf93b3b66de --- /dev/null +++ b/net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch @@ -0,0 +1,37 @@ +From 4295aba5c02533040723d140e062aebd231b3f18 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Thu, 28 Nov 2019 12:56:34 +0100 +Subject: Port away from deprecated KWindowSystem API (with ifdefs) + +--- + src/application.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/application.cpp b/src/application.cpp +index 4667c24..538624b 100644 +--- a/src/application.cpp ++++ b/src/application.cpp +@@ -50,6 +50,7 @@ + #include + #include + #include ++#include + + using namespace Konversation; + +@@ -1392,7 +1393,12 @@ void Application::handleActivate(const QStringList& arguments) + + newInstance(m_commandLineParser); + ++#if KWINDOWSYSTEM_VERSION <= QT_VERSION_CHECK(5, 62, 0) + KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId()); ++#else ++ mainWindow->setAttribute(Qt::WA_NativeWindow, true); ++ KStartupInfo::setNewStartupId(mainWindow->windowHandle(), KStartupInfo::startupId()); ++#endif + mainWindow->show(); + mainWindow->raise(); + } +-- +cgit v1.1 + diff --git a/net-irc/konversation/konversation-1.7.5-r2.ebuild b/net-irc/konversation/konversation-1.7.5-r2.ebuild index f43ed032dde..9940dae7237 100644 --- a/net-irc/konversation/konversation-1.7.5-r2.ebuild +++ b/net-irc/konversation/konversation-1.7.5-r2.ebuild @@ -4,7 +4,7 @@ EAPI=7 ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 +KFMIN=5.63.0 QTMIN=5.12.3 inherit ecm kde.org @@ -62,6 +62,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-regex-for-cap-ack.patch "${FILESDIR}"/${P}-missing-header.patch "${FILESDIR}"/${P}-QElapsedTimer.patch + "${FILESDIR}"/${P}-kf5windowsystem-5.63.patch ) src_configure() {