diff --git a/dev-build/cmake/cmake-3.31.2.recipe b/dev-build/cmake/cmake-3.31.5.recipe similarity index 98% rename from dev-build/cmake/cmake-3.31.2.recipe rename to dev-build/cmake/cmake-3.31.5.recipe index 0ee014b7b..329b580b1 100644 --- a/dev-build/cmake/cmake-3.31.2.recipe +++ b/dev-build/cmake/cmake-3.31.5.recipe @@ -5,11 +5,11 @@ simple platform and compiler independent configuration files. CMake generates \ native makefiles and workspaces that can be used in the compiler environment \ of your choice." HOMEPAGE="https://cmake.org/" -COPYRIGHT="2002-2024 Kitware, Inc., Insight Consortium" +COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium" LICENSE="CMake" REVISION="1" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" -CHECKSUM_SHA256="42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2" +CHECKSUM_SHA256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27" PATCHES="cmake-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" diff --git a/dev-build/cmake/cmake_gui-3.31.2.recipe b/dev-build/cmake/cmake_gui-3.31.5.recipe similarity index 96% rename from dev-build/cmake/cmake_gui-3.31.2.recipe rename to dev-build/cmake/cmake_gui-3.31.5.recipe index d8a48b158..95e0f909f 100644 --- a/dev-build/cmake/cmake_gui-3.31.2.recipe +++ b/dev-build/cmake/cmake_gui-3.31.5.recipe @@ -8,11 +8,11 @@ of your choice. This package provides the GUI version of CMake (cmake-gui). It must be \ installed in the same prefix as the main cmake package." HOMEPAGE="https://cmake.org/" -COPYRIGHT="2002-2024 Kitware, Inc., Insight Consortium" +COPYRIGHT="2002-2025 Kitware, Inc., Insight Consortium" LICENSE="CMake" REVISION="1" SOURCE_URI="https://cmake.org/files/v${portVersion%.*}/cmake-$portVersion.tar.gz" -CHECKSUM_SHA256="42abb3f48f37dbd739cdfeb19d3712db0c5935ed5c2aef6c340f9ae9114238a2" +CHECKSUM_SHA256="66fb53a145648be56b46fa9e8ccade3a4d0dfc92e401e52ce76bdad1fea43d27" SOURCE_DIR="cmake-$portVersion" PATCHES="cmake-$portVersion.patchset" ADDITIONAL_FILES="cmake.rdef.in" diff --git a/dev-build/cmake/patches/cmake-3.31.2.patchset b/dev-build/cmake/patches/cmake-3.31.5.patchset similarity index 72% rename from dev-build/cmake/patches/cmake-3.31.2.patchset rename to dev-build/cmake/patches/cmake-3.31.5.patchset index a4747c1be..b11ad880a 100644 --- a/dev-build/cmake/patches/cmake-3.31.2.patchset +++ b/dev-build/cmake/patches/cmake-3.31.5.patchset @@ -1,4 +1,4 @@ -From e8ab324a5becd49d55d58f2334a706763afe4196 Mon Sep 17 00:00:00 2001 +From 896984ac0e48b1ef6aaa99ebe709159de0461cd2 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sat, 24 Mar 2018 14:19:43 +0100 Subject: Fix search path for Lua headers. @@ -21,7 +21,7 @@ index 2249ab1..b010f9a 100644 2.45.2 -From 7515ba97d5ffcf2f28a6d081d33538efbec58a60 Mon Sep 17 00:00:00 2001 +From 53df0ab3ae6e0452ccffe903229227d00a8880c9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 17:29:56 +0200 Subject: links against libnetwork @@ -45,7 +45,7 @@ index 53358d5..95e1631 100755 2.45.2 -From b91622a227972c2fc2f0c28d505c0841136d5c9e Mon Sep 17 00:00:00 2001 +From edbe9c67c3c9a9df96fe9aefbd8cbf8033889d0c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 7 Sep 2019 23:46:47 +0200 Subject: bootstrap uses cmlibuv @@ -80,7 +80,7 @@ index 83e8b61..314f239 100644 2.45.2 -From 703627de82b442f364dd7c18583c4a16e7b01f79 Mon Sep 17 00:00:00 2001 +From f56b12d30b173e0b5e6cbc2d082681ede488a572 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 @@ -106,7 +106,7 @@ index 7d9a737..74b17f5 100644 2.45.2 -From d36207221d0c705e4100df4a130a2e0890888222 Mon Sep 17 00:00:00 2001 +From 41d9dc27850b199d4ba9e004e46c0bfd4c009118 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. @@ -130,7 +130,7 @@ index 74b17f5..41d77bb 100644 2.45.2 -From c7f14c9733348367b85b36aef88a7755f793bce4 Mon Sep 17 00:00:00 2001 +From 6e2b9d9887dfff82726ddd87a87623e128db78c2 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 @@ -155,7 +155,7 @@ index 83c818d..668ed54 100644 2.45.2 -From 7e6ef9c60c83d57544ca3fab3baa1f2a240627f6 Mon Sep 17 00:00:00 2001 +From 9910fc23d478fdb9aa5371302557adfad6deee44 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/ @@ -199,7 +199,7 @@ index cc150fd..07a7c24 100644 2.45.2 -From 2c202127185a7a64ea788285fa833ff423277253 Mon Sep 17 00:00:00 2001 +From ccdcc868d50cafcd296dc590b4820b3f8eb57e2b 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. @@ -222,7 +222,7 @@ index da20534..97bcdc2 100644 2.45.2 -From c00e68a4fe0cf9944adca0a9ac8bb9171240150b Mon Sep 17 00:00:00 2001 +From f3ba72d01431c5a6e5474c3373782a3194501e30 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 9 Feb 2024 13:48:22 +0100 Subject: Haiku: enable debugger @@ -259,7 +259,7 @@ index c4cd101..00f3209 100644 2.45.2 -From 1a85574845a27418df36db2d6cf5c0b0e9bea465 Mon Sep 17 00:00:00 2001 +From 2d34136f2a19c93be7b05ff50b54792948fbb48a 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 @@ -289,7 +289,7 @@ index 933d649..666f543 100644 2.45.2 -From 3fb60e7cf0c62cc07339f2018e4e1dc89124a0f9 Mon Sep 17 00:00:00 2001 +From 79a7bb3ec990cfcc5cb76fdc18db63c179787bf1 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 @@ -316,7 +316,7 @@ index c741ec1..30b638f 100644 2.45.2 -From c48ed5d6b4c94e309b9c0267d1660a00077df209 Mon Sep 17 00:00:00 2001 +From e6d256b3b28ab8b31904c9d688ce6595b07997b5 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. @@ -350,7 +350,7 @@ index 30b638f..61780d7 100644 2.45.2 -From ade78116854649213b4a7bc9550b38bf0f85d607 Mon Sep 17 00:00:00 2001 +From d9263b179508e3dec5e056b8f618157b842c629f 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. @@ -375,3 +375,107 @@ index e4b53fd..3938f3e 100644 -- 2.45.2 + +From b3979d2fa09129e1e4bdc18d7d108df075b980c5 Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Mon, 10 Feb 2025 14:59:31 +0100 +Subject: Build fixes (Linker configuration) + +Related:https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9992 + +diff --git a/Modules/Platform/Linker/Haiku-ASM.cmake b/Modules/Platform/Linker/Haiku-ASM.cmake +new file mode 100644 +index 0000000..9e8a2b3 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-ASM.cmake +@@ -0,0 +1,5 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++# GNU is the default linker ++include(Platform/Linker/Haiku-GNU-ASM) +diff --git a/Modules/Platform/Linker/Haiku-C.cmake b/Modules/Platform/Linker/Haiku-C.cmake +new file mode 100644 +index 0000000..4abf4a7 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-C.cmake +@@ -0,0 +1,5 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++# GNU is the default linker ++include(Platform/Linker/Haiku-GNU-C) +diff --git a/Modules/Platform/Linker/Haiku-CXX.cmake b/Modules/Platform/Linker/Haiku-CXX.cmake +new file mode 100644 +index 0000000..96fd0f8 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-CXX.cmake +@@ -0,0 +1,5 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++# GNU is the default linker ++include(Platform/Linker/Haiku-GNU-CXX) +diff --git a/Modules/Platform/Linker/Haiku-GNU-ASM.cmake b/Modules/Platform/Linker/Haiku-GNU-ASM.cmake +new file mode 100644 +index 0000000..bfef8b9 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-GNU-ASM.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-GNU-ASM) +diff --git a/Modules/Platform/Linker/Haiku-GNU-C.cmake b/Modules/Platform/Linker/Haiku-GNU-C.cmake +new file mode 100644 +index 0000000..2d0efda +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-GNU-C.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-GNU-C) +diff --git a/Modules/Platform/Linker/Haiku-GNU-CXX.cmake b/Modules/Platform/Linker/Haiku-GNU-CXX.cmake +new file mode 100644 +index 0000000..33c46d5 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-GNU-CXX.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-GNU-CXX) +diff --git a/Modules/Platform/Linker/Haiku-LLD-ASM.cmake b/Modules/Platform/Linker/Haiku-LLD-ASM.cmake +new file mode 100644 +index 0000000..870e59e +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-LLD-ASM.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-LLD-ASM) +diff --git a/Modules/Platform/Linker/Haiku-LLD-C.cmake b/Modules/Platform/Linker/Haiku-LLD-C.cmake +new file mode 100644 +index 0000000..efeeb16 +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-LLD-C.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-LLD-C) +diff --git a/Modules/Platform/Linker/Haiku-LLD-CXX.cmake b/Modules/Platform/Linker/Haiku-LLD-CXX.cmake +new file mode 100644 +index 0000000..46a516c +--- /dev/null ++++ b/Modules/Platform/Linker/Haiku-LLD-CXX.cmake +@@ -0,0 +1,4 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++include(Platform/Linker/Linux-LLD-CXX) +-- +2.45.2 +