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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D27C21581C1 for ; Mon, 8 Jul 2024 16:36:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90E64E2B04; Mon, 8 Jul 2024 16:36:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 71787E2B00 for ; Mon, 8 Jul 2024 16:36:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAFBE343074 for ; Mon, 8 Jul 2024 16:36:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE31E1DF7 for ; Mon, 8 Jul 2024 16:36:30 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1720198765.429788ad79e7ed72ba7703f4dd738641d74324c5.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-im/nheko/, net-im/nheko/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/nheko/files/nheko-0.12.0-remove-wayland-dep-on-x11.patch net-im/nheko/nheko-0.12.0.ebuild X-VCS-Directories: net-im/nheko/files/ net-im/nheko/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 429788ad79e7ed72ba7703f4dd738641d74324c5 X-VCS-Branch: master Date: Mon, 8 Jul 2024 16:36:30 +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: 07c32f46-7489-46c1-bfe4-1b15030f5d22 X-Archives-Hash: a51b34662071a9e1da518e5dcf4f6abc commit: 429788ad79e7ed72ba7703f4dd738641d74324c5 Author: tea tastytea de> AuthorDate: Fri Jul 5 16:54:20 2024 +0000 Commit: David Roman gmail com> CommitDate: Fri Jul 5 16:59:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=429788ad net-im/nheko: remove forced wayland dependency backported the fix from upstream Bug: https://bugs.gentoo.org/934414 Signed-off-by: tea tastytea.de> .../nheko-0.12.0-remove-wayland-dep-on-x11.patch | 39 ++++++++++++++++++++++ net-im/nheko/nheko-0.12.0.ebuild | 4 ++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/net-im/nheko/files/nheko-0.12.0-remove-wayland-dep-on-x11.patch b/net-im/nheko/files/nheko-0.12.0-remove-wayland-dep-on-x11.patch new file mode 100644 index 000000000..ce32492e2 --- /dev/null +++ b/net-im/nheko/files/nheko-0.12.0-remove-wayland-dep-on-x11.patch @@ -0,0 +1,39 @@ +# adapted from upstream commit: +# + +From 3bc8117be9964af95210c865880bd2db8dc76a27 Mon Sep 17 00:00:00 2001 +From: tea +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() + #include + #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() && \ ++ ((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(); +-- +2.44.2 + diff --git a/net-im/nheko/nheko-0.12.0.ebuild b/net-im/nheko/nheko-0.12.0.ebuild index d68d32446..e22f303cc 100644 --- a/net-im/nheko/nheko-0.12.0.ebuild +++ b/net-im/nheko/nheko-0.12.0.ebuild @@ -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