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 5E7BD1581D3 for ; Fri, 17 May 2024 15:08:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D373E29AE; Fri, 17 May 2024 15:08:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 3E7A5E29AE for ; Fri, 17 May 2024 15:08:05 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7631333BEE8 for ; Fri, 17 May 2024 15:08:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E3351AD3 for ; Fri, 17 May 2024 15:08:03 +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: <1715957900.8cd177b72b68f969d1d6367415e1be683a8b4588.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-im/tokodon/ X-VCS-Repository: proj/kde X-VCS-Files: net-im/tokodon/metadata.xml net-im/tokodon/tokodon-24.04.90.ebuild net-im/tokodon/tokodon-24.05.49.9999.ebuild net-im/tokodon/tokodon-9999.ebuild X-VCS-Directories: net-im/tokodon/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8cd177b72b68f969d1d6367415e1be683a8b4588 X-VCS-Branch: master Date: Fri, 17 May 2024 15:08:03 +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: 35ff688b-b96a-43cd-89d4-b08227debf2f X-Archives-Hash: b7ab1e02bc92b1671c41077bb0ad3151 commit: 8cd177b72b68f969d1d6367415e1be683a8b4588 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 17 14:52:35 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 17 14:58:20 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8cd177b7 net-im/tokodon: Update dependencies, add IUSE mpv,webengine Upstream commits: 432d743ca92c1c6ab15c33bb41d346d35c5b50d9 4b0bf816af9b03b4f95587bd73f603cfe1662946 21f14929eb7037ef591d84c4502af6255600d595 ab82bad2425f912870da5dd83da155d799b8a17c Signed-off-by: Andreas Sturmlechner gentoo.org> net-im/tokodon/metadata.xml | 6 +++++- net-im/tokodon/tokodon-24.04.90.ebuild | 17 ++++++++++++++--- net-im/tokodon/tokodon-24.05.49.9999.ebuild | 17 ++++++++++++++--- net-im/tokodon/tokodon-9999.ebuild | 17 ++++++++++++++--- 4 files changed, 47 insertions(+), 10 deletions(-) diff --git a/net-im/tokodon/metadata.xml b/net-im/tokodon/metadata.xml index 02ce3e9d31..0f8aab73a8 100644 --- a/net-im/tokodon/metadata.xml +++ b/net-im/tokodon/metadata.xml @@ -6,7 +6,11 @@ Gentoo KDE Project - network/tokodon https://bugs.kde.org/ + network/tokodon + + Use media-libs/mpvqt instead of dev-qt/qtmultimedia for video playback (default) + Use dev-qt/qtwebengine for built-in authentication page (default is external browser) + diff --git a/net-im/tokodon/tokodon-24.04.90.ebuild b/net-im/tokodon/tokodon-24.04.90.ebuild index c734b9c19e..e4702950a6 100644 --- a/net-im/tokodon/tokodon-24.04.90.ebuild +++ b/net-im/tokodon/tokodon-24.04.90.ebuild @@ -14,16 +14,16 @@ HOMEPAGE="https://apps.kde.org/tokodon/" LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" SLOT="0" KEYWORDS="~amd64" +IUSE="+mpv webengine" # TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc) DEPEND=" - dev-libs/kirigami-addons:6 + >=dev-libs/kirigami-addons-1.1.0:6 >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 >=dev-qt/qtwebsockets-${QTMIN}:6 - >=dev-qt/qtwebview-${QTMIN}:6 >=kde-frameworks/breeze-icons-${KFMIN}:* >=kde-frameworks/kcolorscheme-${KFMIN}:6 >=kde-frameworks/kconfig-${KFMIN}:6 @@ -37,10 +37,21 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/purpose-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - media-libs/mpvqt + mpv? ( media-libs/mpvqt ) + !mpv? ( >=dev-qt/qtsvg-${QTMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " RDEPEND="${DEPEND} >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6[qml] " BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_QTMULTIMEDIA=$(usex !mpv) + $(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile" + ) + + ecm_src_configure +} diff --git a/net-im/tokodon/tokodon-24.05.49.9999.ebuild b/net-im/tokodon/tokodon-24.05.49.9999.ebuild index f4fa3a4c53..b49f8839f4 100644 --- a/net-im/tokodon/tokodon-24.05.49.9999.ebuild +++ b/net-im/tokodon/tokodon-24.05.49.9999.ebuild @@ -14,16 +14,16 @@ HOMEPAGE="https://apps.kde.org/tokodon/" LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" SLOT="0" KEYWORDS="" +IUSE="+mpv webengine" # TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc) DEPEND=" - dev-libs/kirigami-addons:6 + >=dev-libs/kirigami-addons-1.1.0:6 >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 >=dev-qt/qtwebsockets-${QTMIN}:6 - >=dev-qt/qtwebview-${QTMIN}:6 >=kde-frameworks/breeze-icons-${KFMIN}:* >=kde-frameworks/kcolorscheme-${KFMIN}:6 >=kde-frameworks/kconfig-${KFMIN}:6 @@ -37,10 +37,21 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/purpose-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - media-libs/mpvqt + mpv? ( media-libs/mpvqt ) + !mpv? ( >=dev-qt/qtsvg-${QTMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " RDEPEND="${DEPEND} >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6[qml] " BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_QTMULTIMEDIA=$(usex !mpv) + $(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile" + ) + + ecm_src_configure +} diff --git a/net-im/tokodon/tokodon-9999.ebuild b/net-im/tokodon/tokodon-9999.ebuild index f4fa3a4c53..b49f8839f4 100644 --- a/net-im/tokodon/tokodon-9999.ebuild +++ b/net-im/tokodon/tokodon-9999.ebuild @@ -14,16 +14,16 @@ HOMEPAGE="https://apps.kde.org/tokodon/" LICENSE="CC-BY-SA-4.0 GPL-2+ GPL-3+ || ( LGPL-2.1+ LGPL-3+ ) MIT" SLOT="0" KEYWORDS="" +IUSE="+mpv webengine" # TODO: Add kunifiedpush support once packaged (cd01eb31d1ec298d4c1e10d25a0781d799161bfc) DEPEND=" - dev-libs/kirigami-addons:6 + >=dev-libs/kirigami-addons-1.1.0:6 >=dev-libs/qtkeychain-0.14.1-r1:=[qt6] >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 >=dev-qt/qtwebsockets-${QTMIN}:6 - >=dev-qt/qtwebview-${QTMIN}:6 >=kde-frameworks/breeze-icons-${KFMIN}:* >=kde-frameworks/kcolorscheme-${KFMIN}:6 >=kde-frameworks/kconfig-${KFMIN}:6 @@ -37,10 +37,21 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/purpose-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - media-libs/mpvqt + mpv? ( media-libs/mpvqt ) + !mpv? ( >=dev-qt/qtsvg-${QTMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) " RDEPEND="${DEPEND} >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6[qml] " BDEPEND="virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_QTMULTIMEDIA=$(usex !mpv) + $(cmake_use_find_package webengine Qt6WebView) # "only makes sense on mobile" + ) + + ecm_src_configure +}