diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-17 21:42:14 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-17 22:58:46 +0200 |
| commit | cb4fb669b8ae79ade04cf3d8de395277a17cf309 (patch) | |
| tree | 52633b36292ff144cf328307755b48266d557ca7 /net-irc | |
| parent | net-irc/konversation: Port to QElapsedTimer (diff) | |
| download | gentoo-cb4fb669b8ae79ade04cf3d8de395277a17cf309.tar.gz gentoo-cb4fb669b8ae79ade04cf3d8de395277a17cf309.tar.bz2 gentoo-cb4fb669b8ae79ade04cf3d8de395277a17cf309.zip | |
net-irc/konversation: Port away from deprecated KWindowSystem API
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/konversation/files/konversation-1.7.5-kf5windowsystem-5.63.patch | 37 | ||||
| -rw-r--r-- | net-irc/konversation/konversation-1.7.5-r2.ebuild | 3 |
2 files changed, 39 insertions, 1 deletions
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 000000000000..cf93b3b66def --- /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 <faure@kde.org> +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 <KTextEdit> + #include <KSharedConfig> + #include <KStartupInfo> ++#include <kwindowsystem_version.h> + + 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 f43ed032dde1..9940dae72376 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() { |