From 075ecb12877149bc15a49434af5aff4c33b2d002 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 10 Apr 2025 13:02:51 +0200 Subject: [PATCH] abaddon, bump *version* to git commit (#12129) Fixes launch after spdlog update --- ...-0.2.1.recipe => abaddon-0.2.2~git.recipe} | 30 +++++++++------- .../abaddon-0.2.2~git-source3.patchset | 22 ++++++++++++ ....1.patchset => abaddon-0.2.2~git.patchset} | 36 ++++++++++--------- 3 files changed, 60 insertions(+), 28 deletions(-) rename net-im/abaddon/{abaddon-0.2.1.recipe => abaddon-0.2.2~git.recipe} (83%) create mode 100644 net-im/abaddon/patches/abaddon-0.2.2~git-source3.patchset rename net-im/abaddon/patches/{abaddon-0.2.1.patchset => abaddon-0.2.2~git.patchset} (89%) diff --git a/net-im/abaddon/abaddon-0.2.1.recipe b/net-im/abaddon/abaddon-0.2.2~git.recipe similarity index 83% rename from net-im/abaddon/abaddon-0.2.1.recipe rename to net-im/abaddon/abaddon-0.2.2~git.recipe index ccf7e47da..132c5e51b 100644 --- a/net-im/abaddon/abaddon-0.2.1.recipe +++ b/net-im/abaddon/abaddon-0.2.2~git.recipe @@ -9,22 +9,28 @@ filter. If you should get caught in the spam filter, you can usually appeal at d NOTE: currently this port does not support sound!" HOMEPAGE="https://github.com/uowuo/abaddon/" -COPYRIGHT="2024 uowuo" +COPYRIGHT="2025 uowuo" LICENSE="GNU GPL v3" -REVISION="2" -SOURCE_URI="https://github.com/uowuo/abaddon/archive/refs/tags/v0.2.1.tar.gz" -CHECKSUM_SHA256="407d14bc7659c65eca1c5266fb96a60b1e169b31c122159ae7f54e69a86e0b45" +REVISION="1" +srcGitRev="b749075df62c36a2f95c162ca3e44507c2ff512f" +SOURCE_URI="https://github.com/uowuo/abaddon/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="537f196abe8dd2b932bad06ab54f35b40a81048580f62990b7b361f6c10f82df" +SOURCE_FILENAME="abaddon-$portVersion-$srcGitRev.tar.gz" +SOURCE_DIR="abaddon-$srcGitRev" SOURCE_URI_2="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v11.4.5.tar.gz" CHECKSUM_SHA256_2="c5fc225edec32bf7d583e55347ef2c9c4940d005c13ef5e848354a85602f5fd6" SOURCE_DIR_2="IXWebSocket-11.4.5" -SOURCE_URI_3="https://github.com/mackron/miniaudio/archive/refs/tags/0.11.21.tar.gz" -CHECKSUM_SHA256_3="6afb5c231613d2fab4f1c668b7243ff9a7d6d78a7f5a2692c133f026fe508506" -SOURCE_DIR_3="miniaudio-0.11.21" -SOURCE_URI_4="https://github.com/nayuki/QR-Code-generator/archive/refs/tags/v1.8.0.tar.gz" -CHECKSUM_SHA256_4="2ec0a4d33d6f521c942eeaf473d42d5fe139abcfa57d2beffe10c5cf7d34ae60" -SOURCE_DIR_4="QR-Code-generator-1.8.0" +SOURCE_URI_3="https://github.com/mackron/miniaudio/archive/refs/tags/0.11.22.tar.gz" +CHECKSUM_SHA256_3="bcb07bfb27e6fa94d34da73ba2d5642d4940b208ec2a660dbf4e52e6b7cd492f" +SOURCE_DIR_3="miniaudio-0.11.22" +srcGitRev_4="22fac31bdf81da68730c177c0e931c93234d2a30" +SOURCE_URI_4="https://github.com/nayuki/QR-Code-generator/archive/$srcGitRev_4.tar.gz" +CHECKSUM_SHA256_4="218e3e96ded7880d05f47c668aad6541a08e63303ac4d783720389087da6f4ed" +SOURCE_FILENAME_4="QR-Code-generator-$srcGitRev.tar.gz" +SOURCE_DIR_4="QR-Code-generator-$srcGitRev_4" -PATCHES="abaddon-0.2.1.patchset" +PATCHES="abaddon-$portVersion.patchset" +PATCHES_3="abaddon-$portVersion-source3.patchset" ADDITIONAL_FILES="abaddon.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -128,7 +134,7 @@ INSTALL() { local APP_SIGNATURE="application/x-vnd.abaddon" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ -e "s|@MAJOR@|$MAJOR|" \ diff --git a/net-im/abaddon/patches/abaddon-0.2.2~git-source3.patchset b/net-im/abaddon/patches/abaddon-0.2.2~git-source3.patchset new file mode 100644 index 000000000..f142f19d9 --- /dev/null +++ b/net-im/abaddon/patches/abaddon-0.2.2~git-source3.patchset @@ -0,0 +1,22 @@ +From 6326ccbcb0fe69192f8ca41faa650900e66e4444 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Thu, 10 Apr 2025 09:20:08 +0200 +Subject: pthread_attr_setinheritsched, disable for Haiku + + +diff --git a/miniaudio.h b/miniaudio.h +index c74bebe..fbabf56 100644 +--- a/miniaudio.h ++++ b/miniaudio.h +@@ -16244,7 +16244,7 @@ static ma_result ma_thread_create__posix(ma_thread* pThread, ma_thread_priority + + /* I'm not treating a failure of setting the priority as a critical error so not aborting on failure here. */ + if (pthread_attr_setschedparam(&attr, &sched) == 0) { +- #if !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) ++ #if !defined(__HAIKU__) && !defined(MA_ANDROID) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) + { + pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); + } +-- +2.48.1 + diff --git a/net-im/abaddon/patches/abaddon-0.2.1.patchset b/net-im/abaddon/patches/abaddon-0.2.2~git.patchset similarity index 89% rename from net-im/abaddon/patches/abaddon-0.2.1.patchset rename to net-im/abaddon/patches/abaddon-0.2.2~git.patchset index d9aa30ca2..ad434f31d 100644 --- a/net-im/abaddon/patches/abaddon-0.2.1.patchset +++ b/net-im/abaddon/patches/abaddon-0.2.2~git.patchset @@ -1,16 +1,27 @@ -From 0dbd41d190666118220a41e539bd53b90b0486b3 Mon Sep 17 00:00:00 2001 +From 543ce85e4111315916d42c7053354e7c51488c82 Mon Sep 17 00:00:00 2001 From: zeldakatze Date: Wed, 10 Apr 2024 23:11:58 +0200 Subject: fix build for haiku diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1b56fc..6e1d906 100644 +index 49bc2ec..be6b650 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -74,12 +74,17 @@ endif () +@@ -33,6 +33,10 @@ if (MINGW OR WIN32) + link_libraries(ws2_32) + endif () - target_precompile_headers(abaddon PRIVATE src/abaddon.hpp src/util.hpp) ++if (HAIKU) ++ link_libraries(network) ++endif () ++ + if (WIN32) + add_compile_definitions(_CRT_SECURE_NO_WARNINGS) + add_compile_definitions(NOMINMAX) +@@ -70,9 +74,10 @@ if (NOT (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) + target_precompile_headers(abaddon PRIVATE src/abaddon.hpp src/util.hpp) + endif () -if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR +if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Haiku") AND @@ -21,13 +32,6 @@ index d1b56fc..6e1d906 100644 target_link_libraries(abaddon stdc++fs) endif () -+if (CMAKE_SYSTEM_NAME STREQUAL "Haiku") -+ target_link_libraries(abaddon network) -+endif () -+ - if (NOT WIN32) - target_sources(abaddon PRIVATE src/notifications/notifier_gio.cpp) - else () diff --git a/cmake/Findatkmm.cmake b/cmake/Findatkmm.cmake index 68c3bc6..623d0e1 100644 --- a/cmake/Findatkmm.cmake @@ -111,20 +115,20 @@ index e0f56c0..d81eb15 100644 find_library(SIGC++_LIBRARY NAMES ${SIGC++_LIBRARY_FILE} -- -2.43.2 +2.48.1 -From 3059f8468983a8db4bc5bd70768ab004926510a7 Mon Sep 17 00:00:00 2001 +From 79e7e94116611ca6e710b36630c1ca910c3ae8a2 Mon Sep 17 00:00:00 2001 From: zeldakatze Date: Thu, 11 Apr 2024 00:16:45 +0200 Subject: abaddon: add haiku platform code diff --git a/src/platform.cpp b/src/platform.cpp -index 0a69721..47b6bbc 100644 +index 726655b..de75e8f 100644 --- a/src/platform.cpp +++ b/src/platform.cpp -@@ -215,6 +215,56 @@ std::string Platform::FindStateCacheFolder() { +@@ -224,6 +224,56 @@ std::string Platform::FindStateCacheFolder() { return home_path; } @@ -182,5 +186,5 @@ index 0a69721..47b6bbc 100644 #else std::string Platform::FindResourceFolder() { -- -2.43.2 +2.48.1