diff --git a/nix/build-all.py b/nix/build-all.py index c445361ab7..86ea3b459e 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -75,7 +75,7 @@ ADD_COMMIT_SHA = os.getenv("ADD_COMMIT_SHA") PYTHON_VERSIONS = ["3.7.16", "3.8.16", "3.9.16", "3.10.10", "3.11.2"] JSON_VERSION = "v3.6.1" OCE_VERSION = "0.18.3" -OCCT_VERSION = "7.5.3" +OCCT_VERSION = "7.7.1" BOOST_VERSION = "1.80.0" PCRE_VERSION = "8.41" LIBXML2_VERSION = "2.9.11" @@ -553,6 +553,9 @@ if USE_OCCT and "occ" in targets: patches = [] if OCCT_VERSION < "7.4": patches.append("./patches/occt/enable-exception-handling.patch") + + if OCCT_VERSION == "7.7.1": + patches.append("./patches/occt/no_ExpToCasExe.patch") if "wasm" in flags: patches.append("./patches/occt/no_em_js.patch") @@ -567,7 +570,7 @@ if USE_OCCT and "occ" in targets: "-DBUILD_RELEASE_DISABLE_EXCEPTIONS=Off", f"-D3RDPARTY_FREETYPE_DIR={DEPS_DIR}/install/freetype" ], - download_url = "https://github.com/Open-Cascade-SAS/OCCT", + download_url = "https://git.dev.opencascade.org/repos/occt.git", download_name = "occt", download_tool=download_tool_git, patch=patches, diff --git a/nix/patches/occt/no_ExpToCasExe.patch b/nix/patches/occt/no_ExpToCasExe.patch new file mode 100644 index 0000000000..6e10f2a9fb --- /dev/null +++ b/nix/patches/occt/no_ExpToCasExe.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd17283f77..6cecf9dad3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -826,6 +826,8 @@ if (EMSCRIPTEN) + list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe) + endif() + ++list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe) ++ + # bison + if (BUILD_YACCLEX) + OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")