Merge branch 'FreeCAD:main' into main

sasobadovinac · Feb 9, 2024 · a3c44f6 · a3c44f6
2 parents 7fed83f + 03b4140
commit a3c44f6
Show file tree

Hide file tree

Showing 1,092 changed files with 87,282 additions and 68,949 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -98,3 +98,5 @@ db24eeec535f1f43fb3d5b63d24c5171af637880 # RE: Final application of pre-commit
 b8f8b232cb0882d171cb299e6f6279a516cdd6eb # Inspection: Final application of pre-commit
 c5c2ea3498f402c0c89916c46ddb071e22756622 # Assembly: Final application of pre-commit
 592c992b863549fde52741fd8830418168387695 # Assembly: Apply pre-commit to Assembly files
+94ca51b7799b2ac60a2a56d7e6e753bb97a73671 # PartDesign: Fix #9377 - issue with accuracy in AdditiveHelix (#11312)
+d472927bba7b2d8d151c99fb29cf1d8dd099ea7d # Correct PartDesign Helix feature negative angles (#11399)
diff --git a/.github/workflows/CI_cleanup.yml b/.github/workflows/CI_cleanup.yml
@@ -103,7 +103,7 @@ jobs:
  done
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ github.job }}-Logs
  path: |

diff --git a/.github/workflows/actions/windows/getCcache/action.yml b/.github/workflows/actions/windows/getCcache/action.yml
@@ -41,11 +41,11 @@ inputs:
  ccachedownloadpath:
  description: "Path where to download ccache"
  required: false
- default: https://github.com/ccache/ccache/releases/download/v4.8.2/
+ default: https://github.com/ccache/ccache/releases/download/v4.9/
  ccacheversion:
  description: "Ccache version to be downloaded"
  required: false
- default: ccache-4.8.2-windows-x86_64
+ default: ccache-4.9-windows-x86_64
 
 runs:
  using: "composite"

diff --git a/.github/workflows/sub_buildMacOSCondaApple.yml b/.github/workflows/sub_buildMacOSCondaApple.yml
@@ -151,15 +151,15 @@ jobs:
  reportFile: ${{env.reportdir}}${{ env.reportfilename }}
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  /var/crash/*FreeCAD*
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_buildMacOSCondaIntel.yml b/.github/workflows/sub_buildMacOSCondaIntel.yml
@@ -151,15 +151,15 @@ jobs:
  reportFile: ${{env.reportdir}}${{ env.reportfilename }}
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  /var/crash/*FreeCAD*
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_buildUbuntu2004.yml b/.github/workflows/sub_buildUbuntu2004.yml
@@ -239,15 +239,15 @@ jobs:
  reportFile: ${{env.reportdir}}${{ env.reportfilename }}
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  /var/crash/*FreeCAD*
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_buildUbuntu2204Conda.yml b/.github/workflows/sub_buildUbuntu2204Conda.yml
@@ -179,15 +179,15 @@ jobs:
  reportFile: ${{env.reportdir}}${{ env.reportfilename }}
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  /var/crash/*FreeCAD*
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_buildWindows.yml b/.github/workflows/sub_buildWindows.yml
@@ -63,7 +63,7 @@ jobs:
 
  steps:
  - name: Checking out source code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  submodules: true
  - name: Make needed directories, files and initializations
@@ -131,7 +131,7 @@ jobs:
  . $env:ccachebindir\ccache -s
  - name: Move libpack bin folder to build folder # Shorter in time than copying with CMake FREECAD_COPY_LIBPACK_BIN_TO_BUILD
  run: |
- Move-Item -Force -Path ${{ env.libpackdir }}bin -Destination ${{ env.builddir }}
+ Move-Item -Force -Path ${{ env.libpackdir }}bin/* -Destination ${{ env.builddir }}/bin
  - name: C++ unit tests
  if: false # Disabled because seems to not function on Windows build
  timeout-minutes: 1
@@ -142,7 +142,7 @@ jobs:
  . ${{ env.builddir }}\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}\integrationTests.log
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |

diff --git a/.github/workflows/sub_buildWindowsConda.yml b/.github/workflows/sub_buildWindowsConda.yml
@@ -121,7 +121,7 @@ jobs:
  . build\release\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}/integrationTests.log
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |

diff --git a/.github/workflows/sub_lint.yml b/.github/workflows/sub_lint.yml
@@ -761,15 +761,15 @@ jobs:
  [ $clazyQT6Errors -eq 0 ]
  - name: Upload logs and fixes
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  ${{ env.fixesdir }}
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_prepare.yml b/.github/workflows/sub_prepare.yml
@@ -148,14 +148,14 @@ jobs:
  echo "" >> $GITHUB_OUTPUT
  - name: Upload logs
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ inputs.artifactBasename }}-Logs
  path: |
  ${{ env.logdir }}
  - name: Upload report
  if: always()
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  with:
  name: ${{ env.reportfilename }}
  path: |

diff --git a/.github/workflows/sub_wrapup.yml b/.github/workflows/sub_wrapup.yml
@@ -54,7 +54,7 @@ jobs:
  run: |
  mkdir -p ${{ env.artifactsDownloadDir }}
  - name: Download artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
  with:
  path: ${{ env.artifactsDownloadDir }}
  - name: Save input data to file

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,17 @@
 # file types to ignore
 .*
-!/.gitignore
 !/.clang-format
+!/.clang-tidy
 !/.git-blame-ignore-revs
 !/.gitattributes
+!/.gitignore
+!/.gitmodules
+!/.pre-commit-config.yaml
+!/.pylintrc
+!/.github/
+!/contrib/.vscode/
+!*.gitattributes
+!*.gitignore
 *.DS_Store
 *.pyc
 *.obj

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -2,8 +2,8 @@
  "version": 3,
  "cmakeMinimumRequired": {
  "major": 3,
- "minor": 14,
- "patch": 0
+ "minor": 16,
+ "patch": 3
  },
  "configurePresets": [
  {
@@ -284,4 +284,4 @@
  ]
  }
  ]
- }
+ }
diff --git a/cMake/FindOCC.cmake b/cMake/FindOCC.cmake
@@ -127,8 +127,6 @@ if(OCC_FOUND)
  TKG2d
  TKG3d
  TKMath
- TKIGES
- TKSTL
  TKShHealing
  TKXSBase
  TKBool
@@ -139,10 +137,6 @@ if(OCC_FOUND)
  TKGeomBase
  TKOffset
  TKPrim
- TKSTEPBase
- TKSTEPAttr
- TKSTEP209
- TKSTEP
  TKHLR
  TKFeat
  )
@@ -154,8 +148,6 @@ if(OCC_FOUND)
  TKLCAF
  TKVCAF
  TKCDF
- TKXDESTEP
- TKXDEIGES
  TKMeshVS
  TKService
  TKV3d
@@ -164,6 +156,12 @@ if(OCC_FOUND)
  if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
  list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
  endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
+ if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
+ list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
+ list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
+ else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
+ list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
+ endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
  message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
  message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
  message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")

diff --git a/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake b/cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
@@ -14,7 +14,7 @@ macro(InitializeFreeCADBuildOptions)
  option(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
  option(BUILD_WITH_CONDA "Set ON if you build FreeCAD with conda" OFF)
  option(BUILD_DYNAMIC_LINK_PYTHON "If OFF extension-modules do not link against python-libraries" ON)
- option(INSTALL_TO_SITEPACKAGES "If ON the freecad root namespace (python) is installed into python's site-packages" OFF)
+ option(INSTALL_TO_SITEPACKAGES "If ON the freecad root namespace (python) is installed into python's site-packages" ON)
  option(OCCT_CMAKE_FALLBACK "disable usage of occt-config files" OFF)
  if (WIN32 OR APPLE)
  option(FREECAD_USE_QT_FILEDIALOG "Use Qt's file dialog instead of the native one." OFF)

diff --git a/cMake/FreeCAD_Helpers/SetupQt.cmake b/cMake/FreeCAD_Helpers/SetupQt.cmake
@@ -16,6 +16,9 @@ if(BUILD_GUI)
  endif()
  endif()
  list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools)
+ if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
+ list (APPEND FREECAD_QT_COMPONENTS Core5Compat)
+ endif()
  if (BUILD_WEB)
  list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets)
  endif()

diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
@@ -45,9 +45,9 @@ macro(SetupShibokenAndPyside)
  if(NOT SHIBOKEN_INCLUDE_DIR)
  find_pip_package(Shiboken${SHIBOKEN_MAJOR_VERSION})
  if (Shiboken${SHIBOKEN_MAJOR_VERSION}_FOUND)
- set(Shiboken_INCLUDE_DIR ${Shiboken${SHIBOKEN_MAJOR_VERSION}_INCLUDE_DIRS})
- set(Shiboken_LIBRARY ${Shiboken${SHIBOKEN_MAJOR_VERSION}_LIBRARIES})
- set(Shiboken_FOUND TRUE)
+ set(SHIBOKEN_INCLUDE_DIR ${Shiboken${SHIBOKEN_MAJOR_VERSION}_INCLUDE_DIRS})
+ set(SHIBOKEN_LIBRARY ${Shiboken${SHIBOKEN_MAJOR_VERSION}_LIBRARIES})
+ set(SHIBOKEN_FOUND TRUE)
  endif()
  endif()
 
@@ -60,9 +60,9 @@ macro(SetupShibokenAndPyside)
  if(NOT PYSIDE_INCLUDE_DIR)
  find_pip_package(PySide${PYSIDE_MAJOR_VERSION})
  if (PySide${PYSIDE_MAJOR_VERSION}_FOUND)
- set(PySide_INCLUDE_DIR ${PySide${PYSIDE_MAJOR_VERSION}_INCLUDE_DIRS})
- set(PySide_LIBRARY ${PySide${PYSIDE_MAJOR_VERSION}_LIBRARIES})
- set(PySide_FOUND TRUE)
+ set(PYSIDE_INCLUDE_DIR ${PySide${PYSIDE_MAJOR_VERSION}_INCLUDE_DIRS})
+ set(PYSIDE_LIBRARY ${PySide${PYSIDE_MAJOR_VERSION}_LIBRARIES})
+ set(PYSIDE_FOUND TRUE)
  endif()
  endif()
 
@@ -192,9 +192,9 @@ macro(find_pip_package PACKAGE)
  endforeach()
  file(TO_NATIVE_PATH "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/include" INCLUDE_DIR)
  file(TO_NATIVE_PATH "${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}/lib" LIBRARY)
- set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR} PARENT_SCOPE)
- set(${PACKAGE}_LIBRARIES ${LIBRARY} PARENT_SCOPE)
- set(${PACKAGE}_FOUND ${LIBRARY} TRUE)
+ set(${PACKAGE}_INCLUDE_DIRS ${INCLUDE_DIR})
+ set(${PACKAGE}_LIBRARIES ${LIBRARY})
+ set(${PACKAGE}_FOUND TRUE)
  message(STATUS "Found pip-installed ${PACKAGE} in ${PIP_PACKAGE_LOCATION}/${PIP_PACKAGE_NAME}")
  endif()
 endmacro()

diff --git a/conda/conda-env.yaml b/conda/conda-env.yaml
@@ -3,6 +3,6 @@ channels:
 - conda-forge
 dependencies:
 - conda-devenv
-- mamba==1.4.9 # NOTE: Pin to highest version supported by the devenv
-- python==3.11 # dependencies. If a higher version is installed, a crash
- # occurs during the downgrade process.
+- mamba==1.4.9  # NOTE: Pin to highest version supported by the devenv
+- python==3.11.* # dependencies. If a higher version is installed, a crash
+  # occurs during the downgrade process.
diff --git a/conda/environment.devenv.yml b/conda/environment.devenv.yml
@@ -79,7 +79,7 @@ dependencies:
 - numpy
 - occt==7.6.3
 - openssl
-- pcl
+- pcl==1.13.1
 - pip
 - pivy
 - pkg-config

diff --git a/conda/setup-environment.cmd b/conda/setup-environment.cmd
@@ -7,4 +7,4 @@ call conda config --add envs_dirs %CD%/.conda
 call conda config --set env_prompt "({name})"
 
 :: install the FreeCAD dependencies into the environment
-call mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml
+call mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml
diff --git a/conda/setup-environment.sh b/conda/setup-environment.sh
@@ -9,4 +9,4 @@ conda config --add envs_dirs $(pwd)/.conda
 conda config --set env_prompt "({name})"
 
 # install the FreeCAD dependencies into the environment
-mamba run --live-stream -n freecad mamba-devenv -f conda/environment.devenv.yml
+mamba run --live-stream -n freecad mamba-devenv --no-prune -f conda/environment.devenv.yml
diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec
@@ -73,7 +73,6 @@ BuildRequires: qt5-qtwebengine-devel
 #BuildRequires: qt5-qtwebkit-devel
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: qt5-qttools-static
-BuildRequires: qt5-qtxmlpatterns-devel
 
 BuildRequires: fmt-devel