diff --git a/dev-build/cmake/cmake-4.0.3.recipe b/dev-build/cmake/cmake-4.0.3.recipe index a9f3f37b8..742a15a8d 100644 --- a/dev-build/cmake/cmake-4.0.3.recipe +++ b/dev-build/cmake/cmake-4.0.3.recipe @@ -7,7 +7,7 @@ of your choice." HOMEPAGE="https://cmake.org/" COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium" LICENSE="CMake" -REVISION="2" +REVISION="3" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" CHECKSUM_SHA256="8d3537b7b7732660ea247398f166be892fe6131d63cc291944b45b91279f3ffb" PATCHES="cmake-$portVersion.patchset" diff --git a/dev-build/cmake/patches/cmake-4.0.3.patchset b/dev-build/cmake/patches/cmake-4.0.3.patchset index 92e78ecde..18f50bd4d 100644 --- a/dev-build/cmake/patches/cmake-4.0.3.patchset +++ b/dev-build/cmake/patches/cmake-4.0.3.patchset @@ -1,4 +1,4 @@ -From b6a2cbf344d23178edf6c025a05e0eeda31a9779 Mon Sep 17 00:00:00 2001 +From 5635a16b4eb16a49171888093638c35a5acb0d2c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 17:29:56 +0200 Subject: links against libnetwork @@ -22,7 +22,7 @@ index eb8a0ac..fceed48 100755 2.48.1 -From acd121c02fa89bd9e3ed470443606dd15d3f5119 Mon Sep 17 00:00:00 2001 +From b8fed1d4d0c0a1e0e1bb40cefd291aa742e31ad2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 23:46:47 +0200 Subject: bootstrap uses cmlibuv @@ -57,14 +57,40 @@ index 83e8b61..314f239 100644 2.48.1 -From 68cf4d619b6c751aaac0019feed5259a5ab9e3f7 Mon Sep 17 00:00:00 2001 +From 18414ba54a51101190ce30dc4327a67a9b85b940 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 21 Sep 2019 15:30:44 +0200 +Subject: Haiku: Improve secondary arch detection + +Find the directory when it's not the last in the list. + +diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake +index 3610389..7ce4298 100644 +--- a/Modules/Platform/Haiku.cmake ++++ b/Modules/Platform/Haiku.cmake +@@ -33,8 +33,8 @@ execute_process( + RESULT_VARIABLE _HAIKU_SEARCH_DIRS_FOUND + OUTPUT_STRIP_TRAILING_WHITESPACE) + +-string(REGEX MATCH "libraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/?(:?\n+)" _dummy "${_HAIKU_SEARCH_DIRS}\n") +-set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}") ++string(REGEX MATCH "libraries: =?([^\n]*:)?(/boot)?/system(/develop)?/lib/([^/]*)/?(:|\n)" _dummy "${_HAIKU_SEARCH_DIRS}\n") ++set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_4}") + + if(NOT CMAKE_HAIKU_SECONDARY_ARCH) + set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") +-- +2.48.1 + + +From f5e3fab109e11ededff65b8935d3befccb947a2a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 21 Feb 2020 15:38:39 -0500 Subject: Modules/Haiku: Set CMAKE_SYSTEM_FRAMEWORK_PATH. diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index 3610389..9ba64b0 100644 +index 7ce4298..0bae6a8 100644 --- a/Modules/Platform/Haiku.cmake +++ b/Modules/Platform/Haiku.cmake @@ -117,6 +117,9 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES @@ -81,7 +107,7 @@ index 3610389..9ba64b0 100644 2.48.1 -From 92e031ad15039ab18e3a31b74b264c3df573966b Mon Sep 17 00:00:00 2001 +From 0bfa68d08bbd29bcf02ce1d3f805a8e8b8e16b05 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 15 Apr 2021 21:09:12 +0200 Subject: disable dependency tracking for older GNU compilers @@ -106,7 +132,7 @@ index 141838e..1c90942 100644 2.48.1 -From db5153802103c7c43f29f886f77ed86d9ecbc43f Mon Sep 17 00:00:00 2001 +From 25b1b0aecfb9788b433723aff6ab2926e2f5585a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 20 Oct 2021 14:28:22 +0200 Subject: Haiku: fix install dirs, let FindPackage search in data/ @@ -150,7 +176,7 @@ index bae7d38..0e1df33 100644 2.48.1 -From 015fda3da31fb2aab872b93205080cc29e48b05e Mon Sep 17 00:00:00 2001 +From 1edf7dd9359c2caf8d3752383263b7c716f8fd7d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 23 Feb 2022 13:44:06 +0100 Subject: Disable weak symbols; they do not seem to behave correctly. @@ -173,7 +199,7 @@ index da20534..97bcdc2 100644 2.48.1 -From 58512ff36cfe1bf0ff72f4a28580e2c3cb9361fe Mon Sep 17 00:00:00 2001 +From 1b7a01d02ff7e30fdb9a2b7262d68527713147b8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 9 Feb 2024 13:48:22 +0100 Subject: Haiku: enable debugger @@ -210,7 +236,7 @@ index 1d078ee..57bc1be 100644 2.48.1 -From f9578bf744372427fb827c66d9dbe7af7a0903b3 Mon Sep 17 00:00:00 2001 +From 4e2d472b13303ebcbf7b1a9345ce6c3d8b36c045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= Date: Sat, 31 Aug 2024 21:52:20 +0200 Subject: Fix build for non-x86 arches @@ -240,7 +266,7 @@ index aca0324..3a24a7b 100644 2.48.1 -From 93dc3c3c84bb25372e76c33bc799369d3843792d Mon Sep 17 00:00:00 2001 +From 51b85b68676f5d17710d016c7998e5e5a67abded Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 25 Sep 2024 09:11:06 +0200 Subject: FindPython: when component Development is searched, also search @@ -267,7 +293,7 @@ index 3cd77e4..6f9481d 100644 2.48.1 -From cc435255fe990dceaf253f7c50695b42b332a8d8 Mon Sep 17 00:00:00 2001 +From 1161e5ceb9a5a5183b74966bcad4abf0162e596f Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Mon, 23 Sep 2024 05:40:41 -0300 Subject: Use 'headers' instead of 'include' as fallback. @@ -301,7 +327,7 @@ index 6f9481d..9dd58d0 100644 2.48.1 -From 19a3b4165ac03225c1116d284917b7365e5bd519 Mon Sep 17 00:00:00 2001 +From a87d1e8c1a0f86278b587cdacae3837e20296b8a Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 26 Sep 2024 15:16:36 -0300 Subject: Avoid installing icons, .desktop, and mime files.