From 3b69b84893f5ec8e483787bcb2f7873624c009e9 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Wed, 15 Apr 2026 09:17:05 +0200
Subject: [PATCH] tokodon, bump to version 25.12.0 (#13843)

* tokodon, bump to version 25.12.3

use software rendering for QT_QUICK_BACKEND
---
 .../tokodon/patches/tokodon-25.08.3.patchset  | 46 -------------------
 .../tokodon/patches/tokodon-25.12.3.patchset  | 24 ++++++++++
 ...-25.08.3.recipe => tokodon-25.12.3.recipe} |  6 ++-
 3 files changed, 28 insertions(+), 48 deletions(-)
 delete mode 100644 net-im/tokodon/patches/tokodon-25.08.3.patchset
 create mode 100644 net-im/tokodon/patches/tokodon-25.12.3.patchset
 rename net-im/tokodon/{tokodon-25.08.3.recipe => tokodon-25.12.3.recipe} (95%)

diff --git a/net-im/tokodon/patches/tokodon-25.08.3.patchset b/net-im/tokodon/patches/tokodon-25.08.3.patchset
deleted file mode 100644
index 13032dec1..000000000
--- a/net-im/tokodon/patches/tokodon-25.08.3.patchset
+++ /dev/null
@@ -1,46 +0,0 @@
-From 5efd215f78b594c75141a5d4924388331bdf4f00 Mon Sep 17 00:00:00 2001
-From: Luc Schrijvers <begasus@gmail.com>
-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 533eccd..21abdae 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.12.0")
--set(QT_MIN_VERSION "6.8.0")
-+set(QT_MIN_VERSION "6.7.0")
- 
- include(FeatureSummary)
- 
--- 
-2.50.1
-
-
-From 2006aa364ab45700e66fbc4a8ddec82c92101be8 Mon Sep 17 00:00:00 2001
-From: Luc Schrijvers <begasus@gmail.com>
-Date: Mon, 18 Aug 2025 16:38:11 +0200
-Subject: Reset qt_policy
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 21abdae..ef5a335 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,8 +153,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.50.1
-
diff --git a/net-im/tokodon/patches/tokodon-25.12.3.patchset b/net-im/tokodon/patches/tokodon-25.12.3.patchset
new file mode 100644
index 000000000..3e1032bc9
--- /dev/null
+++ b/net-im/tokodon/patches/tokodon-25.12.3.patchset
@@ -0,0 +1,24 @@
+From 5e751071abf50507fad98d40fc7ddb2ca34f5337 Mon Sep 17 00:00:00 2001
+From: Luc Schrijvers <begasus@gmail.com>
+Date: Wed, 15 Apr 2026 09:08:27 +0200
+Subject: Use software rendering for QT_QUICK_BACKEND
+
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 2b98e7d..4c7a85c 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -55,6 +55,10 @@ int main(int argc, char *argv[])
+ {
+     QNetworkProxyFactory::setUseSystemConfiguration(true);
+ 
++#if defined(Q_OS_HAIKU)
++    qputenv("QT_QUICK_BACKEND", "software");
++#endif
++
+ #ifdef HAVE_WEBVIEW
+     QtWebView::initialize();
+ #endif
+-- 
+2.52.0
+
diff --git a/net-im/tokodon/tokodon-25.08.3.recipe b/net-im/tokodon/tokodon-25.12.3.recipe
similarity index 95%
rename from net-im/tokodon/tokodon-25.08.3.recipe
rename to net-im/tokodon/tokodon-25.12.3.recipe
index 79b4a0d58..05c868e44 100644
--- a/net-im/tokodon/tokodon-25.08.3.recipe
+++ b/net-im/tokodon/tokodon-25.12.3.recipe
@@ -1,11 +1,11 @@
 SUMMARY="KDE Mastodon client"
 DESCRIPTION="Tokodon is a Mastodon client. It allows you to interact with the Fediverse community."
 HOMEPAGE="https://invent.kde.org/network/tokodon"
-COPYRIGHT="2021-2025 KDE Organisation"
+COPYRIGHT="2021-2026 KDE Organisation"
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/tokodon-$portVersion.tar.xz"
-CHECKSUM_SHA256="33268f877b08589e90176530b15afabbd57abae66874f49073edf3706adea221"
+CHECKSUM_SHA256="f5197e65c8d7969f93deca601ac3d84493de22d3d2440bd50c5193af22defb28"
 PATCHES="tokodon-$portVersion.patchset"
 ADDITIONAL_FILES="tokodon.rdef.in"
 
@@ -39,6 +39,7 @@ REQUIRES="
 	lib:libKF6Notifications$secondaryArchSuffix
 	lib:libKF6Service$secondaryArchSuffix
 	lib:libKF6Solid$secondaryArchSuffix
+	lib:libKF6SonnetCore$secondaryArchSuffix
 	lib:libKF6WidgetsAddons$secondaryArchSuffix
 	lib:libKirigami$secondaryArchSuffix
 	# Qt6
@@ -73,6 +74,7 @@ BUILD_REQUIRES="
 	devel:libKF6Notifications$secondaryArchSuffix
 	devel:libKF6Prison$secondaryArchSuffix
 	devel:libKF6Purpose$secondaryArchSuffix
+	devel:libKF6SonnetCore$secondaryArchSuffix
 	devel:libKF6WindowSystem$secondaryArchSuffix
 	devel:libKirigami$secondaryArchSuffix
 	# Qt6