mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
abaddon: bump version (#13807)
This commit is contained in:
@@ -10,14 +10,14 @@ HOMEPAGE="https://github.com/uowuo/abaddon/"
|
||||
COPYRIGHT="2025 uowuo"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="3"
|
||||
srcGitRev="b749075df62c36a2f95c162ca3e44507c2ff512f"
|
||||
srcGitRev="892f73305e8afbb742bef994d5a4c22e5f58b7f6"
|
||||
SOURCE_URI="https://github.com/uowuo/abaddon/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="537f196abe8dd2b932bad06ab54f35b40a81048580f62990b7b361f6c10f82df"
|
||||
CHECKSUM_SHA256="cce59ae348b8d7669cdb64ac7d23f6d9b69638ec39bfcb008aafcbac95744d99"
|
||||
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_2="https://github.com/machinezone/IXWebSocket/archive/refs/tags/v11.4.6.tar.gz"
|
||||
CHECKSUM_SHA256_2="c024334f8e45980836c67008979a884d6dcc5ef067dd2eb1fa7241f4c17ddc32"
|
||||
SOURCE_DIR_2="IXWebSocket-11.4.6"
|
||||
srcGitRev_3="22fac31bdf81da68730c177c0e931c93234d2a30"
|
||||
SOURCE_URI_3="https://github.com/nayuki/QR-Code-generator/archive/$srcGitRev_3.tar.gz"
|
||||
CHECKSUM_SHA256_3="218e3e96ded7880d05f47c668aad6541a08e63303ac4d783720389087da6f4ed"
|
||||
@@ -5,7 +5,7 @@ Subject: fix build for haiku
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 49bc2ec..be6b650 100644
|
||||
index 1551d0a..f476113 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -33,6 +33,10 @@ if (MINGW OR WIN32)
|
||||
@@ -19,16 +19,13 @@ index 49bc2ec..be6b650 100644
|
||||
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"))
|
||||
@@ -70,7 +74,8 @@ if (NOT (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
|
||||
target_precompile_headers(abaddon PRIVATE <gtkmm.h> src/abaddon.hpp src/util.hpp)
|
||||
endif ()
|
||||
|
||||
-if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
|
||||
-if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1"))
|
||||
+if (NOT (CMAKE_SYSTEM_NAME STREQUAL "Haiku") AND
|
||||
+((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR
|
||||
(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
|
||||
-((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_CXX_COMPILER_VERSION LESS 9))))
|
||||
+((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_CXX_COMPILER_VERSION LESS 9)))))
|
||||
+((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.1")))
|
||||
target_link_libraries(abaddon stdc++fs)
|
||||
endif ()
|
||||
|
||||
Reference in New Issue
Block a user