mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

net-im/nheko: remove forced wayland dependency

Browse Source 
backported the fix from upstream

Bug: https://bugs.gentoo.org/934414
Signed-off-by: tea <gentoo@tastytea.de>
This commit is contained in:
tea
2024-07-05 18:54:20 +02:00
parent 209292e86e
commit 429788ad79
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
net-im/nheko/files/nheko-0.12.0-remove-wayland-dep-on-x11.patch Normal file
View File

@@ -0,0 +1,39 @@
# adapted from upstream commit:
# <https://github.com/Nheko-Reborn/nheko/commit/941f7f5>
From 3bc8117be9964af95210c865880bd2db8dc76a27 Mon Sep 17 00:00:00 2001
From: tea <tea@tastytea.de>
Date: Fri, 5 Jul 2024 17:32:59 +0200
Subject: [PATCH] remove wayland dep on X11
---
src/main.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main.cpp b/src/main.cpp
index 8ea15901..392867bb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,7 +21,7 @@
// in theory we can enable this everywhere, but the header is missing on some of our CI systems and
// it is too much effort to install.
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
+#if __has_include(<QtGui/qpa/qplatformwindow_p.h>)
#include <QtGui/qpa/qplatformwindow_p.h>
#endif
@@ -248,7 +248,9 @@ main(int argc, char *argv[])
if (!singleapp.isPrimaryInstance()) {
auto token = qgetenv("XDG_ACTIVATION_TOKEN");
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
+#if __has_include(<QtGui/qpa/qplatformwindow_p.h>) && \
+ ((QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) && QT_CONFIG(wayland)) || \
+ (QT_VERSION < QT_VERSION_CHECK(6, 7, 0) && defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)))
// getting a valid activation token on wayland is a bit of a pain, it works most reliably
// when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();
--
2.44.2

4
net-im/nheko/nheko-0.12.0.ebuild
View File

@@ -34,7 +34,7 @@ RDEPEND="
>=dev-libs/re2-0.2022.04.01:=
dev-libs/spdlog:=
>=dev-qt/kdsingleapplication-1.1.0:=[qt6]
dev-qt/qtbase:6[concurrent,dbus,gui,wayland,widgets]
dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
dev-qt/qtdeclarative:6[widgets]
dev-qt/qtimageformats:6
dev-qt/qtmultimedia:6[gstreamer]
@@ -76,6 +76,8 @@ BDEPEND="
)
"
PATCHES=( "${FILESDIR}"/${P}-remove-wayland-dep-on-x11.patch )
src_configure() {
local -a mycmakeargs=(
-DUSE_BUNDLED_CPPHTTPLIB=no