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 1CFFB158008 for ; Wed, 14 Jun 2023 11:55:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54743E089D; Wed, 14 Jun 2023 11:55:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 31D3DE089D for ; Wed, 14 Jun 2023 11:55:07 +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 74D5233BF05 for ; Wed, 14 Jun 2023 11:55:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0F0BA80 for ; Wed, 14 Jun 2023 11:55:04 +0000 (UTC) From: "Ronny Gutbrod" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ronny Gutbrod" Message-ID: <1686743675.948e7627a346bb83022850e69263cd2e3ca40803.tastytea@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-im/nheko/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-im/nheko/nheko-9999.ebuild X-VCS-Directories: net-im/nheko/ X-VCS-Committer: tastytea X-VCS-Committer-Name: Ronny Gutbrod X-VCS-Revision: 948e7627a346bb83022850e69263cd2e3ca40803 X-VCS-Branch: dev Date: Wed, 14 Jun 2023 11:55:04 +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: 715f9957-8a84-4c09-ac47-6dd9e9afe557 X-Archives-Hash: f4a60c046c961b4e23f97734532106a3 commit: 948e7627a346bb83022850e69263cd2e3ca40803 Author: tastytea tastytea de> AuthorDate: Wed Jun 14 11:52:58 2023 +0000 Commit: Ronny Gutbrod tastytea de> CommitDate: Wed Jun 14 11:54:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=948e7627 net-im/nheko: migrate 9999 to qt6 Signed-off-by: tastytea tastytea.de> net-im/nheko/nheko-9999.ebuild | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/net-im/nheko/nheko-9999.ebuild b/net-im/nheko/nheko-9999.ebuild index 34eeb5d7b..fdf0f1a2b 100644 --- a/net-im/nheko/nheko-9999.ebuild +++ b/net-im/nheko/nheko-9999.ebuild @@ -33,17 +33,14 @@ RDEPEND=" dev-libs/libfmt:= dev-libs/olm >=dev-libs/openssl-1.1.0:= - >=dev-libs/qtkeychain-0.12.0:= + >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-libs/re2-0.2022.04.01:= dev-libs/spdlog:= - dev-qt/qtconcurrent:5 - dev-qt/qtdeclarative:5[widgets] - dev-qt/qtgraphicaleffects:5 - dev-qt/qtgui:5[dbus,jpeg,png] - dev-qt/qtimageformats:5 - dev-qt/qtmultimedia:5[gstreamer,qml,widgets] - dev-qt/qtquickcontrols2:5[widgets] - dev-qt/qtsvg:5 + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qtdeclarative:6[widgets] + dev-qt/qtimageformats:6 + dev-qt/qtmultimedia:6[gstreamer] + dev-qt/qtsvg:6 net-misc/curl[ssl] virtual/notification-daemon voip? ( @@ -55,21 +52,23 @@ RDEPEND=" video? ( >=media-libs/gst-plugins-base-${MY_GST_V}[opengl] >=media-plugins/gst-plugins-meta-${MY_GST_V}[v4l,vpx] - >=media-plugins/gst-plugins-qt5-${MY_GST_V} X? ( >=media-plugins/gst-plugins-ximagesrc-${MY_GST_V} - x11-libs/libxcb:= - x11-libs/xcb-util-wm ) ) ) + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-wm + ) " +# TODO: gst-plugins-qt6 DEPEND=" dev-cpp/nlohmann_json ${RDEPEND} " BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] || ( app-text/asciidoc dev-ruby/asciidoctor @@ -106,12 +105,8 @@ src_configure() { -DVOIP=$(usex voip) -DCMAKE_POSITION_INDEPENDENT_CODE=$(usex pie) -DUSE_BUNDLED_CPPHTTPLIB=no + -DX11=$(usex X) ) - if use video && use X; then - mycmakeargs+=("-DSCREENSHARE_X11=yes") - else - mycmakeargs+=("-DSCREENSHARE_X11=no") - fi cmake_src_configure } @@ -130,7 +125,11 @@ pkg_postinst() { optfeature "secrets storage support other than kwallet (for example gnome-keyring or keepassxc)" \ "dev-libs/qtkeychain[gnome-keyring]" optfeature "additional, less common, image format support" \ - "kde-frameworks/kimageformats" + "kde-frameworks/kimageformats:6" xdg_pkg_postinst + + ewarn "since Nheko migrated to Qt 6 there may be some regressions. video streams will" + ewarn "probably not work for now. d95d2fcaa9e3b8ab47275d2bf56e5a7ebddd37e7 was the" + ewarn "last commit with Qt5 support." }