Merge branch 'FreeCAD:main' into main

Author: sasobadovinac

.github/workflows/dependency-review.yml

@@ -24,4 +24,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@67d4f4bd7a9b17a0db54d2a7519187c65e339de8 # v4
+        uses: actions/dependency-review-action@8805179dc9a63c54224914839d370dd93bd37b2e # v4

.github/workflows/issue-metrics.yml

@@ -35,7 +35,7 @@ jobs:
         echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
 
     - name: Run issue-metrics tool
-      uses: github/issue-metrics@ed6e4b2b46f44ec7cdd2f6c145757a67a07ecf5b # v3.18.4
+      uses: github/issue-metrics@6a0f49b4e14363b63e65ec698b43715b69d21f6d # v3.20.0
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:FreeCAD/FreeCAD is:issue created:${{ env.last_month }}'

.github/workflows/sub_lint.yml

@@ -208,7 +208,7 @@ jobs:
 
     # Generic lints steps
       - name: Check File Case Sensitivity
-        uses: credfeto/[email protected]
+        uses: credfeto/action-case-checker@cb652aeab29ed363bbdb7d9ee1bfcc010c46cac5 # v1.3.0
 
       - name: Check for non Unix line ending
         if: inputs.checkLineendings && always()

.github/workflows/sub_weeklyBuild.yml

@@ -18,9 +18,11 @@ jobs:
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Checkout Source
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 2
+          fetch-tags: true
           submodules: 'recursive'
 
       - name: Tag Build
@@ -35,6 +37,7 @@ jobs:
           gh release create ${BUILD_TAG} --title "Development Build ${BUILD_TAG}" -F .github/workflows/weekly-build-notes.md --prerelease || true
 
       - name: Upload Source
+        id: upload_source
         shell: bash -l {0}
         env:
           GH_TOKEN: ${{ github.token }}
@@ -68,20 +71,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     environment: weekly-build
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
+        with:
+          egress-policy: audit
+
       # prevent running out of disk space on Ubuntu runners.
       - name: Maximize build space
         if: runner.os == 'Linux'
-        uses: AdityaGarg8/remove-unwanted-software@v5
+        uses: AdityaGarg8/remove-unwanted-software@90e01b21170618765a73370fcc3abbd1684a7793 # v5
         with:
           verbose: 'true'
           remove-android: 'true'      # (frees ~9 GB)
           remove-cached-tools: 'true' # (frees ~8.3 GB)
 
-      - name: Harden the runner (Audit all outbound calls)
-        uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0
-        with:
-          egress-policy: audit
-
       - name: Set Platform Environment Variables
         shell: bash -l {0}
         env:
@@ -94,15 +97,16 @@ jobs:
             echo 'RATTLER_CACHE_DIR=D:\rattler' >> "$GITHUB_ENV"
           fi
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Checkout Source
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 0
+          fetch-depth: 2
           fetch-tags: true
           submodules: 'recursive'
 
       - uses: prefix-dev/setup-pixi@19eac09b398e3d0c747adc7921926a6d802df4da # v0.8.8
         with:
-          pixi-version: v0.42.1
+          pixi-version: v0.46.0
           cache: false
 
       - name: Install the Apple certificate and provisioning profile
@@ -152,6 +156,8 @@ jobs:
           TARGET_PLATFORM: ${{ matrix.target }}
           UPLOAD_RELEASE: "true"
         run: |
+          python3 package/rattler-build/scripts/make_version_file.py ../freecad_version.txt
+          git apply package/rattler-build/scripts/disable_git_info.patch
           cd package/rattler-build
           pixi install
           pixi run -e package create_bundle

.github/workflows/weekly-build-notes.md

@@ -1,21 +1,15 @@
-# Weekly Development Build
+> [!IMPORTANT]
+> Bleeding edge FreeCAD development builds for testing bugfixes, regressions, and recently implemented features. Do not use in a production environment.
 
-## How-to use
 
-Download the appropriate asset for your OS below
-
-Unpack the bundle to any folder on your system
-
-Launch the application
-
-* **Windows**
+### How-to use
 
+1. Download the appropriate asset for your OS below
+2. Unpack the bundle to any folder on your system
+3. Launch the application
+    - **Windows**
     Run `\bin\FreeCAD.exe` in the extracted directory
-
-* **macOS**
-
+    - **macOS**
     Launch `/FreeCAD.app` in the extracted directory
-
-* **Linux**
-
-    Open the *.AppImage
+    - **Linux**
+    Open the `*.AppImage`

.pre-commit-config.yaml

@@ -12,7 +12,6 @@ files: |
         src/Mod/Assembly|
         src/Mod/CAM|
         src/Mod/Cloud|
-        src/Mod/Drawing|
         src/Mod/Fem|
         src/Mod/Help|
         src/Mod/Import|
@@ -67,6 +66,6 @@ repos:
         -   id: black
             args: ['--line-length', '100']
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: 458d954d175f16d216d7d04d5c182e3b10ddfbb4  # frozen: v20.1.0
+    rev: 7ec07eeb4135dc6ecf410d24ac4ead986a5d413d  # frozen: v20.1.3
     hooks:
         -   id: clang-format

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -11,6 +11,7 @@ macro(InitializeFreeCADBuildOptions)
     option(FREECAD_USE_EXTERNAL_FMT "Use system installed fmt library if available instead of fetching the source." ON)
     option(FREECAD_USE_EXTERNAL_ONDSELSOLVER "Use system installed OndselSolver instead of git submodule." OFF)
     option(FREECAD_USE_EXTERNAL_E57FORMAT "Use system installed libE57Format instead of the bundled." OFF)
+    option(FREECAD_USE_EXTERNAL_GTEST "Use system installed Google Test and Google Mock" OFF)
     option(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
     option(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
     option(FREECAD_CHECK_PIVY "Check for pivy version using Python at build time" ON)

cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake

@@ -42,7 +42,7 @@ macro(SetupSalomeSMESH)
                     endif()
                 endforeach()
             else()
-                set(VTK_COMPONENTS "CommonCore;CommonDataModel;FiltersVerdict;IOXML;FiltersCore;FiltersGeneral;IOLegacy;FiltersExtraction;FiltersSources;FiltersGeometry")
+                set(VTK_COMPONENTS "CommonCore;CommonDataModel;FiltersVerdict;IOXML;FiltersCore;FiltersGeneral;IOLegacy;FiltersExtraction;FiltersSources;FiltersGeometry;WrappingPythonCore")
                 list(APPEND VTK_COMPONENTS "IOMPIParallel;ParallelMPI;hdf5;FiltersParallelDIY2;RenderingCore;InteractionStyle;RenderingFreeType;RenderingOpenGL2")
                 foreach(_module ${VTK_COMPONENTS})
                     list (FIND VTK_AVAILABLE_COMPONENTS ${_module} _index)
@@ -63,6 +63,17 @@ macro(SetupSalomeSMESH)
         endif()
 
         set(BUILD_FEM_VTK ON)
+
+        # Check if PythonWrapperCore was found
+        # Note: VTK 9 only, as the implementations use the VTK modules introduced in 8.1
+        #       VTK_WrappingPythonCore_FOUND is named differently for versions <9.0
+        if (${VTK_WrappingPythonCore_FOUND})
+            set(BUILD_FEM_VTK_PYTHON 1)
+            message(STATUS "VTK python wrapper: available")
+        else()
+            message(STATUS "VTK python wrapper: NOT available")
+        endif()
+
         if(${VTK_MAJOR_VERSION} LESS 6)
             message( FATAL_ERROR "Found VTK version is <6, this is not compatible" )
         endif()

package/rattler-build/linux/AppDir/AppRun

@@ -9,6 +9,9 @@ export PATH_TO_FREECAD_LIBDIR=${HERE}/usr/lib
 export FONTCONFIG_FILE=/etc/fonts/fonts.conf
 export FONTCONFIG_PATH=/etc/fonts
 
+# Fix: Use X to run on Wayland
+export QT_QPA_PLATFORM=xcb
+
 # Show packages info if DEBUG env variable is set
 if [ "$DEBUG" = 1 ]; then
     cat ${HERE}/packages.txt

package/rattler-build/osx/create_bundle.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-set -x 
+set -x
 
 conda_env="FreeCAD.app/Contents/Resources"
 
@@ -41,6 +41,7 @@ find . -name "*.pyc" -type f -delete
 # fix problematic rpaths and reexport_dylibs for signing
 # see https://github.com/FreeCAD/FreeCAD/issues/10144#issuecomment-1836686775
 # and https://github.com/FreeCAD/FreeCAD-Bundle/pull/203
+# and https://github.com/FreeCAD/FreeCAD-Bundle/issues/375
 python ../scripts/fix_macos_lib_paths.py ${conda_env}/lib
 
 # build and install the launcher