From 7da870b568835cf8cc78c2730e68a2fa550a675c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 8 Feb 2025 11:15:10 +0100 Subject: [PATCH] tokodon, bump version (#11749) --- ...n-24.12.1.patchset => tokodon-24.12.2.patchset} | 6 +++--- ...kodon-24.12.1.recipe => tokodon-24.12.2.recipe} | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) rename net-im/tokodon/patches/{tokodon-24.12.1.patchset => tokodon-24.12.2.patchset} (99%) rename net-im/tokodon/{tokodon-24.12.1.recipe => tokodon-24.12.2.recipe} (92%) diff --git a/net-im/tokodon/patches/tokodon-24.12.1.patchset b/net-im/tokodon/patches/tokodon-24.12.2.patchset similarity index 99% rename from net-im/tokodon/patches/tokodon-24.12.1.patchset rename to net-im/tokodon/patches/tokodon-24.12.2.patchset index 1dce59ad6..b8d706290 100644 --- a/net-im/tokodon/patches/tokodon-24.12.1.patchset +++ b/net-im/tokodon/patches/tokodon-24.12.2.patchset @@ -1,11 +1,11 @@ -From 1bbc62384aae083974584b65f558de9d5855f1c8 Mon Sep 17 00:00:00 2001 +From c0bb57e3679f977a6ed7d061f68dd334206a59a9 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 739792e..6517e09 100644 +index d6fb20a..69046e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -124,7 +124,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID AND NOT TOKODON_FLATPAK) @@ -21,7 +21,7 @@ index 739792e..6517e09 100644 2.45.2 -From eb06d96dd51431ddb222f6b9f5a42f0b4173fb05 Mon Sep 17 00:00:00 2001 +From 11ee5e3e7f91b11ee8da90ef62b8501b78713919 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/net-im/tokodon/tokodon-24.12.1.recipe b/net-im/tokodon/tokodon-24.12.2.recipe similarity index 92% rename from net-im/tokodon/tokodon-24.12.1.recipe rename to net-im/tokodon/tokodon-24.12.2.recipe index 0e1723213..6b7bc1ee5 100644 --- a/net-im/tokodon/tokodon-24.12.1.recipe +++ b/net-im/tokodon/tokodon-24.12.2.recipe @@ -5,7 +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="ebed54913409d96214abdf6ae7c0c576ed3fa1dd63c0fef99dc6d48ede06f07f" +CHECKSUM_SHA256="cbcd2a96689a3545613972dc8704398650cb83c2b0c290f61b7cad89c5be7763" PATCHES="tokodon-$portVersion.patchset" ADDITIONAL_FILES="tokodon.rdef.in" @@ -14,8 +14,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" tokodon$secondaryArchSuffix = $portVersion - cmd:tokodon$secondaryArchSuffix = $portVersion - cmd:tokodon_offline$secondaryArchSuffix = $portVersion + app:Tokodon$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -112,12 +111,15 @@ INSTALL() { make -C build install + mkdir -p $appsDir + mv $binDir/tokodon $appsDir/Tokodon + local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" local MINOR="`echo "$portVersion" | cut -d. -f3`" local APP_NAME="Tokodon" local LONG_INFO="$SUMMARY" - local APP_SIGNATURE="application/x-vnd.tokodon" + local APP_SIGNATURE="application/x-vnd.kde.tokodon" sed \ -e "s|@MAJOR@|$MAJOR|" \ -e "s|@MIDDLE@|$MIDDLE|" \ @@ -127,9 +129,9 @@ INSTALL() -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ $portDir/additional-files/tokodon.rdef.in > tokodon.rdef - addResourcesToBinaries tokodon.rdef $binDir/tokodon + addResourcesToBinaries tokodon.rdef $appsDir/Tokodon - addAppDeskbarSymlink $binDir/tokodon Tokodon + addAppDeskbarSymlink $appsDir/Tokodon } TEST()