bump version to 1.0.1

change `bundled_zipios` option to enabled by default, it was wrongly always set to enabled no matter what option was chosen
change `bundled_pycxx` option to enabled by default
add `pcl_enabled` option

.github/problemMatcher/gcc.json

@@ -0,0 +1,18 @@
+{
+    "__comment": "Taken from vscode-cpptools's Extension/package.json gcc rule",
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

.github/problemMatcher/msvc.json

@@ -0,0 +1,19 @@
+{
+    "__comment": "Taken from vscode's vs/workbench/contrib/tasks/common/problemMatcher.ts msCompile rule",
+    "problemMatcher": [
+        {
+            "owner": "msvc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(?:\\s+\\d+\\>)?([^\\s].*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "code": 5,
+                    "message": 6
+                }
+            ]
+        }
+    ]
+}

.github/workflows/CI_master.yml

@@ -39,18 +39,18 @@ jobs:
     with:
       artifactBasename: Prepare-${{ github.run_id }}
 
+  Pixi:
+    needs: [Prepare]
+    uses: ./.github/workflows/sub_buildPixi.yml
+    with:
+      artifactBasename: Pixi-${{ github.run_id }}
+
   MacOS_13_Conda_Apple:
     needs: [Prepare]
     uses: ./.github/workflows/sub_buildMacOSCondaApple.yml
     with:
       artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }}
 
-#  MacOS_13_Conda_Intel:
-#    needs: [Prepare]
-#    uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml
-#    with:
-#      artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }}
-
   Ubuntu_20-04:
     needs: [Prepare]
     uses: ./.github/workflows/sub_buildUbuntu2004.yml
@@ -63,25 +63,12 @@ jobs:
     with:
       artifactBasename: Ubuntu_22-04_Conda-${{ github.run_id }}
 
-  Ubuntu_22-04_Conda_Qt6:
-    needs: [Prepare]
-    uses: ./.github/workflows/sub_buildUbuntu2204CondaQt6.yml
-    with:
-      artifactBasename: Ubuntu_22-04_Conda-Qt6-${{ github.run_id }}
-
   Windows:
     needs: [Prepare]
     uses: ./.github/workflows/sub_buildWindows.yml
     with:
       artifactBasename: Windows-${{ github.run_id }}
 
-  ## Disable until the following issue is resolved: https://github.com/mamba-org/mamba/issues/3292
-  # Windows_Conda:
-  #   needs: [Prepare]
-  #   uses: ./.github/workflows/sub_buildWindowsConda.yml
-  #   with:
-  #     artifactBasename: Windows_Conda-${{ github.run_id }}
-
   Lint:
     needs: [Prepare]
     uses: ./.github/workflows/sub_lint.yml
@@ -94,12 +81,11 @@ jobs:
   WrapUp:
     needs: [
         Prepare,
+        Pixi,
         MacOS_13_Conda_Apple,
-        # MacOS_13_Conda_Intel,
         Ubuntu_20-04,
         Ubuntu_22-04_Conda,
         Windows,
-        # Windows_Conda,
         Lint
       ]
     if: always()

.github/workflows/actions/linux/generateCacheKey/action.yml

@@ -28,6 +28,9 @@ inputs:
   compiler:
     description: "Binary name/path of compiler to be used"
     required: true
+  qt_major_version:
+    description: "Major version number of qt to be used"
+    required: true
 outputs:
   cacheKey:
     description: "Cache key with distro and compiler version"
@@ -39,6 +42,6 @@ runs:
     - id: generateCacheKey
       shell: bash -l {0}
       run: |
-        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)
+        cacheKey=$(lsb_release -ds | tr -d ' ')-$(basename ${{ inputs.compiler }})$(${{ inputs.compiler }} -dumpfullversion -dumpversion)-qt${{ inputs.qt_major_version }}
         echo "Generated cache key : $cacheKey"
         echo "cacheKey=$cacheKey" >> $GITHUB_OUTPUT

.github/workflows/actions/runCPPTests/runAllTests/action.yml

@@ -40,6 +40,13 @@ inputs:
 runs:
   using: "composite"
   steps:
+      - name: C++ Assembly tests
+        id: assembly
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Assembly_tests_run --gtest_output=json:${{ inputs.reportdir }}assembly_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}assembly_gtest_test_log.txt
+          testName: Assembly
       - name: C++ core tests
         id: core
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -54,6 +61,13 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Material_tests_run --gtest_output=json:${{ inputs.reportdir }}material_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}material_gtest_test_log.txt
           testName: Material
+      - name: C++ Measure tests
+        id: measure
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Material_tests_run --gtest_output=json:${{ inputs.reportdir }}measure_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}measure_gtest_test_log.txt
+          testName: Measure
       - name: C++ Mesh tests
         id: mesh
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -61,6 +75,13 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Mesh_tests_run --gtest_output=json:${{ inputs.reportdir }}mesh_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}mesh_gtest_test_log.txt
           testName: Mesh
+      - name: C++ MeshPart tests
+        id: meshpart
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Mesh_tests_run --gtest_output=json:${{ inputs.reportdir }}meshpart_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}meshpart_gtest_test_log.txt
+          testName: MeshPart
       - name: C++ Part tests
         id: part
         uses: ./.github/workflows/actions/runCPPTests/runSingleTest
@@ -89,6 +110,13 @@ runs:
           testCommand: ${{ inputs.builddir }}/tests/Sketcher_tests_run --gtest_output=json:${{ inputs.reportdir }}sketcher_gtest_results.json
           testLogFile: ${{ inputs.reportdir }}sketcher_gtest_test_log.txt
           testName: Sketcher
+      - name: C++ Spreadsheet tests
+        id: spreadsheet
+        uses: ./.github/workflows/actions/runCPPTests/runSingleTest
+        with:
+          testCommand: ${{ inputs.builddir }}/tests/Sketcher_tests_run --gtest_output=json:${{ inputs.reportdir }}spreadsheet_gtest_results.json
+          testLogFile: ${{ inputs.reportdir }}spreadsheet_gtest_test_log.txt
+          testName: Spreadsheet
       - name: Compose summary report based on test results
         if: always()
         shell: bash -l {0}

.github/workflows/actions/windows/getCcache/action.yml

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.ccachebindir }}
-        key: ccacheforwin
+        key: ccacheforwin-${{ inputs.ccacheversion }}
     - name: Download ccache
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/actions/windows/getLibpack/action.yml

@@ -59,7 +59,7 @@ runs:
       id: getCached
       with:
         path: ${{ inputs.libpackdir }}
-        key: libpackforwin
+        key: libpackforwin-${{ inputs.libpackname }}
     - name: Download libpack
       shell: bash
       if: steps.getCached.outputs.cache-hit != 'true'

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -78,9 +78,10 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -1,171 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on macOS.
-
-name: Build macOS 13 (Intel)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: macos-13
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CC: x86_64-apple-darwin13.4.0-clang
-      CXX: x86_64-apple-darwin13.4.0-clang++
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash -l {0}
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          ./conda/setup-environment.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/macos/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --preset conda-macos-release -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
-      - name: CMake Build
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --build build/release
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        run: |
-          mamba run --live-stream -p .conda/freecad cmake --install build/release
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        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@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildPixi.yml

@@ -0,0 +1,218 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2024 0penBrain, Lorenz Lechner and Jacob Oursland.      *
+# *                                                                         *
+# *   This file is part of FreeCAD.                                         *
+# *                                                                         *
+# *   FreeCAD is free software: you can redistribute it and/or modify it    *
+# *   under the terms of the GNU Lesser General Public License as           *
+# *   published by the Free Software Foundation, either version 2.1 of the  *
+# *   License, or (at your option) any later version.                       *
+# *                                                                         *
+# *   FreeCAD is distributed in the hope that it will be useful, but        *
+# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
+# *   Lesser General Public License for more details.                       *
+# *                                                                         *
+# *   You should have received a copy of the GNU Lesser General Public      *
+# *   License along with FreeCAD. If not, see                               *
+# *   <https://www.gnu.org/licenses/>.                                      *
+# *                                                                         *
+# ***************************************************************************
+
+# This is a build and test workflow for CI of FreeCAD.
+# This workflow aims at building and testing FreeCAD on a Conda environment on macOS.
+
+name: Pixi Builds
+
+on:
+  workflow_call:
+    inputs:
+      artifactBasename:
+        type: string
+        required: true
+      testOnBuildDir:
+        default: false
+        type: boolean
+        required: false
+      allowedToFail:
+        default: false
+        type: boolean
+        required: false
+    outputs:
+      reportFile:
+        value: ${{ jobs.Build.outputs.reportFile }}
+
+jobs:
+  build_with_pixi:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ inputs.allowedToFail }}
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/ccache
+      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
+      CCACHE_MAXSIZE: 1G
+      CCACHE_COMPRESS: true
+      CCACHE_COMPRESSLEVEL: 5
+      builddir: ${{ github.workspace }}/build/
+      cacheKey: pixi-${{ matrix.os }}
+      logdir: ${{ github.workspace }}/logs/
+      reportdir: ${{ github.workspace }}/report/
+      reportfilename: ${{ inputs.artifactBasename }}-${{ matrix.os }}-report.md
+    outputs:
+      reportFile: ${{ steps.Init.outputs.reportFile }}
+
+    strategy:
+      max-parallel: 6
+      fail-fast: false
+      matrix:
+        os: [windows-latest, ubuntu-latest, macos-latest]
+
+    steps:
+    - name: Set Platform Environment Variables
+      shell: bash -l {0}
+      env:
+        OPERATING_SYSTEM: ${{ runner.os }}
+      run: |
+        if [[ $OPERATING_SYSTEM == 'Windows' ]]; then
+          echo 'CCACHE_COMPILERCHECK=%compiler%' >> "$GITHUB_ENV"
+        else
+          echo 'CCACHE_COMPILERCHECK=%compiler% -dumpfullversion -dumpversion' >> "$GITHUB_ENV"
+        fi
+
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Add GCC Problem Matcher
+      if: runner.os == 'Linux'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/gcc.json"
+
+    - name: Add Clang Problem Matcher
+      if: runner.os == 'macOS'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/clang.json"
+
+    - name: Add MSVC++ Problem Matcher
+      if: runner.os == 'Windows'
+      run: |
+        echo "::add-matcher::${{ runner.workspace }}/FreeCAD/.github/problemMatcher/msvc.json"
+
+    - name: Make needed directories, files and initializations
+      id: Init
+      run: |
+        mkdir -p ${{ env.builddir }}
+        mkdir -p ${{ env.logdir }}
+        mkdir -p ${{ env.reportdir }}
+        echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
+
+    - uses: prefix-dev/setup-pixi@v0.8.2
+      with:
+        pixi-version: v0.41.3
+        cache: false
+
+    - name: Restore Compiler Cache
+      uses: actions/cache/restore@v4
+      with:
+        path: ${{ env.CCACHE_DIR }}
+        key: FC-${{ env.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
+        restore-keys: |
+          FC-${{ env.cacheKey }}-${{ github.ref }}-
+          FC-${{ env.cacheKey }}-
+
+    - name: Print CCache statistics before build, reset stats and print config
+      run: |
+        pixi run ccache -s
+        pixi run ccache -z
+        pixi run ccache -p
+
+    - name: CMake Configure
+      run: |
+        pixi run configure-release
+
+    - name: CMake Build
+      run: |
+        pixi run build
+
+    - name: Print ccache statistics after Build
+      run: |
+        pixi run ccache -s
+
+    - name: FreeCAD CLI tests on build dir
+      if: inputs.testOnBuildDir
+      timeout-minutes: 10
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "CLI tests on build dir"
+        testCommand: pixi run ${{ env.builddir }}/bin/FreeCADCmd -t 0
+        logFile: ${{ env.logdir }}TestCLIBuild.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: FreeCAD GUI tests on build dir
+      if: runner.os == 'Linux' && inputs.testOnBuildDir
+      timeout-minutes: 15
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "GUI tests on build dir"
+        testCommand: pixi run xvfb-run ${{ env.builddir }}/bin/FreeCAD -t 0
+        logFile: ${{ env.logdir }}TestGUIBuild.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: C++ tests
+      timeout-minutes: 10
+      if: runner.os != 'Windows'
+      uses: ./.github/workflows/actions/runCPPTests/runAllTests
+      with:
+        reportdir: ${{ env.reportdir }}
+        builddir: ${{ env.builddir }}
+        reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
+
+    - name: CMake Install
+      run: |
+        pixi run install
+
+    - name: FreeCAD CLI tests on install
+      if: runner.os != 'Windows'
+      timeout-minutes: 10
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "CLI tests on install"
+        testCommand: pixi run FreeCADCmd -t 0
+        logFile: ${{ env.logdir }}TestCLIInstall.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: FreeCAD GUI tests on install
+      # if: runner.os == 'Linux'
+      # currently broken on Qt6 builds
+      if: false
+      timeout-minutes: 15
+      uses: ./.github/workflows/actions/runPythonTests
+      with:
+        testDescription: "GUI tests on install"
+        testCommand: pixi run xvfb-run FreeCAD -t 0
+        logFile: ${{ env.logdir }}TestGUIInstall.log
+        reportFile: ${{env.reportdir}}${{ env.reportfilename }}
+
+    - name: Save Compiler Cache
+      if: always()
+      uses: actions/cache/save@v4
+      with:
+        path: ${{ env.CCACHE_DIR }}
+        key: FC-${{ env.cacheKey }}-${{ github.ref }}-${{ github.run_id }}
+
+    - name: Upload logs
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.artifactBasename }}-${{ matrix.os }}-Logs
+        path: |
+          ${{ env.logdir }}
+          /var/crash/*FreeCAD*
+
+    - name: Upload report
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.reportfilename }}
+        path: |
+          ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildUbuntu2004.yml

@@ -47,11 +47,16 @@ on:
 jobs:
 
   Build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:20.04
     continue-on-error: ${{ inputs.allowedToFail }}
     env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
+      LC_ALL: en_US.utf8
+      DEBIAN_FRONTEND: noninteractive
+      # set in a step to workaround https://github.com/actions/runner/issues/2058
+      #CCACHE_DIR: ${{ github.workspace }}/ccache
+      #CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config 
       CCACHE_MAXSIZE: 1G
       CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
       CCACHE_COMPRESS: true
@@ -60,7 +65,8 @@ jobs:
       CXX: /usr/bin/g++
       #CC: /usr/bin/clang
       #CXX: /usr/bin/clang++
-      builddir: ${{ github.workspace }}/build/release/
+      # set in a step to workaround https://github.com/actions/runner/issues/2058
+      #builddir: ${{ github.workspace }}/build/release/
       logdir: /tmp/logs/
       reportdir: /tmp/report/
       reportfilename: ${{ inputs.artifactBasename }}-report.md
@@ -71,6 +77,15 @@ jobs:
       reportFile: ${{ steps.Init.outputs.reportFile }}
 
     steps:
+      - name: Install basic packages
+        run: |
+          apt-get update -qq
+          apt-get install -y --no-install-recommends --reinstall language-pack-en sudo git ca-certificates build-essential cmake
+      - name: set env variables
+        run: |
+          echo "CCACHE_DIR=$GITHUB_WORKSPACE/ccache" >> "$GITHUB_ENV"
+          echo "CCACHE_CONFIGPATH=$GITHUB_WORKSPACE/ccache/config" >> "$GITHUB_ENV"
+          echo "builddir=$GITHUB_WORKSPACE/build/release/" >> "$GITHUB_ENV"
       - name: Checking out source code
         uses: actions/checkout@v4
         with:
@@ -133,6 +148,7 @@ jobs:
                             python3-pyside2.qtnetwork                   \
                             python3-pyside2.qtsvg                       \
                             python3-pyside2.qtwidgets                   \
+                            python3-yaml                                \
                             qtbase5-dev                                 \
                             qttools5-dev                                \
                             shiboken2                                   \
@@ -152,6 +168,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:
@@ -169,7 +186,7 @@ jobs:
       - name: CMake Configure
         uses: ./.github/workflows/actions/linux/configure
         with:
-          extraParameters: -G Ninja --preset release
+          extraParameters: -G Ninja -D CMAKE_BUILD_TYPE=Release
           builddir: ${{ env.builddir }}
           logFile: ${{ env.logdir }}Cmake.log
           errorFile: ${{ env.logdir }}CmakeErrors.log

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -76,9 +76,10 @@ jobs:
         with:
           activate-environment: .conda/freecad
           environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
+          channels: conda-forge
           channel-priority: true
           miniforge-version: latest
+          conda-remove-defaults: "true"
       - name: Install FreeCAD dependencies
         env:
           CONDA_VERBOSITY: 2
@@ -102,6 +103,7 @@ jobs:
         uses: ./.github/workflows/actions/linux/generateCacheKey
         with:
           compiler: ${{ env.CXX }}
+          qt_major_version: 5
       - name: Restore Compiler Cache
         uses: actions/cache@v4
         with:

.github/workflows/sub_buildUbuntu2204CondaQt6.yml

@@ -1,210 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# *                                                                         *
-# *   Copyright (c) 2023 0penBrain.                                         *
-# *                                                                         *
-# *   This file is part of FreeCAD.                                         *
-# *                                                                         *
-# *   FreeCAD is free software: you can redistribute it and/or modify it    *
-# *   under the terms of the GNU Lesser General Public License as           *
-# *   published by the Free Software Foundation, either version 2.1 of the  *
-# *   License, or (at your option) any later version.                       *
-# *                                                                         *
-# *   FreeCAD is distributed in the hope that it will be useful, but        *
-# *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      *
-# *   Lesser General Public License for more details.                       *
-# *                                                                         *
-# *   You should have received a copy of the GNU Lesser General Public      *
-# *   License along with FreeCAD. If not, see                               *
-# *   <https://www.gnu.org/licenses/>.                                      *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD on a Conda environment on Linux.
-
-name: Build Ubuntu 22.04 (Conda)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      testOnBuildDir:
-        default: false
-        type: boolean
-        required: false
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: ubuntu-22.04
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: ${{ github.workspace }}/ccache
-      CCACHE_CONFIGPATH: ${{ github.workspace }}/ccache/config
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPILERCHECK: "%compiler% -dumpfullversion -dumpversion" # default:mtime
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      builddir: ${{ github.workspace }}/build/release/
-      logdir: /tmp/logs/
-      reportdir: /tmp/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    defaults:
-      run:
-        shell: bash -l {0}
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env-qt6.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends \
-            libegl1                                       \
-            libgl1                                        \
-            libglx0                                       \
-            libopengl0
-          ./conda/setup-environment-qt6.sh
-      - name: Set Environment Variables
-        run: |
-          echo "CC=$CC" >> "$GITHUB_ENV"
-          echo "CXX=$CXX" >> "$GITHUB_ENV"
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir -p ${{ env.CCACHE_DIR }}
-          mkdir -p ${{ env.CCACHE_CONFIGPATH }}
-          mkdir -p ${{ env.builddir }}
-          mkdir -p ${{ env.logdir }}
-          mkdir -p ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Generate cache key
-        id: genCacheKey
-        uses: ./.github/workflows/actions/linux/generateCacheKey
-        with:
-          compiler: ${{ env.CXX }}
-      - name: Restore Compiler Cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-${{ github.run_id }}-qt6
-          restore-keys: |
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-${{ github.ref }}-qt6-
-            FC-${{ steps.genCacheKey.outputs.cacheKey }}-qt6-
-      - name: Print CCache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: CMake Configure
-        uses: ./.github/workflows/actions/linux/configure
-        with:
-          extraParameters: >
-            --preset conda-linux-release
-            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.conda/freecad/opt/freecad
-            -DQT_HOST_PATH=${{ github.workspace }}/.conda/freecad/
-            -DFREECAD_QT_VERSION=6
-            -DBUILD_REVERSEENGINEERING=OFF
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Cmake.log
-          errorFile: ${{ env.logdir }}CmakeErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: CMake Build
-        uses: ./.github/workflows/actions/linux/build
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Build.log
-          errorFile: ${{ env.logdir }}BuildErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Print ccache statistics after Build
-        run: |
-          ccache -s
-      - name: FreeCAD CLI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on build dir"
-          testCommand: ${{ env.builddir }}/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on build dir
-        if: inputs.testOnBuildDir
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on build dir"
-          testCommand: xvfb-run ${{ env.builddir }}/bin/FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIBuild.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: C++ tests
-        timeout-minutes: 1
-        uses: ./.github/workflows/actions/runCPPTests/runAllTests
-        with:
-          reportdir: ${{ env.reportdir }}
-          builddir: ${{ env.builddir }}
-          reportFile: ${{ env.reportdir }}${{ env.reportfilename }}
-      - name: CMake Install
-        uses: ./.github/workflows/actions/linux/install
-        with:
-          builddir: ${{ env.builddir }}
-          logFile: ${{ env.logdir }}Install.log
-          errorFile: ${{ env.logdir }}InstallErrors.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD CLI tests on install
-        timeout-minutes: 10
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "CLI tests on install"
-          testCommand: ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCADCmd -t 0
-          logFile: ${{ env.logdir }}TestCLIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: FreeCAD GUI tests on install
-        timeout-minutes: 15
-        uses: ./.github/workflows/actions/runPythonTests
-        with:
-          testDescription: "GUI tests on install"
-          testCommand: xvfb-run ${{ github.workspace }}/.conda/freecad/opt/freecad/bin/FreeCAD -t 0
-          logFile: ${{ env.logdir }}TestGUIInstall.log
-          reportFile: ${{env.reportdir}}${{ env.reportfilename }}
-      - name: Upload logs
-        if: always()
-        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@v4
-        with:
-          name: ${{ env.reportfilename }}
-          path: |
-            ${{env.reportdir}}${{ env.reportfilename }}

.github/workflows/sub_buildWindowsConda.yml

@@ -1,133 +0,0 @@
-# ***************************************************************************
-# *   Copyright (c) 2023 0penBrain                               *
-# *                                                                         *
-# *   This program is free software; you can redistribute it and/or modify  *
-# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
-# *   as published by the Free Software Foundation; either version 2 of     *
-# *   the License, or (at your option) any later version.                   *
-# *   for detail see the LICENCE text file.                                 *
-# *                                                                         *
-# *   This program is distributed in the hope that it will be useful,       *
-# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-# *   GNU Library General Public License for more details.                  *
-# *                                                                         *
-# *   You should have received a copy of the GNU Library General Public     *
-# *   License along with this program; if not, write to the Free Software   *
-# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
-# *   USA                                                                   *
-# *                                                                         *
-# ***************************************************************************
-
-# This is a build and test workflow for CI of FreeCAD.
-# This workflow aims at building and testing FreeCAD using a Conda environment on Windows with MSVC.
-
-name: Build Windows (Conda)
-on:
-  workflow_call:
-    inputs:
-      artifactBasename:
-        type: string
-        required: true
-      allowedToFail:
-        default: false
-        type: boolean
-        required: false
-    outputs:
-      reportFile:
-        value: ${{ jobs.Build.outputs.reportFile }}
-
-jobs:
-  Build:
-    runs-on: windows-latest
-    continue-on-error: ${{ inputs.allowedToFail }}
-    env:
-      CCACHE_DIR: C:/FC/cache/
-      CCACHE_COMPILERCHECK: "%compiler%" # default:mtime
-      CCACHE_MAXSIZE: 1G
-      CCACHE_COMPRESS: true
-      CCACHE_COMPRESSLEVEL: 1
-      CCACHE_NOHASHDIR: true
-      CCACHE_DIRECT: true
-      #CCACHE_SLOPPINESS: "pch_defines,time_macros" # Can't get PCH to work on Windows
-      CCACHE_LOGFILE: C:/logs/ccache.log
-      ## Have to use C:\ because not enough space on workspace drive
-      builddir: C:/FC/build/
-      logdir: C:/logs/
-      reportdir: C:/report/
-      reportfilename: ${{ inputs.artifactBasename }}-report.md
-    outputs:
-      reportFile: ${{ steps.Init.outputs.reportFile }}
-
-    steps:
-      - name: Checking out source code
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Setup Miniconda
-        env:
-          CONDA_VERBOSITY: 2
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          activate-environment: .conda/freecad
-          environment-file: conda/conda-env.yaml
-          channels: conda-forge,defaults
-          channel-priority: true
-          miniforge-version: latest
-      - name: Install FreeCAD dependencies
-        env:
-          CONDA_VERBOSITY: 2
-        run: |
-          conda config --add envs_dirs $PWD/.conda
-          mamba-devenv --no-prune -f conda/environment.devenv.yml
-      - name: Make needed directories, files and initializations
-        id: Init
-        run: |
-          mkdir ${{ env.CCACHE_DIR }}
-          mkdir ${{ env.builddir }}
-          mkdir ${{ env.logdir }}
-          mkdir ${{ env.reportdir }}
-          echo "reportFile=${{ env.reportfilename }}" >> $GITHUB_OUTPUT
-      - name: Restore compiler cache
-        uses: actions/cache@v4
-        with:
-          save-always: true
-          path: ${{ env.CCACHE_DIR }}
-          key: FC-Windows-Conda-${{ github.ref }}-${{ github.run_id }}
-          restore-keys: |
-            FC-Windows-Conda-${{ github.ref }}-
-            FC-Windows-Conda-
-      - name: Print Ccache statistics before build, reset stats and print config
-        run: |
-          ccache -s
-          ccache -z
-          ccache -p
-      - name: Configuring CMake
-        shell: cmd /C CALL {0}
-        run: >
-          conda\cmake.cmd --preset conda-windows-release -DFREECAD_USE_PCH:BOOL=OFF -DFREECAD_RELEASE_PDB:BOOL=OFF -DFREECAD_USE_CCACHE:BOOL=ON
-      - name: Compiling sources
-        shell: cmd /C CALL {0}
-        run: >
-          conda\cmake.cmd --build build\release
-      - name: Print Ccache statistics after build
-        run: |
-          ccache -s
-      - name: CMake Install
-        shell: cmd /C CALL {0}
-        run: |
-          conda\cmake.cmd  --install build\release
-      - name: C++ unit tests
-        timeout-minutes: 1
-        run: |
-          . build\release\tests\Tests_run --gtest_output=json:${{ env.reportdir }}gtest_results.json # 2>&1 | tee -filepath ${{ env.logdir }}/unitTests.log
-      - name: FreeCAD CLI tests
-        run: |
-          . build\release\bin\FreeCADCmd -t 0 # 2>&1 | tee -filepath ${{ env.logdir }}/integrationTests.log
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ inputs.artifactBasename }}-Logs
-          path: |
-            ${{ env.logdir }}

.github/workflows/sub_lint.yml

@@ -318,7 +318,7 @@ jobs:
           pylintWarnings=0
           pylintRefactorings=0
           pylintConventions=0
-          pip install pylint
+          pip install --break-system-packages pylint
           # List enabled pylint checks
           pylint --list-msgs-enabled > ${{ env.logdir }}pylint-enabled-checks.log
           # Run pylint on all python files
@@ -378,9 +378,9 @@ jobs:
         run: |
           blackReformats=0
           blackFails=0
-          pip install black
+          pip install --break-system-packages black
           set +e
-          black --check ${{ inputs.changedPythonFiles }} &> ${{ env.logdir }}black.log
+          black --line-length 100 --check ${{ inputs.changedPythonFiles }} &> ${{ env.logdir }}black.log
           exitCode=$?
           set -e
           # If black has run successfully, write the Log to the console with the Problem Matchers
@@ -444,7 +444,7 @@ jobs:
                             libqt5x11extras5-dev                        \
                             libshiboken2-dev                            \
                             libspnav-dev                                \
-                            libvtk7-dev                                 \
+                            libvtk9-dev                                 \
                             libx11-dev                                  \
                             libxerces-c-dev                             \
                             libyaml-cpp-dev                             \
@@ -452,7 +452,6 @@ jobs:
                             netgen                                      \
                             netgen-headers                              \
                             occt-draw                                   \
-                            pyqt5-dev-tools                             \
                             pyside2-tools                               \
                             python3-dev                                 \
                             python3-git                                 \
@@ -516,7 +515,7 @@ jobs:
         continue-on-error: ${{ inputs.cpplintFailSilent }}
         run: |
           cpplintErrors=0
-          pip install cpplint
+          pip install --break-system-packages cpplint
           # Run cpplint
           for file in ${{ inputs.changedCppFiles }}
           do
@@ -581,7 +580,7 @@ jobs:
         if: inputs.checkSpelling && always()
         continue-on-error: ${{ inputs.codespellFailSilent }}
         run: |
-          pip install codespell
+          pip install --break-system-packages codespell
           wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt
           #wget https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary_rare.txt
           set +e

.gitignore

@@ -61,3 +61,6 @@ src/Tools/freecad.zip
 tsupdate_stderr.log
 tsupdate_stdout.log
 files_to_translate.txt
+# pixi environments
+.pixi
+*.egg-info

CMakeLists.txt

@@ -21,17 +21,18 @@ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
 if(FREECAD_USE_CCACHE)
     find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
     if(CCACHE_PROGRAM)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+        message(STATUS "Using ccache found at: " ${CCACHE_PROGRAM})
+        set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
+        set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
     endif()
 endif()
 
 project(FreeCAD)
 
-set(PACKAGE_VERSION_NAME "Vulcan")
-set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "22")
-set(PACKAGE_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
-set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
+set(PACKAGE_VERSION_MAJOR "1")
+set(PACKAGE_VERSION_MINOR "0")
+set(PACKAGE_VERSION_PATCH "1") # number of patch release (e.g. "4" for the 0.18.4 release)
+set(PACKAGE_VERSION_SUFFIX "") # either "dev" for development snapshot or "" (empty string)
 set(PACKAGE_BUILD_VERSION "0") # used when the same FreeCAD version will be re-released (for example using an updated LibPack)
 
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")

CMakePresets.json

@@ -51,14 +51,6 @@
         "hidden": true,
         "generator": "Ninja",
         "cacheVariables": {
-          "Boost_NO_BOOST_CMAKE": {
-            "type": "BOOL",
-            "value": "ON"
-          },
-          "BUILD_DYNAMIC_LINK_PYTHON": {
-            "type": "BOOL",
-            "value": "ON"
-          },
           "BUILD_FEM_NETGEN": {
             "type": "BOOL",
             "value": "ON"
@@ -99,9 +91,9 @@
             "type": "BOOL",
             "value": "ON"
           },
-          "USE_BOOST_PYTHON": {
-            "type": "BOOL",
-            "value": "OFF"
+          "QT_HOST_PATH": {
+            "type": "PATH",
+            "value": "$env{CONDA_PREFIX}"
           }
         }
       },
@@ -117,27 +109,27 @@
         "cacheVariables": {
           "CMAKE_INCLUDE_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include"
+            "value": "$env{CONDA_PREFIX}/include"
           },
           "CMAKE_INSTALL_LIBDIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}/lib"
           },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
           },
           "CMAKE_LIBRARY_PATH":{
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}/lib"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/include/opencascade"
           }
         }
       },
@@ -151,29 +143,33 @@
         },
         "cmakeExecutable": "${sourceDir}/conda/cmake.sh",
         "cacheVariables": {
+          "CMAKE_IGNORE_PREFIX_PATH": {
+            "type": "STRING",
+            "value": "/opt/homebrew;/usr/local/homebrew"
+          },
           "CMAKE_INCLUDE_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include"
+            "value": "$env{CONDA_PREFIX}/include"
           },
           "CMAKE_INSTALL_LIBDIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}/lib"
           },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
           },
           "CMAKE_LIBRARY_PATH":{
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/lib"
+            "value": "$env{CONDA_PREFIX}/lib"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad"
+            "value": "$env{CONDA_PREFIX}"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/include/opencascade"
           }
         }
       },
@@ -189,27 +185,27 @@
         "cacheVariables": {
           "CMAKE_INCLUDE_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/include"
+            "value": "$env{CONDA_PREFIX}/Library/include"
           },
           "CMAKE_INSTALL_LIBDIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/lib"
+            "value": "$env{CONDA_PREFIX}/Library/lib"
           },
           "CMAKE_INSTALL_PREFIX": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library"
+            "value": "$env{CONDA_PREFIX}/Library"
           },
           "CMAKE_LIBRARY_PATH":{
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/lib"
+            "value": "$env{CONDA_PREFIX}/Library/lib"
           },
           "CMAKE_PREFIX_PATH": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library"
+            "value": "$env{CONDA_PREFIX}/Library"
           },
           "OCC_INCLUDE_DIR": {
             "type": "FILEPATH",
-            "value": "${sourceDir}/.conda/freecad/Library/include/opencascade"
+            "value": "$env{CONDA_PREFIX}/Library/include/opencascade"
           }
         }
       },
@@ -291,7 +287,13 @@
         "inherits": [
           "conda-release",
           "conda-windows"
-        ]
+        ],
+        "cacheVariables": {
+          "FREECAD_RELEASE_PDB": {
+            "type": "BOOL",
+            "value": "OFF"
+          }
+        }
       }
     ]
-  }
+}

README.md

@@ -2,7 +2,7 @@
 
 ### Your own 3D parametric modeler
 
-[Website](https://www.freecad.org) • 
+[Website](https://www.freecad.org) •
 [Documentation](https://wiki.freecad.org) •
 [Forum](https://forum.freecad.org/) •
 [Bug tracker](https://github.com/FreeCAD/FreeCAD/issues) •
@@ -12,7 +12,7 @@
 
 [![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
 
-<img src="https://user-images.githubusercontent.com/1828501/174066870-1692005b-f8d7-43fb-a289-6d2f07f73d7f.png" width="800"/>
+<img src="/.github/images/partdesign.png" width="800"/>
 
 Overview
 --------

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -28,10 +28,11 @@ macro(CheckInterModuleDependencies)
     REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH BUILD_SMESH)
     REQUIRES_MODS(BUILD_FLAT_MESH          BUILD_MESH_PART)
     REQUIRES_MODS(BUILD_OPENSCAD           BUILD_MESH_PART BUILD_DRAFT)
+    REQUIRES_MODS(BUILD_PART               BUILD_MATERIAL)
     REQUIRES_MODS(BUILD_PART_DESIGN        BUILD_SKETCHER)
     # REQUIRES_MODS(BUILD_CAM              BUILD_PART BUILD_MESH BUILD_ROBOT)
     REQUIRES_MODS(BUILD_CAM                BUILD_PART BUILD_MESH)
-    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH)
+    REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH BUILD_POINTS)
     REQUIRES_MODS(BUILD_ROBOT              BUILD_PART)
     REQUIRES_MODS(BUILD_SANDBOX            BUILD_PART BUILD_MESH)
     REQUIRES_MODS(BUILD_SKETCHER           BUILD_PART)

cMake/FreeCAD_Helpers/CompilerChecksAndSetups.cmake

@@ -46,7 +46,7 @@ macro(CompilerChecksAndSetups)
         set(CMAKE_CXX_STANDARD 23)
     elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+20")
         set(CMAKE_CXX_STANDARD 20)
-    elseif(${BUILD_ENABLE_CXX_STD} MATCHES "C\\+\\+17")
+    else()#Enabled C++17
         set(CMAKE_CXX_STANDARD 17)
     endif()
 

cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake

@@ -15,7 +15,9 @@ macro(CopyLibpackDirectories)
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_BINARY_DIR}/bin)
         endif()
-        file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+        if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0" AND FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+            file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+        endif()
         message(STATUS "... end copying.\n=======================================\n")
     endif()
 
@@ -40,7 +42,9 @@ macro(CopyLibpackDirectories)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/imageformats DESTINATION ${CMAKE_BINARY_DIR}/bin)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/platforms DESTINATION ${CMAKE_BINARY_DIR}/bin)
             file(COPY ${FREECAD_LIBPACK_DIR}/plugins/styles DESTINATION ${CMAKE_BINARY_DIR}/bin)
-            file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+            if(FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+                file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
+            endif()
             file(WRITE ${CMAKE_BINARY_DIR}/bin/qt.conf "[Paths]\nPrefix=..\n")
         endif()
     endif()
@@ -59,7 +63,9 @@ macro(CopyLibpackDirectories)
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")
             install(DIRECTORY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
         endif()
-        install(DIRECTORY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_INSTALL_PREFIX})
+        if(FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
+            install(DIRECTORY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_INSTALL_PREFIX})
+        endif()
         install(DIRECTORY ${FREECAD_LIBPACK_DIR}/bin DESTINATION ${CMAKE_INSTALL_PREFIX})
         install(DIRECTORY ${FREECAD_LIBPACK_DIR}/lib DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*.dll")
         if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -142,37 +142,41 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF)
     option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
 
-    if(MSVC)
+    if(MSVC OR APPLE)
         set(FREECAD_3DCONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
-        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "Raw input")
-    else(MSVC)
-        set(FREECAD_3DCONNEXION_SUPPORT "Raw input")
-    endif(MSVC)
+        set_property(CACHE FREECAD_3DCONNEXION_SUPPORT PROPERTY STRINGS "None" "NavLib" "Legacy" "Both")
+    else(MSVC OR APPLE)
+        option(FREECAD_USE_3DCONNEXION_LEGACY "Enable support for 3Dconnexion devices." ON)
+    endif(MSVC OR APPLE)
+
+    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Both")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "Legacy")
+        set(FREECAD_USE_3DCONNEXION_LEGACY ON)
+    elseif(FREECAD_3DCONNEXION_SUPPORT STREQUAL "None")
+        set(FREECAD_USE_3DCONNEXION_NAVLIB OFF)
+        set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
+    endif()
+
+    if(APPLE AND FREECAD_USE_3DCONNEXION_LEGACY)
+        find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
+        if(NOT (IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK}))
+            set(FREECAD_USE_3DCONNEXION_LEGACY OFF)
+        endif()
+    endif()
 
     if(MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
         option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF) # 3/5/2021 current LibPack uses non-C++17 FLANN
-        option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
-    elseif(APPLE)
-        find_library(3DCONNEXIONCLIENT_FRAMEWORK 3DconnexionClient)
-        if(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." ON)
-        else(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-            option(FREECAD_USE_3DCONNEXION "Use the 3D connexion SDK to support 3d mouse." OFF)
-        endif(IS_DIRECTORY ${3DCONNEXIONCLIENT_FRAMEWORK})
-    else(MSVC)
-        set(FREECAD_USE_3DCONNEXION OFF )
     endif(MSVC)
     if(NOT MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" OFF)
         option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
     endif(NOT MSVC)
 
-    if(FREECAD_3DCONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
-        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
-        set(FREECAD_USE_3DCONNEXION OFF)
-    endif()
-
     # if this is set override some options
     if (FREECAD_BUILD_DEBIAN)
         set(FREECAD_USE_EXTERNAL_ZIPIOS ON )

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -192,11 +192,13 @@ macro(PrintFinalReport)
     simple(OpenGLU_Incl [${OPENGL_INCLUDE_DIR}])
     simple(Coin3D "${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
     simple(pivy ${PIVY_VERSION})
-    if (WIN32)
-        if (FREECAD_USE_3DCONNEXION)
-            simple(3Dconnexion "Building 3Dconnexion support with original code")
+    if(WIN32 OR APPLE)
+        if(FREECAD_USE_3DCONNEXION_LEGACY AND FREECAD_USE_3DCONNEXION_NAVLIB)
+            simple(3Dconnexion "Building with 3Dconnexion legacy and NavLib support")
+        elseif(FREECAD_USE_3DCONNEXION_LEGACY)
+            simple(3Dconnexion "Building with 3Dconnexion legacy support")
         elseif(FREECAD_USE_3DCONNEXION_NAVLIB)
-            simple(3Dconnexion "Building 3Dconnexion support with NavLib")
+            simple(3Dconnexion "Building with 3Dconnexion NavLib support")
         else()
             simple(3Dconnexion "Not building 3Dconnexion device support")
         endif()

cMake/FreeCAD_Helpers/SetGlobalCompilerAndLinkerSettings.cmake

@@ -34,6 +34,7 @@ macro(SetGlobalCompilerAndLinkerSettings)
         if(FREECAD_RELEASE_PDB)
             set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
             set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
+            set (CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG")
         endif(FREECAD_RELEASE_PDB)
         if(FREECAD_RELEASE_SEH)
             # remove /EHsc or /EHs flags because they are incompatible with /EHa

cMake/UseLibPack3.cmake

@@ -15,6 +15,12 @@ set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig.exe CACHE FILEPATH "Swig" FO
 find_package(Qt6 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH)
 message(STATUS "Found LibPack 3 Qt ${Qt6_VERSION}")
 
+if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.1.0")
+    find_package(pybind11 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/share/cmake/pybind11 NO_DEFAULT_PATH)
+    message(STATUS "Found LibPack 3 pybind11 ${pybind11_VERSION}")
+    set(FREECAD_USE_PYBIND11 ON)
+endif()
+
 find_package(XercesC REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/cmake NO_DEFAULT_PATH)
 message(STATUS "Found LibPack 3 XercesC ${XercesC_VERSION}")
 

conda/conda-env-qt6.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.12.*

conda/conda-env.yaml

@@ -2,6 +2,7 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - conda-devenv
 - mamba
 - python==3.11.*

conda/environment-qt6.devenv.yml

@@ -3,6 +3,7 @@ channels:
 - conda-forge
 - conda-forge/label/pivy_rc
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
 - libdrm-cos7-x86_64                   # [linux and x86_64]
@@ -90,7 +91,6 @@ dependencies:
 - python==3.12.*
 - pyyaml
 - qt6-main
-- six
 - smesh
 - swig
 - vtk==9.2.6

conda/environment.devenv.yml

@@ -2,31 +2,31 @@ name: freecad
 channels:
 - conda-forge
 dependencies:
+- conda-forge/noarch::conda-libmamba-solver==24.7.0
 - libspnav                             # [linux]
 - kernel-headers_linux-64              # [linux and x86_64]
-- libdrm-cos6-x86_64                   # [linux and x86_64]
-- libselinux-cos6-x86_64               # [linux and x86_64]
-- libsepol-cos6-x86_64                 # [linux and x86_64]
-- libx11-common-cos6-x86_64            # [linux and x86_64]
-- libx11-cos6-x86_64                   # [linux and x86_64]
-- libxau-cos6-x86_64                   # [linux and x86_64]
-- libxcb-cos6-x86_64                   # [linux and x86_64]
-- libxdamage-cos6-x86_64               # [linux and x86_64]
-- libxext-cos6-x86_64                  # [linux and x86_64]
-- libxfixes-cos6-x86_64                # [linux and x86_64]
-- libxi-cos6-x86_64                    # [linux and x86_64]
-- libxi-devel-cos6-x86_64              # [linux and x86_64]
-- libxxf86vm-cos6-x86_64               # [linux and x86_64]
-- mesa-dri-drivers-cos6-x86_64         # [linux and x86_64]
-- mesa-dri1-drivers-cos6-x86_64        # [linux and x86_64]
-- mesa-libegl-cos6-x86_64              # [linux and x86_64]
-- mesa-libegl-devel-cos6-x86_64        # [linux and x86_64]
-- mesa-libgl-cos6-x86_64               # [linux and x86_64]
-- mesa-libgl-devel-cos6-x86_64         # [linux and x86_64]
-- pixman-cos6-x86_64                   # [linux and x86_64]
+- libdrm-cos7-x86_64                   # [linux and x86_64]
+- libselinux-cos7-x86_64               # [linux and x86_64]
+- libsepol-cos7-x86_64                 # [linux and x86_64]
+- libx11-common-cos7-x86_64            # [linux and x86_64]
+- libx11-cos7-x86_64                   # [linux and x86_64]
+- libxau-cos7-x86_64                   # [linux and x86_64]
+- libxcb-cos7-x86_64                   # [linux and x86_64]
+- libxdamage-cos7-x86_64               # [linux and x86_64]
+- libxext-cos7-x86_64                  # [linux and x86_64]
+- libxfixes-cos7-x86_64                # [linux and x86_64]
+- libxi-cos7-x86_64                    # [linux and x86_64]
+- libxi-devel-cos7-x86_64              # [linux and x86_64]
+- libxxf86vm-cos7-x86_64               # [linux and x86_64]
+- mesa-dri-drivers-cos7-x86_64         # [linux and x86_64]
+- mesa-libegl-cos7-x86_64              # [linux and x86_64]
+- mesa-libegl-devel-cos7-x86_64        # [linux and x86_64]
+- mesa-libgl-cos7-x86_64               # [linux and x86_64]
+- mesa-libgl-devel-cos7-x86_64         # [linux and x86_64]
+- pixman-cos7-x86_64                   # [linux and x86_64]
 - sysroot_linux-64                     # [linux and x86_64]
-- xorg-x11-server-common-cos6-x86_64   # [linux and x86_64]
-- xorg-x11-server-xvfb-cos6-x86_64     # [linux and x86_64]
+- xorg-x11-server-common-cos7-x86_64   # [linux and x86_64]
+- xorg-x11-server-xvfb-cos7-x86_64     # [linux and x86_64]
 - kernel-headers_linux-aarch64         # [linux and aarch64]
 - libdrm-cos7-aarch64                  # [linux and aarch64]
 - libglvnd-cos7-aarch64                # [linux and aarch64]
@@ -90,11 +90,10 @@ dependencies:
 - python==3.11.*
 - pyyaml
 - qt-main
-- six
 - smesh
 - swig
 - vtk==9.2.6
 - xerces-c
 - yaml-cpp
 - zlib
-- zstd==1.5.6
+- zstd

data/examples/CMakeLists.txt

@@ -4,7 +4,6 @@ SET(Examples_Files
     draft_test_objects.FCStd
     EngineBlock.FCStd
     PartDesignExample.FCStd
-    RobotExample.FCStd
     BIMExample.FCStd
     FEMExample.FCStd
     AssemblyExample.FCStd

package/fedora/freecad.spec

@@ -7,18 +7,18 @@
 
 # Maintainers:  keep this list of plugins up to date
 # List plugins in %%{_libdir}/%{name}/lib, less '.so' and 'Gui.so', here
-%global plugins Fem FreeCAD PathApp Import Inspection Mesh MeshPart Part Points ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui AssemblyGui flatmesh QtUnitGui PathSimulator MatGui Material
-
+%global plugins AssemblyApp AssemblyGui CAMSimulator DraftUtils Fem FreeCAD Import Inspection MatGui Materials Measure Mesh MeshPart Part PartDesignGui Path PathApp PathSimulator Points QtUnitGui ReverseEngineering Robot Sketcher Spreadsheet Start Surface TechDraw Web _PartDesign area flatmesh libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libOndselSolver libSMDS libSMESH libSMESHDS libStdMeshers libarea-native
 
 # Some configuration options for other environments
-# rpmbuild --with=bundled_zipios:  use bundled version of zipios++
-%global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 1}
-# rpmbuild --without=bundled_pycxx:  don't use bundled version of pycxx
+# rpmbuild --with=pcl_enabled:  build with pcl support
+%global pcl_enabled %{?_with_pcl_enabled: 1} %{?!_with_pcl_enabled: 0}
+# rpmbuild --without=bundled_pycxx:  use bundled version of pycxx
 %global bundled_pycxx %{?_without_bundled_pycxx: 0} %{?!_without_bundled_pycxx: 1}
+# rpmbuild --without=bundled_zipios:  use bundled version of zipios++
+%global bundled_zipios %{?_without_bundled_zipios: 0} %{?!_without_bundled_zipios: 1}
 # rpmbuild --without=bundled_smesh:  don't use bundled version of Salome's Mesh
 %global bundled_smesh %{?_without_bundled_smesh: 0} %{?!_without_bundled_smesh: 1}
 
-
 # Prevent RPM from doing its magical 'build' directory for now
 %global __cmake_in_source_build 0
 
@@ -33,15 +33,17 @@
 
 Name:           %{name}
 Epoch:          1
-Version:        0.22
-Release:        pre_{{{git_commit_no}}}%{?dist}
+Version:        1.0.1
+Release:        {{{git_commit_no}}}%{?dist}
 Summary:        A general purpose 3D CAD modeler
 Group:          Applications/Engineering
 
 License:        LGPLv2+
 URL:            https://www.freecad.org/
-Source0:        https://github.com/%{github_name}/FreeCAD/archive/%{branch}.tar.gz
-
+Source0:        {{{ git_repo_pack }}}
+#add all submodule as source
+Source1:        {{{ git_pack path=$GIT_ROOT/src/3rdParty/OndselSolver/  dir_name="OndselSolver" }}}
+Source2:        {{{ git_pack path=$GIT_ROOT/src/3rdParty/GSL/ dir_name="GSL" }}}
 
 # Utilities
 BuildRequires:  cmake gcc-c++ gettext
@@ -63,21 +65,19 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-matplotlib
 BuildRequires:  python3-pivy
 BuildRequires:  boost-devel
-BuildRequires:  boost-python3-devel
 BuildRequires:  eigen3-devel
-# Qt5 dependencies
-\BuildRequires:  qt5-qtsvg-devel
-BuildRequires:  qt5-qttools-static
+BuildRequires:  qt6-qtsvg-devel
+BuildRequires:  qt6-qttools-static
 
 BuildRequires:  fmt-devel
 
-
 BuildRequires:  xerces-c
 BuildRequires:  xerces-c-devel
 BuildRequires:  libspnav-devel
-BuildRequires:  python3-shiboken2-devel
-BuildRequires:  python3-pyside2-devel
-BuildRequires:  pyside2-tools
+
+BuildRequires:  python3-shiboken6-devel
+BuildRequires:  python3-pyside6-devel
+BuildRequires:  pyside6-tools
 %if ! %{bundled_smesh}
 BuildRequires:  smesh-devel
 %endif
@@ -90,13 +90,16 @@ BuildRequires:  zipios++-devel
 %if ! %{bundled_pycxx}
 BuildRequires:  python3-pycxx-devel
 %endif
+BuildRequires:  python3-pybind11
 BuildRequires:  libicu-devel
 BuildRequires:  vtk-devel
 BuildRequires:  openmpi-devel
 BuildRequires:  med-devel
 BuildRequires:  libkdtree++-devel
 
+%if ! %{pcl_enabled}
 BuildRequires:  pcl-devel
+%endif
 BuildRequires:  python3
 BuildRequires:  libglvnd-devel
 BuildRequires:  yaml-cpp-devel
@@ -111,7 +114,8 @@ BuildRequires:  libappstream-glib
 # here.
 Requires:       %{name}-data = %{epoch}:%{version}-%{release}
 # Obsolete old doc package since it's required for functionality.
-Obsoletes:      %{name}-doc < 0.13-5
+Obsoletes:      %{name}-doc < 0.22-1
+
 Requires:       hicolor-icon-theme
 
 Requires:       fmt
@@ -119,8 +123,9 @@ Requires:       fmt
 Requires:       python3-pivy
 Requires:       python3-matplotlib
 Requires:       python3-collada
-Requires:       python3-pyside2
-Requires:       qt5-assistant
+Requires:       python3-pyside6
+Requires:       qt6-assistant
+
 
 %if %{bundled_smesh}
 Provides:       bundled(smesh) = %{bundled_smesh_version}
@@ -163,7 +168,13 @@ Data files for FreeCAD
 
 
 %prep
-%autosetup -p1 -n FreeCAD-%{branch}
+rm -rf %{github_name}
+# extract submodule archive and move in correct path
+%setup -T -a 1 -c -q -D -n %{github_name}/src/3rdParty/ #OndselSolver
+%setup -T -a 2 -c -q -D -n %{github_name}/src/3rdParty/ #GSL
+
+%setup -T -b 0 -q -D -n %{github_name}
+
 # Remove bundled pycxx if we're not using it
 %if ! %{bundled_pycxx}
 rm -rf src/CXX
@@ -184,11 +195,7 @@ rm -rf build && mkdir build && cd build
 CXXFLAGS='-Wno-error=cast-function-type'; export CXXFLAGS
 LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
 
-%if 0%{?fedora} > 27
 %define MEDFILE_INCLUDE_DIRS %{_includedir}/med/
-%else
-%define MEDFILE_INCLUDE_DIRS %{_includedir}/
-%endif
 
 %cmake \
        -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
@@ -197,19 +204,24 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
        -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
        -DRESOURCEDIR=%{_datadir}/%{name} \
        -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
-       -DFREECAD_USE_PCL=TRUE \
-       -DBUILD_QT5=ON \
-       -DSHIBOKEN_INCLUDE_DIR=%{_includedir}/shiboken2 \
-       -DSHIBOKEN_LIBRARY=-lshiboken2.%{py_suffix} \
+       -DFREECAD_USE_EXTERNAL_FMT=TRUE \
+       -DFREECAD_QT_VERSION:STRING=6 \
+       -DSHIBOKEN_INCLUDE_DIR=%{_includedir}/shiboken6 \
+       -DSHIBOKEN_LIBRARY=-lshiboken6.%{py_suffix} \
        -DPYTHON_SUFFIX=.%{py_suffix} \
-       -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2 \
-       -DPYSIDE_LIBRARY=-lpyside2.%{py_suffix} \
-       -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \
+       -DPYSIDE_INCLUDE_DIR=/usr/include/PySide6 \
+       -DPYSIDE_LIBRARY=-lpyside6.%{py_suffix} \
+       -DPython3_EXECUTABLE:FILEPATH=/usr/bin/python3 \
        -DMEDFILE_INCLUDE_DIRS=%{MEDFILE_INCLUDE_DIRS} \
        -DOpenGL_GL_PREFERENCE=GLVND \
        -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin4 \
        -DCOIN3D_DOC_PATH=%{_datadir}/Coin4/Coin \
        -DUSE_OCC=TRUE \
+%if ! %{pcl_enabled}
+       -DFREECAD_USE_PCL:BOOL=ON \
+%else
+       -DFREECAD_USE_PCL:BOOL=OFF \
+%endif
 %if ! %{bundled_smesh}
        -DFREECAD_USE_EXTERNAL_SMESH=TRUE \
        -DSMESH_FOUND=TRUE \
@@ -226,7 +238,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
        -DPACKAGE_WCREF="%{release} (Git)" \
        -DPACKAGE_WCURL="git://github.com/%{github_name}/FreeCAD.git main" \
        -DENABLE_DEVELOPER_TESTS=FALSE \
-	   -DBUILD_GUI=TRUE \
+       -DBUILD_GUI=TRUE \
        ../
 
 make fc_version
@@ -274,12 +286,13 @@ popd
 
 # Remove obsolete Start_Page.html
 rm -f %{buildroot}%{_docdir}/%{name}/Start_Page.html
-# Belongs in %%license not %%doc
-rm -f %{buildroot}%{_docdir}/freecad/ThirdPartyLibraries.html
 
 # Remove header from external library that's erroneously installed
 rm -f %{buildroot}%{_libdir}/%{name}/include/E57Format/E57Export.h
 
+rm -rf %{buildroot}%{_includedir}/OndselSolver/*
+rm -f %{buildroot}%{_libdir}/%{name}/share/pkgconfig/OndselSolver.pc
+
 # Bug maintainers to keep %%{plugins} macro up to date.
 #
 # Make sure there are no plugins that need to be added to plugins macro
@@ -346,12 +359,13 @@ fi
 %{_datadir}/pixmaps/*
 %{_datadir}/mime/packages/*
 %{_datadir}/thumbnailers/*
+%{_libdir}/../lib/python*/site-packages/%{name}/*
 
 %files data
 %{_datadir}/%{name}/
 %{_docdir}/%{name}/LICENSE.html
-
+%{_docdir}/%{name}/ThirdPartyLibraries.html
 
 %changelog
-
-
+* Mon Mar 10 2025 Leif-Jöran Olsson <info@friprogramvarusyndikatet.se> - 1.1.0-1
+- Adding support for building with Qt6 and PySide6 for Fedora 40+

pixi.toml

@@ -0,0 +1,154 @@
+[project]
+name = "FreeCAD"
+version = "1.0.0"
+description = "pixi instructions for FreeCAD"
+authors = ["looooo <sppedflyer@gmail.com>"]
+channels = ["conda-forge"]
+platforms = [ "linux-64", "linux-aarch64", "osx-64", "osx-arm64", "win-64" ]
+
+[dependencies]
+ccache = "*"
+cmake = "3.28.3"
+coin3d = "*"
+compilers = "*"
+conda-devenv = "*"
+debugpy = "*"
+doxygen = "*"
+eigen = "*"
+fmt = "*"
+freetype = "*"
+git = "*"
+graphviz = "*"
+hdf5 = "*"
+libboost-devel = "*"
+matplotlib = "*"
+ninja = "*"
+noqt5 = "*"
+numpy = "*"
+occt = "*"
+openssl = "*"
+pcl = "*"
+pip = "*"
+pivy = "*"
+ply = "*"
+pre-commit = "*"
+pybind11 = "*"
+pyside6 = "*"
+python = "3.13"
+pyyaml = "*"
+qt6-main = "*"
+scipy = ">=1.14.1,<2"
+six = "*"
+smesh = "*"
+swig = "*"
+vtk = "*"
+xerces-c = "*"
+yaml-cpp = "*"
+zlib = "*"
+zstd = "*"
+
+## Linux Dependencies (x86-64)
+[target.linux-64.dependencies]
+kernel-headers_linux-64 = "*"
+libdrm-cos7-x86_64 = "*"
+libselinux-cos7-x86_64 = "*"
+libsepol-cos7-x86_64 = "*"
+libspnav = "*"
+libx11-common-cos7-x86_64 = "*"
+libx11-cos7-x86_64 = "*"
+libxau-cos7-x86_64 = "*"
+libxcb-cos7-x86_64 = "*"
+libxdamage-cos7-x86_64 = "*"
+libxext-cos7-x86_64 = "*"
+libxfixes-cos7-x86_64 = "*"
+libxi-cos7-x86_64 = "*"
+libxi-devel-cos7-x86_64 = "*"
+libxxf86vm-cos7-x86_64 = "*"
+mesa-dri-drivers-cos7-x86_64 = "*"
+mesa-libegl-cos7-x86_64 = "*"
+mesa-libegl-devel-cos7-x86_64 = "*"
+mesa-libgl-cos7-x86_64 = "*"
+mesa-libgl-devel-cos7-x86_64 = "*"
+pixman-cos7-x86_64 = "*"
+sed = "*"
+sysroot_linux-64 = "*"
+xorg-x11-server-common-cos7-x86_64 = "*"
+xorg-x11-server-xvfb-cos7-x86_64 = "*"
+xorg-xproto = "*"
+
+## Linux Dependencies (aarch64)
+[target.linux-aarch64.dependencies]
+kernel-headers_linux-aarch64 = "*"
+libdrm-cos7-aarch64 = "*"
+libglvnd-cos7-aarch64 = "*"
+libglvnd-glx-cos7-aarch64 = "*"
+libselinux-cos7-aarch64 = "*"
+libsepol-cos7-aarch64 = "*"
+libspnav = "*"
+libx11-common-cos7-aarch64 = "*"
+libx11-cos7-aarch64 = "*"
+libxau-cos7-aarch64 = "*"
+libxcb-cos7-aarch64 = "*"
+libxdamage-cos7-aarch64 = "*"
+libxext-cos7-aarch64 = "*"
+libxfixes-cos7-aarch64 = "*"
+libxi-cos7-aarch64 = "*"
+libxi-devel-cos7-aarch64 = "*"
+libxxf86vm-cos7-aarch64 = "*"
+mesa-dri-drivers-cos7-aarch64 = "*"
+mesa-khr-devel-cos7-aarch64 = "*"
+mesa-libegl-cos7-aarch64 = "*"
+mesa-libegl-devel-cos7-aarch64 = "*"
+mesa-libgbm-cos7-aarch64 = "*"
+mesa-libgl-cos7-aarch64 = "*"
+mesa-libgl-devel-cos7-aarch64 = "*"
+mesa-libglapi-cos7-aarch64 = "*"
+pixman-cos7-aarch64 = "*"
+sed = "*"
+sysroot_linux-aarch64 = "*"
+xorg-x11-server-common-cos7-aarch64 = "*"
+xorg-x11-server-xvfb-cos7-aarch64 = "*"
+xorg-xproto = "*"
+
+## macOS Dependencies (Intel)
+[target.osx-64.dependencies]
+sed = "*"
+
+## macOS Dependencies (Apple Silicon)
+[target.osx-arm64.dependencies]
+sed = "*"
+
+## Qt 6 Configuration Presets
+[target.linux-64.tasks]
+configure = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-debug = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-release = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-release", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+
+[target.linux-aarch64.tasks]
+configure = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on= ["initialize"]}
+configure-debug = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on= ["initialize"]}
+configure-release = { cmd = [ "cmake", "-B", "build", "--preset", "conda-linux-release", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on= ["initialize"]}
+
+[target.osx-64.tasks]
+configure = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-debug = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-release = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-release", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+
+[target.osx-arm64.tasks]
+configure = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-debug = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-release = { cmd = [ "cmake", "-B", "build", "--preset", "conda-macos-release", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+
+[target.win-64.tasks]
+configure = { cmd = [ "cmake", "-B", "build", "--preset", "conda-windows-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-debug = { cmd = [ "cmake", "-B", "build", "--preset", "conda-windows-debug", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+configure-release = { cmd = [ "cmake", "-B", "build", "--preset", "conda-windows-release", "-DFREECAD_QT_VERSION=6", "-DBUILD_REVERSEENGINEERING=OFF" ], depends-on = ["initialize"]}
+freecad = { cmd = [ ".pixi/envs/default/Library/bin/FreeCAD.exe" ], depends-on = ["install"]}
+
+## Tasks
+[tasks]
+initialize = { cmd = ["git", "submodule", "update", "--init", "--recursive"]}
+build = { cmd = [ "cmake", "--build", "build" ] }
+install = { cmd = [ "cmake", "--install", "build" ] }
+test = { cmd = [ "ctest", "--test-dir", "build" ] }
+freecad = "build/bin/FreeCAD"

rpkg.macros

@@ -1,4 +1,4 @@
 function git_commit_no {
-	commits=$(curl -s 'https://api.github.com/repos/FreeCAD/FreeCAD/compare/120ca87015...master' | grep "\"ahead_by\":" | sed -s 's/ //g' | sed -s 's/"ahead_by"://' | sed -s 's/,//')
+	commits=$(curl -s 'https://api.github.com/repos/FreeCAD/FreeCAD/compare/120ca87015...main' | grep "\"ahead_by\":" | sed -s 's/ //g' | sed -s 's/"ahead_by"://' | sed -s 's/,//')
 	echo -n $((commits + 1))
 }

src/3rdParty/3Dconnexion/inc/SpaceMouse/CCookieCollection.hpp

@@ -18,6 +18,7 @@
 // </history>
 #include <navlib/navlib_types.h>
 // stdlib
+#include <chrono>
 #include <map>
 #include <memory>
 #include <stdexcept>

src/3rdParty/libE57Format/src/CheckedFile.cpp

@@ -25,6 +25,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+// convenience for all the BSDs
+#if defined( __FreeBSD__) || defined( __NetBSD__) || defined( __OpenBSD__)
+#define __BSD
+#endif
+
 #if defined( _WIN32 )
 #if defined( _MSC_VER )
 #include <codecvt>
@@ -44,6 +49,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
+#elif defined(__BSD)
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #elif defined( __APPLE__ )
 #include <sys/types.h>
 #include <unistd.h>
@@ -483,7 +492,7 @@ uint64_t CheckedFile::lseek64( int64_t offset, int whence )
 #endif
 #elif defined( __linux__ )
    int64_t result = ::lseek64( fd_, offset, whence );
-#elif defined( __APPLE__ )
+#elif defined( __APPLE__ ) || defined(__BSD)
    int64_t result = ::lseek( fd_, offset, whence );
 #else
 #error "no supported OS platform defined"

src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp

@@ -32,6 +32,7 @@
 #include <vtkDoubleArray.h>
 #include <vtkIdTypeArray.h>
 #include <vtkUnsignedCharArray.h>
+#include <vtkVersionMacros.h>
 
 #include <list>
 #include <climits>
@@ -249,14 +250,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
     }
   }
 
-  if (this->FaceLocations)
+  vtkIdTypeArray* thisFaceLocations = GetFaceLocations();
+  vtkIdTypeArray* thisFaces = GetFaces();
+  if (thisFaceLocations)
     {
       vtkIdTypeArray *newFaceLocations = vtkIdTypeArray::New();
       newFaceLocations->Initialize();
       newFaceLocations->Allocate(newTypes->GetSize());
       vtkIdTypeArray *newFaces = vtkIdTypeArray::New();
       newFaces->Initialize();
-      newFaces->Allocate(this->Faces->GetSize());
+      newFaces->Allocate(thisFaces->GetSize());
       for (int i = 0; i < oldCellSize; i++)
         {
           if (this->Types->GetValue(i) == VTK_EMPTY_CELL)
@@ -265,16 +268,16 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
           if (newTypes->GetValue(newCellId) == VTK_POLYHEDRON)
             {
                newFaceLocations->InsertNextValue(newFaces->GetMaxId()+1);
-               int oldFaceLoc = this->FaceLocations->GetValue(i);
-               int nCellFaces = this->Faces->GetValue(oldFaceLoc++);
+               int oldFaceLoc = thisFaceLocations->GetValue(i);
+               int nCellFaces = thisFaces->GetValue(oldFaceLoc++);
                newFaces->InsertNextValue(nCellFaces);
                for (int n=0; n<nCellFaces; n++)
                  {
-                   int nptsInFace = this->Faces->GetValue(oldFaceLoc++);
+                   int nptsInFace = thisFaces->GetValue(oldFaceLoc++);
                    newFaces->InsertNextValue(nptsInFace);
                    for (int k=0; k<nptsInFace; k++)
                      {
-                       int oldpt = this->Faces->GetValue(oldFaceLoc++);
+                       int oldpt = thisFaces->GetValue(oldFaceLoc++);
                        newFaces->InsertNextValue(idNodesOldToNew[oldpt]);
                      }
                  }
@@ -292,7 +295,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
     }
   else
   {
-    this->SetCells(newTypes, newLocations, newConnectivity, FaceLocations, Faces);
+    this->SetCells(newTypes, newLocations, newConnectivity, thisFaceLocations, thisFaces);
   }
 
   newPoints->Delete();

src/App/Application.cpp

@@ -35,6 +35,9 @@
 # endif
 # include <boost/program_options.hpp>
 # include <boost/date_time/posix_time/posix_time.hpp>
+# include <chrono>
+# include <random>
+# include <fmt/format.h>
 #endif
 
 #ifdef FC_OS_WIN32
@@ -47,6 +50,7 @@
 #include <sys/sysctl.h>
 #endif
 
+#include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
 #include <QProcessEnvironment>
@@ -137,6 +141,8 @@
 #include <App/TestScript.h>
 #include <App/CMakeScript.h>
 
+#include "SafeMode.h"
+
 #ifdef _MSC_VER // New handler for Microsoft Visual C++ compiler
 # pragma warning( disable : 4535 )
 # if !defined(_DEBUG) && defined(HAVE_SEH)
@@ -427,6 +433,10 @@ void Application::setupPythonException(PyObject* module)
     Base::PyExc_FC_PropertyError = PyErr_NewException("Base.PropertyError", PyExc_AttributeError, nullptr);
     Py_INCREF(Base::PyExc_FC_PropertyError);
     PyModule_AddObject(module, "PropertyError", Base::PyExc_FC_PropertyError);
+
+    Base::PyExc_FC_AbortIOException = PyErr_NewException("Base.PyExc_FC_AbortIOException", PyExc_BaseException, nullptr);
+    Py_INCREF(Base::PyExc_FC_AbortIOException);
+    PyModule_AddObject(module, "AbortIOException", Base::PyExc_FC_AbortIOException);
 }
 // clang-format on
 
@@ -1108,6 +1118,21 @@ Application::TransactionSignaller::~TransactionSignaller() {
     }
 }
 
+int64_t Application::applicationPid()
+{
+    static int64_t randomNumber = []() {
+        auto tp = std::chrono::high_resolution_clock::now();
+        auto dur = tp.time_since_epoch();
+        auto seed = dur.count();
+        std::mt19937 generator(static_cast<unsigned>(seed));
+        constexpr int64_t minValue {1};
+        constexpr int64_t maxValue {1000000};
+        std::uniform_int_distribution<int64_t> distribution(minValue, maxValue);
+        return distribution(generator);
+    }();
+    return randomNumber;
+}
+
 std::string Application::getHomePath()
 {
     return mConfig["AppHomePath"];
@@ -1118,6 +1143,17 @@ std::string Application::getExecutableName()
     return mConfig["ExeName"];
 }
 
+std::string Application::getNameWithVersion()
+{
+    auto appname = QCoreApplication::applicationName().toStdString();
+    auto config = App::Application::Config();
+    auto major = config["BuildVersionMajor"];
+    auto minor = config["BuildVersionMinor"];
+    auto point = config["BuildVersionPoint"];
+    auto suffix = config["BuildVersionSuffix"];
+    return fmt::format("{} {}.{}.{}{}", appname, major, minor, point, suffix);
+}
+
 std::string Application::getTempPath()
 {
     return mConfig["AppTempPath"];
@@ -1738,6 +1774,7 @@ void Application::destruct()
     Base::InterpreterSingleton::Destruct();
     Base::Type::destruct();
     ParameterManager::Terminate();
+    SafeMode::Destruct();
 }
 
 void Application::destructObserver()
@@ -2226,6 +2263,7 @@ void parseProgramOptions(int ac, char ** av, const string& exe, variables_map& v
     ("module-path,M", value< vector<string> >()->composing(),"Additional module paths")
     ("python-path,P", value< vector<string> >()->composing(),"Additional python paths")
     ("single-instance", "Allow to run a single instance of the application")
+    ("safe-mode", "Force enable safe mode")
     ("pass", value< vector<string> >()->multitoken(), "Ignores the following arguments and pass them through to be used by a script")
     ;
 
@@ -2553,6 +2591,10 @@ void Application::initConfig(int argc, char ** argv)
 
     // extract home paths
     ExtractUserPath();
+    
+    if (vm.count("safe-mode")) {
+        SafeMode::StartSafeMode();
+    }
 
 #   ifdef FC_DEBUG
     mConfig["Debug"] = "1";
@@ -2641,6 +2683,12 @@ void Application::initConfig(int argc, char ** argv)
                               mConfig["BuildVersionPoint"].c_str(),
                               mConfig["BuildVersionSuffix"].c_str(),
                               mConfig["BuildRevision"].c_str());
+
+        if (SafeMode::SafeModeEnabled()) {
+            Base::Console().Message("FreeCAD is running in _SAFE_MODE_.\n"
+                                    "Safe mode temporarily disables your configurations and "
+                                    "addons. Restart the application to exit safe mode.\n\n");
+        }
     }
     LoadParameters();
 
@@ -3013,7 +3061,7 @@ void Application::LoadParameters()
     }
 }
 
-#if defined(_MSC_VER) && BOOST_VERSION < 108300
+#if defined(_MSC_VER) && BOOST_VERSION < 108200
     // fix weird error while linking boost (all versions of VC)
     // VS2010: https://forum.freecad.org/viewtopic.php?f=4&t=1886&p=12553&hilit=boost%3A%3Afilesystem%3A%3Aget#p12553
     namespace boost { namespace program_options { std::string arg="arg"; } }
@@ -3323,7 +3371,46 @@ void Application::ExtractUserPath()
     mConfig["UserMacroPath"] = Base::FileInfo::pathToString(macro) + PATHSEP;
 }
 
-#if defined (FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_BSD)
+// TODO: Consider using this for all UNIX-like OSes
+#if defined(__OpenBSD__)
+#include <cstdio>
+#include <cstdlib>
+#include <sys/param.h>
+#include <QCoreApplication>
+
+std::string Application::FindHomePath(const char* sCall)
+{
+    // We have three ways to start this application either use one of the two executables or
+    // import the FreeCAD.so module from a running Python session. In the latter case the
+    // Python interpreter is already initialized.
+    std::string absPath;
+    std::string homePath;
+    if (Py_IsInitialized()) {
+        // Note: realpath is known to cause a buffer overflow because it
+        // expands the given path to an absolute path of unknown length.
+        // Even setting PATH_MAX does not necessarily solve the problem
+        // for sure but the risk of overflow is rather small.
+        char resolved[PATH_MAX];
+        char* path = realpath(sCall, resolved);
+        if (path)
+            absPath = path;
+    }
+    else {
+        int argc = 1;
+        QCoreApplication app(argc, (char**)(&sCall));
+        absPath = QCoreApplication::applicationFilePath().toStdString();
+    }
+
+    // should be an absolute path now
+    std::string::size_type pos = absPath.find_last_of("/");
+    homePath.assign(absPath,0,pos);
+    pos = homePath.find_last_of("/");
+    homePath.assign(homePath,0,pos+1);
+
+    return homePath;
+}
+
+#elif defined (FC_OS_LINUX) || defined(FC_OS_CYGWIN) || defined(FC_OS_BSD)
 #include <cstdio>
 #include <cstdlib>
 #include <sys/param.h>

src/App/Application.h

@@ -399,12 +399,14 @@ public:
     static std::map<std::string, std::string> &Config(){return mConfig;}
     static int GetARGC(){return _argc;}
     static char** GetARGV(){return _argv;}
+    static int64_t applicationPid();
     //@}
 
     /** @name Application directories */
     //@{
     static std::string getHomePath();
     static std::string getExecutableName();
+    static std::string getNameWithVersion();
     /*!
      Returns the temporary directory. By default, this is set to the
      system's temporary directory but can be customized by the user.

src/App/ApplicationPy.cpp

@@ -86,7 +86,7 @@ PyMethodDef Application::Methods[] = {
     {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataPath, METH_VARARGS,
      "Get the root directory of application data"},
     {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroPath, METH_VARARGS,
-     "getUserMacroDir(bool=False) -> string"
+     "getUserMacroDir(bool=False) -> str\n\n"
      "Get the directory of the user's macro directory\n"
      "If parameter is False (the default) it returns the standard path in the"
      "user's home directory, otherwise it returns the user-defined path."},
@@ -169,11 +169,13 @@ PyMethodDef Application::Methods[] = {
      "active transaction causes any document changes to open a transaction with\n"
      "the given name and ID."},
     {"getActiveTransaction", (PyCFunction) Application::sGetActiveTransaction, METH_VARARGS,
-     "getActiveTransaction() -> (name,id) return the current active transaction name and ID"},
+     "getActiveTransaction() -> (name,id)\n\n"
+     "return the current active transaction name and ID"},
     {"closeActiveTransaction", (PyCFunction) Application::sCloseActiveTransaction, METH_VARARGS,
      "closeActiveTransaction(abort=False) -- commit or abort current active transaction"},
     {"isRestoring", (PyCFunction) Application::sIsRestoring, METH_VARARGS,
-     "isRestoring() -> Bool -- Test if the application is opening some document"},
+     "isRestoring() -> bool\n\n"
+     "Test if the application is opening some document"},
     {"checkAbort", (PyCFunction) Application::sCheckAbort, METH_VARARGS,
      "checkAbort() -- check for user abort in length operation.\n\n"
      "This only works if there is an active sequencer (or ProgressIndicator in Python).\n"

src/App/CMakeLists.txt

@@ -56,6 +56,10 @@ include_directories(
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+include_directories(
+    SYSTEM
     ${Boost_INCLUDE_DIRS}
     ${PYTHON_INCLUDE_DIRS}
     ${XercesC_INCLUDE_DIRS}
@@ -288,6 +292,7 @@ SET(FreeCADApp_CPP_SRCS
     Metadata.cpp
     MetadataPyImp.cpp
     ElementNamingUtils.cpp
+    SafeMode.cpp
     StringHasher.cpp
     StringHasherPyImp.cpp
     StringIDPyImp.cpp

src/App/ComplexGeoData.cpp

@@ -546,10 +546,10 @@ void ComplexGeoData::readElements(Base::XMLReader& reader, size_t count)
                 }
             }
         }
-        _elementMap->setElementName(IndexedName(reader.getAttribute("value"), types),
-                                    MappedName(reader.getAttribute("key")),
-                                    Tag,
-                                    &sids);
+        ensureElementMap()->setElementName(IndexedName(reader.getAttribute("value"), types),
+                                           MappedName(reader.getAttribute("key")),
+                                           Tag,
+                                           &sids);
     }
     if (invalid_count != 0) {
         FC_ERR("Found " << invalid_count << " invalid string id");  // NOLINT

src/App/Document.cpp

@@ -931,18 +931,21 @@ Document::~Document()
 std::string Document::getTransientDirectoryName(const std::string& uuid, const std::string& filename) const
 {
     // Create a directory name of the form: {ExeName}_Doc_{UUID}_{HASH}_{PID}
-    std::stringstream s;
+    std::stringstream out;
     QCryptographicHash hash(QCryptographicHash::Sha1);
 #if QT_VERSION < QT_VERSION_CHECK(6,3,0)
     hash.addData(filename.c_str(), filename.size());
 #else
     hash.addData(QByteArrayView(filename.c_str(), filename.size()));
 #endif
-    s << App::Application::getUserCachePath() << App::Application::getExecutableName()
-      << "_Doc_" << uuid
-      << "_" << hash.result().toHex().left(6).constData()
-      << "_" << QCoreApplication::applicationPid();
-    return s.str();
+    out << App::Application::getUserCachePath() << App::Application::getExecutableName()
+        << "_Doc_"
+        << uuid
+        << "_"
+        << hash.result().toHex().left(6).constData()
+        << "_"
+        << App::Application::applicationPid();
+    return out.str();
 }
 
 //--------------------------------------------------------------------------
@@ -1475,6 +1478,7 @@ Document::readObjects(Base::XMLReader& reader)
 
 void Document::addRecomputeObject(DocumentObject *obj) {
     if(testStatus(Status::Restoring) && obj) {
+        setStatus(Status::RecomputeOnRestore, true);
         d->touchedObjs.insert(obj);
         obj->touch();
     }
@@ -3619,6 +3623,7 @@ void Document::_removeObject(DocumentObject* pcObject)
     if (!d->rollback && d->activeUndoTransaction) {
         // Undo stuff
         signalTransactionRemove(*pcObject, d->activeUndoTransaction);
+        breakDependency(pcObject, true);
         d->activeUndoTransaction->addObjectNew(pcObject);
     }
     else {

src/App/Document.h

@@ -77,6 +77,7 @@ public:
         RestoreError = 10,
         LinkStampChanged = 11, // Indicates during restore time if any linked document's time stamp has changed
         IgnoreErrorOnRecompute = 12, // Don't report errors if the recompute failed
+        RecomputeOnRestore = 13, // Mark pending recompute on restore for migration purposes
     };
 
     /** @name Properties */

src/App/DocumentObject.h

@@ -442,6 +442,12 @@ public:
     /* Return true to cause PropertyView to show linked object's property */
     virtual bool canLinkProperties() const {return true;}
 
+    /* Return whether this object is a link */
+    virtual bool isLink() const {return false;};
+
+    /* Return whether this object is a link group */
+    virtual bool isLinkGroup() const {return false;};
+
     /* Return true to bypass duplicate label checking */
     virtual bool allowDuplicateLabel() const {return false;}
 

src/App/DocumentObjectPy.xml

@@ -232,6 +232,13 @@ Return tuple(obj,newElementName,oldElementName)
                 </UserDocu>
             </Documentation>
         </Methode>
+        <Methode Name="isAttachedToDocument" Const="true">
+            <Documentation>
+                <UserDocu>
+                    isAttachedToDocument(): return true if the object is part of a document, false otherwise
+                </UserDocu>
+            </Documentation>
+        </Methode>
     <Attribute Name="OutList" ReadOnly="true">
       <Documentation>
         <UserDocu>A list of all objects this object links to.</UserDocu>
@@ -266,7 +273,7 @@ Return tuple(obj,newElementName,oldElementName)
             <Documentation>
                 <UserDocu>Return the internal name of this object</UserDocu>
             </Documentation>
-            <Parameter Name="Name" Type="String"/>
+            <Parameter Name="Name" Type="Object"/>
         </Attribute>
                 <Attribute Name="Document" ReadOnly="true">
                         <Documentation>

src/App/DocumentObjectPyImp.cpp

@@ -49,14 +49,14 @@ std::string DocumentObjectPy::representation() const
     return str.str();
 }
 
-Py::String DocumentObjectPy::getName() const
+Py::Object DocumentObjectPy::getName() const
 {
     DocumentObject* object = this->getDocumentObjectPtr();
     const char* internal = object->getNameInDocument();
     if (!internal) {
-        throw Py::RuntimeError(std::string("This object is currently not part of a document"));
+        return Py::None();
     }
-    return {std::string(internal)};
+    return Py::String(internal);
 }
 
 Py::String DocumentObjectPy::getFullName() const
@@ -76,6 +76,17 @@ Py::Object DocumentObjectPy::getDocument() const
     }
 }
 
+PyObject* DocumentObjectPy::isAttachedToDocument(PyObject *args)
+{
+    if (!PyArg_ParseTuple(args, "")) {
+        return nullptr;
+    }
+
+    DocumentObject* object = this->getDocumentObjectPtr();
+    bool ok = object->isAttachedToDocument();
+    return Py::new_reference_to(Py::Boolean(ok));
+}
+
 PyObject*  DocumentObjectPy::addProperty(PyObject *args, PyObject *kwd)
 {
     char *sType,*sName=nullptr,*sGroup=nullptr,*sDoc=nullptr;

src/App/Expression.cpp

@@ -3855,6 +3855,13 @@ bool ExpressionParser::isTokenAnIndentifier(const std::string & str)
     return (status == 0 && (token == IDENTIFIER || token == CELLADDRESS));
 }
 
+bool ExpressionParser::isTokenAConstant(const std::string & str)
+{
+    int token{}, status{};
+    std::tie(token, status) = getTokenAndStatus(str);
+    return (status == 0 && token == CONSTANT);
+}
+
 bool ExpressionParser::isTokenAUnit(const std::string & str)
 {
     int token{}, status{};

src/App/ExpressionParser.h

@@ -500,6 +500,7 @@ AppExport Expression * parse(const App::DocumentObject *owner, const char *buffe
 AppExport UnitExpression * parseUnit(const App::DocumentObject *owner, const char *buffer);
 AppExport ObjectIdentifier parsePath(const App::DocumentObject *owner, const char* buffer);
 AppExport bool isTokenAnIndentifier(const std::string & str);
+AppExport bool isTokenAConstant(const std::string & str);
 AppExport bool isTokenAUnit(const std::string & str);
 AppExport std::vector<std::tuple<int, int, std::string> > tokenize(const std::string & str);
 

src/App/ExpressionParser.l

@@ -340,7 +340,7 @@ EXPO     [eE][-+]?[0-9]+
 {DIGIT}*","{DIGIT}+{EXPO}?   COUNTCHARS; yylval.fvalue = num_change(yytext,',','.');       return yylval.fvalue == 1 ? ONE : NUM;
 {DIGIT}+{EXPO}               COUNTCHARS; yylval.fvalue = num_change(yytext,',','.');       return yylval.fvalue == 1 ? ONE : NUM;
 {DIGIT}+                     { COUNTCHARS;
-                               yylval.ivalue = strtoll( yytext, NULL, 0 );
+                               yylval.ivalue = strtoll( yytext, NULL, 10 );
                                if (yylval.ivalue == LLONG_MIN)
                                   throw Base::UnderflowError("Integer underflow");
                                else if (yylval.ivalue == LLONG_MAX)

src/App/FreeCADInit.py

@@ -916,6 +916,7 @@ class Scheme(IntEnum):
     MmMin = 6
     ImperialCivil = 7
     FemMilliMeterNewton = 8
+    MeterDecimal = 9
 
 App.Units.Scheme = Scheme
 

src/App/GeoFeature.cpp

@@ -25,6 +25,8 @@
 
 #include <App/GeoFeaturePy.h>
 
+#include <Base/Tools.h>
+
 #include "ComplexGeoData.h"
 #include "Document.h"
 #include "GeoFeature.h"
@@ -157,7 +159,7 @@ DocumentObject *GeoFeature::resolveElement(DocumentObject *obj, const char *subn
     }
     if(geoFeature)
         *geoFeature = geo;
-    if(!obj || (filter && obj!=filter))
+    if(!obj || (filter && geo!=filter))
         return nullptr;
     if(!element || !element[0]) {
         if(append) 
@@ -270,3 +272,68 @@ GeoFeature::getHigherElements(const char *element, bool silent) const
         return {};
     return prop->getComplexData()->getHigherElements(element, silent);
 }
+
+Base::Placement GeoFeature::getPlacementFromProp(App::DocumentObject* obj, const char* propName)
+{
+    Base::Placement plc = Base::Placement();
+    auto* propPlacement = dynamic_cast<App::PropertyPlacement*>(obj->getPropertyByName(propName));
+    if (propPlacement) {
+        plc = propPlacement->getValue();
+    }
+    return plc;
+}
+
+Base::Placement GeoFeature::getGlobalPlacement(App::DocumentObject* targetObj,
+                                                   App::DocumentObject* rootObj,
+                                                   const std::string& sub)
+{
+    if (!targetObj || !rootObj || sub.empty()) {
+        return Base::Placement();
+    }
+    std::vector<std::string> names = Base::Tools::splitSubName(sub);
+
+    App::Document* doc = rootObj->getDocument();
+    Base::Placement plc = getPlacementFromProp(rootObj, "Placement");
+
+    if (targetObj == rootObj) return plc;
+
+    if (rootObj->isLink()) {
+        // Update doc in case its an external link.
+        doc = rootObj->getLinkedObject()->getDocument();
+    }
+
+    for (auto& name : names) {
+        App::DocumentObject* obj = doc->getObject(name.c_str());
+        if (!obj) {
+            return Base::Placement();
+        }
+
+        plc = plc * getPlacementFromProp(obj, "Placement");
+
+        if (obj == targetObj) {
+            return plc;
+        }
+        if (obj->isLink()) {
+            // Update doc in case its an external link.
+            doc = obj->getLinkedObject()->getDocument();
+        }
+    }
+
+    // If targetObj has not been found there's a problem
+    return Base::Placement();
+}
+
+Base::Placement GeoFeature::getGlobalPlacement(App::DocumentObject* targetObj,
+                                                   App::PropertyXLinkSub* prop)
+{
+    if (!targetObj || !prop) {
+        return Base::Placement();
+    }
+
+    std::vector<std::string> subs = prop->getSubValues();
+    if (subs.empty()) {
+        return Base::Placement();
+    }
+
+    return getGlobalPlacement(targetObj, prop->getValue(), subs[0]);
+}

src/App/GeoFeature.h

@@ -108,8 +108,9 @@ public:
             const DocumentObject *filter=nullptr,const char **element=nullptr, GeoFeature **geo=nullptr);
 
     /**
-     * @brief Calculates the placement in the global reference coordinate system
+     * @brief Deprecated. Calculates the placement in the global reference coordinate system
      * 
+     * Deprecated: This does not handle App::Links correctly. Use getGlobalPlacement() instead.
      * In FreeCAD the GeoFeature placement describes the local placement of the object in its parent
      * coordinate system. This is however not always the same as the global reference system. If the
      * object is in a GeoFeatureGroup, hence in another local coordinate system, the Placement
@@ -179,6 +180,10 @@ public:
     /// Return the higher level element names of the given element
     virtual std::vector<Data::IndexedName> getHigherElements(const char *name, bool silent=false) const;
 
+    static Base::Placement getPlacementFromProp(DocumentObject* obj, const char* propName);
+    static Base::Placement getGlobalPlacement(DocumentObject* targetObj, DocumentObject* rootObj, const std::string& sub);
+    static Base::Placement getGlobalPlacement(DocumentObject* targetObj, PropertyXLinkSub* prop);
+
 protected:
     void onChanged(const Property* prop) override;
 //    void onDocumentRestored() override;

src/App/GeoFeaturePy.xml

@@ -30,6 +30,7 @@ Note: Not implemented.</UserDocu>
     <Methode Name="getGlobalPlacement">
       <Documentation>
         <UserDocu>getGlobalPlacement() -> Base.Placement
+Deprecated: This function does not handle Links correctly. Use getGlobalPlacementOf instead.
 
 Returns the placement of the object in the global coordinate space, respecting all stacked
 relationships.
@@ -37,6 +38,22 @@ Note: This function is not available during recompute, as there the placements o
 can change after the execution of this object, rendering the result wrong.</UserDocu>
       </Documentation>
     </Methode>
+    <Methode Name="getGlobalPlacementOf" Static="true">
+      <Documentation>
+        <UserDocu>getGlobalPlacementOf(targetObj, rootObj, subname) -> Base.Placement
+Selection example: obj = "part1" sub = "linkToPart2.LinkToBody.Pad.face1"
+
+Global placement of Pad in this context :
+getGlobalPlacementOf(pad, part1, "linkToPart2.LinkToBody.Pad.face1")
+
+Global placement of linkToPart2 in this context :
+getGlobalPlacementOf(linkToPart2, part1, "linkToPart2.LinkToBody.Pad.face1")
+
+Returns the placement of the object in the global coordinate space, respecting all stacked
+relationships.
+        </UserDocu>
+      </Documentation>
+    </Methode>
     <Methode Name="getPropertyNameOfGeometry">
       <Documentation>
         <UserDocu>getPropertyNameOfGeometry() -> str or None

src/App/GeoFeaturePyImp.cpp

@@ -57,6 +57,27 @@ PyObject* GeoFeaturePy::getGlobalPlacement(PyObject * args) {
     }
 }
 
+PyObject* GeoFeaturePy::getGlobalPlacementOf(PyObject * args) {
+
+    PyObject* pyTargetObj {nullptr};
+    PyObject* pyRootObj {nullptr};
+    char* pname;
+
+    if (!PyArg_ParseTuple(args, "OOs", &pyTargetObj, &pyRootObj, &pname)) {
+        return nullptr;
+    }
+    auto* targetObj = static_cast<App::DocumentObjectPy*>(pyTargetObj)->getDocumentObjectPtr();
+    auto* rootObj = static_cast<App::DocumentObjectPy*>(pyRootObj)->getDocumentObjectPtr();
+
+    try {
+        Base::Placement p = GeoFeature::getGlobalPlacement(targetObj, rootObj, pname);
+        return new Base::PlacementPy(new Base::Placement(p));
+    }
+    catch (const Base::Exception& e) {
+        throw Py::RuntimeError(e.what());
+    }
+}
+
 PyObject* GeoFeaturePy::getPropertyNameOfGeometry(PyObject * args)
 {
     if (!PyArg_ParseTuple(args, ""))

src/App/Graphviz.cpp

@@ -120,7 +120,14 @@ void Document::exportGraphviz(std::ostream& out) const
          */
 
         std::string getId(const DocumentObject * docObj) {
-            return std::string((docObj)->getDocument()->getName()) + "#" + docObj->getNameInDocument();
+            std::string id;
+            if (docObj->isAttachedToDocument()) {
+                auto doc = docObj->getDocument();
+                id.append(doc->getName());
+                id.append("#");
+                id.append(docObj->getNameInDocument());
+            }
+            return id;
         }
 
         /**
@@ -434,11 +441,14 @@ void Document::exportGraphviz(std::ostream& out) const
                     if (obj) {
                         std::map<std::string,Vertex>::const_iterator item = GlobalVertexList.find(getId(obj));
 
-                        if (item == GlobalVertexList.end())
-                            add(obj,
-                                std::string(obj->getDocument()->getName()) + "#" + obj->getNameInDocument(),
-                                std::string(obj->getDocument()->getName()) + "#" + obj->Label.getValue(),
-                                CSSubgraphs);
+                        if (item == GlobalVertexList.end()) {
+                            if (obj->isAttachedToDocument()) {
+                                add(obj,
+                                    std::string(obj->getDocument()->getName()) + "#" + obj->getNameInDocument(),
+                                    std::string(obj->getDocument()->getName()) + "#" + obj->Label.getValue(),
+                                    CSSubgraphs);
+                            }
+                        }
                     }
                 }
             }
@@ -486,23 +496,20 @@ void Document::exportGraphviz(std::ostream& out) const
             // Add edges between document objects
             for (const auto & It : d->objectMap) {
 
-                if(omitGeoFeatureGroups) {
-                    //coordinate systems are represented by subgraphs
-                    if(It.second->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()))
-                        continue;
-
-                    //as well as origins
-                    if(It.second->isDerivedFrom(Origin::getClassTypeId()))
-                        continue;
+                if(omitGeoFeatureGroups && It.second->isDerivedFrom(Origin::getClassTypeId())) {
+                    continue;
                 }
 
                 std::map<DocumentObject*, int> dups;
                 std::vector<DocumentObject*> OutList = It.second->getOutList();
                 const DocumentObject * docObj = It.second;
+                const bool docObj_is_group = docObj->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId());
 
                 for (auto obj : OutList) {
                     if (obj) {
-
+                        if(omitGeoFeatureGroups && docObj_is_group && GeoFeatureGroupExtension::getGroupOfObject(obj) == docObj) {
+                            continue;
+                        }
                         // Count duplicate edges
                         bool inserted = edge(GlobalVertexList[getId(docObj)], GlobalVertexList[getId(obj)], DepList).second;
                         if (inserted) {

src/App/Link.cpp

@@ -2282,6 +2282,16 @@ bool Link::canLinkProperties() const {
     return true;
 }
 
+bool Link::isLink() const
+{
+    return ElementCount.getValue() == 0;
+}
+
+bool Link::isLinkGroup() const
+{
+    return ElementCount.getValue() > 0;
+}
+
 //////////////////////////////////////////////////////////////////////////////////////////
 
 namespace App {
@@ -2309,6 +2319,11 @@ bool LinkElement::canDelete() const {
     return !owner || !owner->getDocument()->getObjectByID(_LinkOwner.getValue());
 }
 
+bool LinkElement::isLink() const
+{
+    return true;
+}
+
 App::Link* LinkElement::getLinkGroup() const
 {
     std::vector<App::DocumentObject*> inList = getInList();

src/App/Link.h

@@ -556,6 +556,10 @@ public:
     }
 
     bool canLinkProperties() const override;
+
+    bool isLink() const override;
+
+    bool isLinkGroup() const override;
 };
 
 using LinkPython = App::FeaturePythonT<Link>;
@@ -600,6 +604,8 @@ public:
         _handleChangedPropertyName(reader,TypeName,PropName);
     }
 
+    bool isLink() const override;
+
     App::Link* getLinkGroup() const;
 };
 

src/App/Metadata.cpp

@@ -58,7 +58,12 @@ directly. If you did not intend to use a system-defined macro
 
 using namespace App;
 namespace fs = boost::filesystem;
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 
 namespace MetadataInternal
 {

src/App/MetadataPyImp.cpp

@@ -30,7 +30,12 @@
 #include "MetadataPy.cpp"
 
 using namespace Base;
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 
 // Returns a string which represents the object e.g. when printed in Python
 std::string MetadataPy::representation() const

src/App/PreCompiled.h

@@ -69,6 +69,7 @@
 
 // STL
 #include <bitset>
+#include <chrono>
 #include <exception>
 #include <functional>
 #include <iterator>
@@ -99,6 +100,8 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 
-#endif //_PreComp_
+#include <fmt/format.h>
+
+#endif  //_PreComp_
 
 #endif // APP_PRECOMPILED_H

src/App/ProjectFile.cpp

@@ -56,7 +56,12 @@
 #include <Base/Stream.h>
 #include <Base/XMLTools.h>
 
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+#else
 XERCES_CPP_NAMESPACE_USE
+#endif
 using namespace App;
 
 namespace {

src/App/ProjectFile.h

@@ -32,11 +32,17 @@
 #include <string>
 #include <xercesc/util/XercesDefs.hpp>
 
+#ifndef XERCES_CPP_NAMESPACE_BEGIN
+#define XERCES_CPP_NAMESPACE_QUALIFIER
+using namespace XERCES_CPP_NAMESPACE;
+namespace XERCES_CPP_NAMESPACE { class DOMNode; class DOMElement; class DOMDocument; }
+#else
 XERCES_CPP_NAMESPACE_BEGIN
 class DOMDocument;
 class DOMElement;
 class DOMNode;
 XERCES_CPP_NAMESPACE_END
+#endif
 
 namespace App
 {

src/App/Property.cpp

@@ -199,8 +199,10 @@ struct PropertyCleaner {
         while (!_RemovedProps.empty()) {
             auto p = _RemovedProps.back();
             _RemovedProps.pop_back();
-            if(p != prop)
+            if (p != prop) {
+                p->setContainer(nullptr);
                 delete p;
+            }
             else
                 found = true;
         }

src/App/PropertyLinks.cpp

@@ -272,7 +272,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
         return;
     }
     if (shadow.newName.empty()) {
-        _updateElementReference(0, obj, sub, shadow, false);
+        _updateElementReference(nullptr, obj, sub, shadow, false);
         return;
     }
     GeoFeature* geo = nullptr;
@@ -283,7 +283,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
                                elementName,
                                true,
                                GeoFeature::ElementNameType::Export,
-                               0,
+                               nullptr,
                                &element,
                                &geo);
     if (!geo || !element || !element[0]) {

src/App/PropertyStandard.cpp

@@ -1389,6 +1389,10 @@ void PropertyString::setValue(const char* newLabel)
         obj->onBeforeChangeLabel(label);
         newLabel = label.c_str();
 
+        if (newLabel == _cValue) {
+            return;
+        }
+
         if(!obj->getDocument()->testStatus(App::Document::Restoring)) {
             // Only update label reference if we are not restoring. When
             // importing (which also counts as restoring), it is possible the
@@ -3018,6 +3022,17 @@ void PropertyMaterialList::setTransparency(int index, float val)
     hasSetValue();
 }
 
+void PropertyMaterialList::setTransparencies(const std::vector<float>& transparencies)
+{
+    aboutToSetValue();
+    setSize(transparencies.size(), _lValueList[0]);
+
+    for (std::size_t i = 0; i < transparencies.size(); i++) {
+        _lValueList[i].transparency = transparencies[i];
+    }
+    hasSetValue();
+}
+
 const Color& PropertyMaterialList::getAmbientColor() const
 {
     return _lValueList[0].ambientColor;
@@ -3088,6 +3103,16 @@ float PropertyMaterialList::getTransparency(int index) const
     return _lValueList[index].transparency;
 }
 
+std::vector<float> PropertyMaterialList::getTransparencies() const
+{
+    std::vector<float> list;
+    for (auto& material : _lValueList) {
+        list.push_back(material.transparency);
+    }
+
+    return list;
+}
+
 Material PropertyMaterialList::getPyValue(PyObject* value) const
 {
     if (PyObject_TypeCheck(value, &(MaterialPy::Type))) {

src/App/PropertyStandard.h

@@ -1156,6 +1156,7 @@ public:
 
     void setTransparency(float);
     void setTransparency(int index, float);
+    void setTransparencies(const std::vector<float>& transparencies);
 
     const Color& getAmbientColor() const;
     const Color& getAmbientColor(int index) const;
@@ -1175,6 +1176,7 @@ public:
 
     float getTransparency() const;
     float getTransparency(int index) const;
+    std::vector<float> getTransparencies() const;
 
     PyObject* getPyObject() override;
 

src/App/Resources/translations/App.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../../Application.cpp" line="459"/>
+        <location filename="../../Application.cpp" line="463"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>

src/App/Resources/translations/App_be.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Без назвы</translation>
     </message>

src/App/Resources/translations/App_ca.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sense nom</translation>
     </message>

src/App/Resources/translations/App_cs.ts

@@ -14,7 +14,7 @@ které odkazují na stejný konfigurovatelný objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nepojmenovaný</translation>
     </message>

src/App/Resources/translations/App_da.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unavngivet</translation>
     </message>

src/App/Resources/translations/App_de.ts

@@ -14,7 +14,7 @@ angewendet werden soll, die das gleiche konfigurierbare Objekt referenzieren</tr
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Unbenannt</translation>
     </message>

src/App/Resources/translations/App_el.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Ανώνυμο</translation>
     </message>

src/App/Resources/translations/App_es-AR.ts

@@ -14,7 +14,7 @@ que hacen referencia al mismo objeto configurable</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_es-ES.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sin nombre</translation>
     </message>

src/App/Resources/translations/App_eu.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Izenik gabea</translation>
     </message>

src/App/Resources/translations/App_fi.ts

@@ -14,7 +14,7 @@ that reference the same configurable object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nimetön</translation>
     </message>

src/App/Resources/translations/App_fr.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nouveau</translation>
     </message>

src/App/Resources/translations/App_hr.ts

@@ -14,7 +14,7 @@ na sve veze koje referenciraju isti konfigurabilni objekt</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Neimenovano</translation>
     </message>

src/App/Resources/translations/App_hu.ts

@@ -14,7 +14,7 @@ amelyek ugyanarra a konfigurálható tárgyra hivatkoznak</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Névtelen</translation>
     </message>

src/App/Resources/translations/App_it.ts

@@ -14,7 +14,7 @@ che fanno riferimento allo stesso oggetto configurabile</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Senza nome</translation>
     </message>

src/App/Resources/translations/App_ja.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>名称未設定</translation>
     </message>

src/App/Resources/translations/App_ka.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>უსახელო</translation>
     </message>

src/App/Resources/translations/App_ko.ts

@@ -7,14 +7,13 @@
       <location filename="../../Link.cpp" line="118"/>
       <source>Stores the last user choice of whether to apply CopyOnChange setup to all links
 that reference the same configurable object</source>
-      <translation type="unfinished">Stores the last user choice of whether to apply CopyOnChange setup to all links
-that reference the same configurable object</translation>
+      <translation>동일한 물체를 참조하는 모든 연결에 CopyOnChange 설정을 적용할지 사용자의 최종 선택값을 저장</translation>
     </message>
   </context>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>이름없음</translation>
     </message>

src/App/Resources/translations/App_lt.ts

@@ -13,7 +13,7 @@ that reference the same configurable object</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Be pavadinimo</translation>
     </message>

src/App/Resources/translations/App_nl.ts

@@ -14,7 +14,7 @@ die verwijzen naar hetzelfde configureerbare object</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Naamloos</translation>
     </message>

src/App/Resources/translations/App_pl.ts

@@ -14,7 +14,7 @@ które odnoszą się do tego samego obiektu konfigurowalnego</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Nienazwany</translation>
     </message>

src/App/Resources/translations/App_pt-BR.ts

@@ -14,7 +14,7 @@ que referenciam o mesmo objeto configurável</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../../Application.cpp" line="459"/>
+      <location filename="../../Application.cpp" line="468"/>
       <source>Unnamed</source>
       <translation>Sem nome</translation>
     </message>