From 4a67c0ce3f9d486ca855721498ec6494bbe7d0ab Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 8 Sep 2025 13:51:16 -0400 Subject: [PATCH] fix patches Signed-off-by: crueter --- CMakeModules/CPM.cmake | 2 +- CMakeModules/CPMUtil.cmake | 2 +- cpmfile.json | 2 +- externals/cpmfile.json | 11 ++++------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CMakeModules/CPM.cmake b/CMakeModules/CPM.cmake index eb35d3ef4c..f01a7a203e 100644 --- a/CMakeModules/CPM.cmake +++ b/CMakeModules/CPM.cmake @@ -593,7 +593,7 @@ function(cpm_add_patches) endif() # Add the patch command to the list # use binary because DOS SUCKS - list(APPEND temp_list "${PATCH_EXECUTABLE}" "--binary" "-p1" "<" "${PATCH_FILE}") + list(APPEND temp_list "${PATCH_EXECUTABLE}" "-p1" "<" "${PATCH_FILE}") endforeach() # Move temp out into parent scope. diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index 80397b507f..db9cce4c66 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -146,7 +146,7 @@ function(AddJsonPackage) get_json_element("${object}" url url "") get_json_element("${object}" key key "") get_json_element("${object}" tag tag "") - get_json_element("${object}" raw_artifact artifact "") + get_json_element("${object}" artifact artifact "") get_json_element("${object}" git_version git_version "") get_json_element("${object}" git_host git_host "") get_json_element("${object}" source_subdir source_subdir "") diff --git a/cpmfile.json b/cpmfile.json index 58fd1bc95a..d6fb24cf83 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -12,7 +12,7 @@ "repo": "boostorg/boost", "tag": "boost-%VERSION%", "artifact": "%TAG%-cmake.tar.xz", - "hash": "56e654724842d891a2755a9d9d7442c5b239c5aeb806e526ae889a7f51748c08e8aabe76b27415e550bdf2e3051bdf87ab39df32aba0edd1c52e1d11cffcb897", + "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9", "git_version": "1.89.0", "version": "1.57", "patches": [ diff --git a/externals/cpmfile.json b/externals/cpmfile.json index f11c5bb11b..57258f771b 100644 --- a/externals/cpmfile.json +++ b/externals/cpmfile.json @@ -1,12 +1,9 @@ { "mbedtls": { - "repo": "Mbed-TLS/mbedtls", - "sha": "8c88150ca1", - "hash": "769ad1e94c570671071e1f2a5c0f1027e0bf6bcdd1a80ea8ac970f2c86bc45ce4e31aa88d6d8110fc1bed1de81c48bc624df1b38a26f8b340a44e109d784a966", - "find_args": "MODULE", - "patches": [ - "0001-cmake-version.patch" - ] + "repo": "eden-emulator/mbedtls", + "sha": "ce4f81f4a9", + "hash": "f2e7f887651b28745e508149214d409fd7cfdb92cb94b4146b47ff1e0fc09e47143f203ac18e34c2c1814b5bd031d04c74828676c0d4342920a2ddb7fd35e9a5", + "find_args": "MODULE" }, "spirv-headers": { "package": "SPIRV-Headers",