From 8cd177b72b68f969d1d6367415e1be683a8b4588 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 17 May 2024 16:52:35 +0200 Subject: net-im/tokodon: Update dependencies, add IUSE mpv,webengine Upstream commits: 432d743ca92c1c6ab15c33bb41d346d35c5b50d9 4b0bf816af9b03b4f95587bd73f603cfe1662946 21f14929eb7037ef591d84c4502af6255600d595 ab82bad2425f912870da5dd83da155d799b8a17c Signed-off-by: Andreas Sturmlechner --- 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(-) (limited to 'net-im/tokodon') 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 +} -- cgit v1.2.3-65-gdbad