diff --git a/net-im/tokodon/patches/tokodon-25.04.0.patchset b/net-im/tokodon/patches/tokodon-25.04.0.patchset new file mode 100644 index 000000000..96567605e --- /dev/null +++ b/net-im/tokodon/patches/tokodon-25.04.0.patchset @@ -0,0 +1,32 @@ +From 65d0634c32a9e55c1f4f3cc2ecbdc8bc753e9e59 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Fri, 18 Apr 2025 16:24:35 +0200 +Subject: Revert requirement for Qt version from 6.8.0 + +This works for now, but will fail in the future + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cfab9dc..b61641d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,7 +14,7 @@ project(tokodon VERSION ${RELEASE_SERVICE_VERSION}) + option(SAILFISHOS "Build for sailfishOS" OFF) + + set(KF_MIN_VERSION "6.11.0") +-set(QT_MIN_VERSION "6.8.0") ++set(QT_MIN_VERSION "6.7.0") + + include(FeatureSummary) + +@@ -150,8 +150,6 @@ if (ANDROID) + include(ECMAddAndroidApk) + endif () + +-qt_policy(SET QTP0004 NEW) +- + ecm_setup_version(${PROJECT_VERSION} + VARIABLE_PREFIX TOKODON + VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/tokodon-version.h +-- +2.48.1 + diff --git a/net-im/tokodon/tokodon-25.04.0.recipe b/net-im/tokodon/tokodon-25.04.0.recipe index 9d27908fd..54ec2a595 100644 --- a/net-im/tokodon/tokodon-25.04.0.recipe +++ b/net-im/tokodon/tokodon-25.04.0.recipe @@ -3,9 +3,10 @@ DESCRIPTION="Tokodon is a Mastodon client. It allows you to interact with the Fe HOMEPAGE="https://invent.kde.org/network/tokodon" COPYRIGHT="2021-2025 KDE Organisation" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/tokodon-$portVersion.tar.xz" CHECKSUM_SHA256="578d241218994ca4854a386413e9ec7a7c022a183e6fed36554a30fb66aa78ba" +PATCHES="tokodon-$portVersion.patchset" ADDITIONAL_FILES="tokodon.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -58,6 +59,7 @@ BUILD_REQUIRES=" # KF6 extra_cmake_modules$secondaryArchSuffix qqc2_desktop_style6${secondaryArchSuffix}_devel + devel:libKF6CalendarEvents$secondaryArchSuffix devel:libKF6ColorScheme$secondaryArchSuffix devel:libKF6ConfigCore$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix @@ -66,6 +68,7 @@ BUILD_REQUIRES=" devel:libKF6ItemModels$secondaryArchSuffix devel:libKF6KIOCore$secondaryArchSuffix devel:libKF6Notifications$secondaryArchSuffix + devel:libKF6Prison$secondaryArchSuffix devel:libKF6Purpose$secondaryArchSuffix devel:libKF6WindowSystem$secondaryArchSuffix devel:libKirigami$secondaryArchSuffix @@ -97,7 +100,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DUSE_QTMULTIMEDIA=ON \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_TESTING=OFF \ -Wno-dev