From 31e90c4252bcc5fc4c89f3af8c74cefecb9b261d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 18 Apr 2025 15:35:29 +0200 Subject: [PATCH] tokodon, bump to 25.04.0 (#12199) Currently the Haiku icon theme is kinda broken for this Previous patch for this doesn't work anymore --- .../tokodon/patches/tokodon-24.12.3.patchset | 460 ------------------ ...-24.12.3.recipe => tokodon-25.04.0.recipe} | 11 +- 2 files changed, 4 insertions(+), 467 deletions(-) delete mode 100644 net-im/tokodon/patches/tokodon-24.12.3.patchset rename net-im/tokodon/{tokodon-24.12.3.recipe => tokodon-25.04.0.recipe} (93%) diff --git a/net-im/tokodon/patches/tokodon-24.12.3.patchset b/net-im/tokodon/patches/tokodon-24.12.3.patchset deleted file mode 100644 index 1aacd6e04..000000000 --- a/net-im/tokodon/patches/tokodon-24.12.3.patchset +++ /dev/null @@ -1,460 +0,0 @@ -From 9d6c65a72f7e07973d9fc10befb7de5e58b1448f Mon Sep 17 00:00:00 2001 -From: Schrijvers Luc -Date: Fri, 20 Dec 2024 15:29:06 +0100 -Subject: Disable KF6DBusAddons on Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd182b2..e95b97b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -124,7 +124,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT TOKODON_FLATPAK) - ) - endif () - --if (NOT ANDROID AND NOT WIN32 AND NOT APPLE) -+if (NOT ANDROID AND NOT WIN32 AND NOT APPLE AND NOT HAIKU) - find_package(KF6DBusAddons ${KF_MIN_VERSION}) - set_package_properties(KF6DBusAddons PROPERTIES - TYPE REQUIRED --- -2.48.1 - - -From 4e412490ee0286230858ab46faecfd303b6a84f8 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 31 Mar 2024 11:36:18 +1000 -Subject: Style fixes for Haiku - - -diff --git a/src/content/ui/Main.qml b/src/content/ui/Main.qml -index dcab321..47b82b6 100644 ---- a/src/content/ui/Main.qml -+++ b/src/content/ui/Main.qml -@@ -459,7 +459,7 @@ StatefulApp.StatefulWindow { - } - } - property Kirigami.Action globalTimelineAction: Kirigami.Action { -- icon.name: "kstars_xplanet" -+ icon.name: "globe" - text: i18n("Global") - checkable: true - onTriggered: { -@@ -475,7 +475,7 @@ StatefulApp.StatefulWindow { - } - - property Kirigami.Action conversationAction: Kirigami.Action { -- icon.name: "tokodon-chat-reply" -+ icon.name: "dialog-messages" - text: i18n("Conversations") - checkable: true - onTriggered: { -@@ -502,7 +502,7 @@ StatefulApp.StatefulWindow { - } - - property Kirigami.Action bookmarksAction: Kirigami.Action { -- icon.name: "bookmarks" -+ icon.name: "bookmarks-organize" - text: i18n("Bookmarks") - checkable: true - onTriggered: { -@@ -518,7 +518,7 @@ StatefulApp.StatefulWindow { - } - - property Kirigami.Action exploreAction: Kirigami.Action { -- icon.name: "kstars_planets" -+ icon.name: "view-process-system" - text: i18n("Explore") - checkable: true - onTriggered: { -diff --git a/src/content/ui/PostDelegate/InteractionButton.qml b/src/content/ui/PostDelegate/InteractionButton.qml -index b7cc65f..55eb9cb 100644 ---- a/src/content/ui/PostDelegate/InteractionButton.qml -+++ b/src/content/ui/PostDelegate/InteractionButton.qml -@@ -41,7 +41,7 @@ QQC2.ToolButton { - - source: control.interacted ? control.interactedIconName : control.iconName - -- isMask: true -+ isMask: false - color: (interactable && parent.activeFocus) ? Kirigami.Theme.focusColor : (control.interacted ? control.interactionColor : Kirigami.Theme.textColor) - } - -diff --git a/src/icons/tokodon-chat-reply.svg b/src/icons/tokodon-chat-reply.svg -index 24a65c5..52329b4 100644 ---- a/src/icons/tokodon-chat-reply.svg -+++ b/src/icons/tokodon-chat-reply.svg -@@ -1,11 +1,19 @@ -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/src/icons/tokodon-post-bookmark.svg b/src/icons/tokodon-post-bookmark.svg -new file mode 100644 -index 0000000..e4d9bfc ---- /dev/null -+++ b/src/icons/tokodon-post-bookmark.svg -@@ -0,0 +1,51 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/src/icons/tokodon-post-bookmarked.svg b/src/icons/tokodon-post-bookmarked.svg -index 05d9343..d39f89f 100644 ---- a/src/icons/tokodon-post-bookmarked.svg -+++ b/src/icons/tokodon-post-bookmarked.svg -@@ -1,4 +1,47 @@ -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/src/icons/tokodon-post-boost.svg b/src/icons/tokodon-post-boost.svg -index 4d1287f..8492fa7 100644 ---- a/src/icons/tokodon-post-boost.svg -+++ b/src/icons/tokodon-post-boost.svg -@@ -1,12 +1,37 @@ -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/icons/tokodon-post-boosted.svg b/src/icons/tokodon-post-boosted.svg -index 50c4c12..c8e895d 100644 ---- a/src/icons/tokodon-post-boosted.svg -+++ b/src/icons/tokodon-post-boosted.svg -@@ -1,11 +1,37 @@ -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/icons/tokodon-post-favorite.svg b/src/icons/tokodon-post-favorite.svg -index b52d315..e771e1f 100644 ---- a/src/icons/tokodon-post-favorite.svg -+++ b/src/icons/tokodon-post-favorite.svg -@@ -1,8 +1,22 @@ -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/src/icons/tokodon-post-favorited.svg b/src/icons/tokodon-post-favorited.svg -index 9759a38..66104d1 100644 ---- a/src/icons/tokodon-post-favorited.svg -+++ b/src/icons/tokodon-post-favorited.svg -@@ -1,5 +1,22 @@ -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - -diff --git a/src/icons/tokodon-post-reply-filled.svg b/src/icons/tokodon-post-reply-filled.svg -index f25dc9e..ca51602 100644 ---- a/src/icons/tokodon-post-reply-filled.svg -+++ b/src/icons/tokodon-post-reply-filled.svg -@@ -1,6 +1,19 @@ -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - -diff --git a/src/icons/tokodon-post-reply.svg b/src/icons/tokodon-post-reply.svg -index bc53d1e..52329b4 100644 ---- a/src/icons/tokodon-post-reply.svg -+++ b/src/icons/tokodon-post-reply.svg -@@ -1,11 +1,19 @@ -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - --- -2.48.1 - diff --git a/net-im/tokodon/tokodon-24.12.3.recipe b/net-im/tokodon/tokodon-25.04.0.recipe similarity index 93% rename from net-im/tokodon/tokodon-24.12.3.recipe rename to net-im/tokodon/tokodon-25.04.0.recipe index 76e4fa737..9d27908fd 100644 --- a/net-im/tokodon/tokodon-24.12.3.recipe +++ b/net-im/tokodon/tokodon-25.04.0.recipe @@ -5,8 +5,7 @@ COPYRIGHT="2021-2025 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="62b2ddcc8caee8889d835a01d06340199040cea46bf858dbaea3b391bb36a6aa" -PATCHES="tokodon-$portVersion.patchset" +CHECKSUM_SHA256="578d241218994ca4854a386413e9ec7a7c022a183e6fed36554a30fb66aa78ba" ADDITIONAL_FILES="tokodon.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -22,10 +21,8 @@ REQUIRES=" qqc2_desktop_style6$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libKirigamiAddonsStatefulApp$secondaryArchSuffix -# lib:libKUnifiedPush$secondaryArchSuffix lib:libopenal$secondaryArchSuffix lib:libQt6Keychain$secondaryArchSuffix -# lib:libcrypto$secondaryArchSuffix # KF6 lib:libKF6ColorScheme$secondaryArchSuffix lib:libKF6Completion$secondaryArchSuffix @@ -33,8 +30,9 @@ REQUIRES=" lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix - lib:libKF6KIOCore$secondaryArchSuffix + lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6JobWidgets$secondaryArchSuffix + lib:libKF6KIOCore$secondaryArchSuffix lib:libKF6Notifications$secondaryArchSuffix lib:libKF6Service$secondaryArchSuffix lib:libKF6Solid$secondaryArchSuffix @@ -56,9 +54,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libKirigamiAddonsStatefulApp$secondaryArchSuffix -# devel:libKUnifiedPush$secondaryArchSuffix devel:libQt6Keychain$secondaryArchSuffix -# devel:libssl$secondaryArchSuffix >= 3 # KF6 extra_cmake_modules$secondaryArchSuffix qqc2_desktop_style6${secondaryArchSuffix}_devel @@ -66,6 +62,7 @@ BUILD_REQUIRES=" devel:libKF6ConfigCore$secondaryArchSuffix devel:libKF6Crash$secondaryArchSuffix devel:libKF6I18n$secondaryArchSuffix + devel:libKF6IconThemes$secondaryArchSuffix devel:libKF6ItemModels$secondaryArchSuffix devel:libKF6KIOCore$secondaryArchSuffix devel:libKF6Notifications$secondaryArchSuffix