Fix preview legend window size (#3363)

Fix issue that the legend window expands to all available horizontal space if scrollbar is displayed

(cherry picked from commit a8ade1554f)

.cursorignore

@@ -1,10 +0,0 @@
-# Add directories or file patterns to ignore during indexing (e.g. foo/ or *.csv)
-deps/
-build_*/
-build/
-localization/
-sandboxes/
-resources/*
-!resources/web/
-!resources/dailytip
-!resources/shaders

.devcontainer/Dockerfile

@@ -1,2 +0,0 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}

.devcontainer/devcontainer.json

@@ -1,51 +0,0 @@
-{
-	"name": "OrcaSlicer",
-	"build": {
-		"dockerfile": "Dockerfile",
-			"args": {
-				"PLATFORM": "linux/amd64",
-				"BASE_IMAGE": "mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04"
-			},
-			"options": ["--platform=linux/amd64"]
-	},
-	"runArgs": ["--platform=linux/amd64"],
-    "features": {
-        "ghcr.io/devcontainers/features/desktop-lite:1": {
-			"password": "orca"
-		}
-    },
-	"customizations": {
-		"vscode": {
-			"settings": {
-				"cmake.configureArgs": [
-					"-DSLIC3R_GTK=3",
-					"-DBBL_RELEASE_TO_PUBLIC=1",
-					"-DBBL_INTERNAL_TESTING=0",
-					"-DSLIC3R_STATIC=1",
-					"-DCMAKE_PREFIX_PATH=${workspaceFolder}/deps/build/destdir/usr/local"
-				]
-			},
-			
-			// Add the IDs of extensions you want installed when the container is created.
-			"extensions": [
-				"ms-vscode.cmake-tools",
-				"ms-vscode.cpptools-extension-pack"
-			]
-		}
-	},
-	
-    "forwardPorts": [6080],
-	"portsAttributes": {
-		"6080": {
-			"label": "VNC web client (noVNC)",
-			"onAutoForward": "silent"
-		}
-    },
-	"otherPortsAttributes": {
-		"onAutoForward": "ignore"
-	},
-	"onCreateCommand": {
-		"Set postCreate executable flag": "chmod +x .devcontainer/postCreate.sh"
-	},
-	"postCreateCommand": "sudo .devcontainer/postCreate.sh"
-}

.devcontainer/postCreate.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-# Update and upgrade all system packages
-apt update
-apt upgrade -y          
-
-build_linux="./build_linux.sh -u"
-echo "-----------------------------------------"	
-echo "Running ${build_linux}..."
-echo "-----------------------------------------"	
-${build_linux}
-
-echo "------------------------------"
-echo "Installing missing packages..."
-echo "------------------------------"
-apt install -y libgl1-mesa-dev m4 autoconf libtool

.dockerignore

@@ -22,9 +22,7 @@ deps/build-linux/*
 **/.DS_Store
 install_*
 build_*/
-!build_linux.sh
 SVG
-scripts/Dockerfile
+Dockerfile
-scripts/DockerBuild.sh
+DockerBuild.sh
-scripts/DockerRun.sh
+DockerRun.sh
-scripts/.dockerignore

.gitattributes

@@ -1,2 +0,0 @@
-# Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto

.github/FUNDING.yml

@@ -1,3 +1,2 @@
-github: SoftFever
 ko_fi: SoftFever
 custom: https://paypal.me/softfever3d

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,58 +1,36 @@
-name: 🐞 Bug Report
+name: Bug Report
 description: File a bug report
-labels: ["bug"]
+labels: bug
 body:
   - type: markdown
     attributes:
       value: |
         **Thank you for using Orca Slicer and wanting to report a bug.**
-        
-        Please note that this is not the place to make feature requests or ask for help.
-        For this, please use the [Feature request](https://github.com/SoftFever/OrcaSlicer/issues/new?assignees=&labels=&projects=&template=feature_request.yml) issue type or you can discuss your idea on our [Discord server](https://discord.gg/P4VE9UY9gJ) with others.
-        
         Before filing, please check if the issue already exists (either open or closed) by using the search bar on the issues page. If it does, comment there. Even if it's closed, we can reopen it based on your comment.
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this problem?
-      description: Please search to see if an issue already exists for the bug you encountered.
-      options:
-        - label: I have searched the existing issues
-          required: true
   - type: input
     id: version
     attributes:
       label: OrcaSlicer Version
       description: Which version of Orca Slicer are you running? You can see the full version in `Help` -> `About Orca Slicer`.
-      placeholder: e.g. 1.9.0
+      placeholder: e.g. 1.6.6
-    validations:
-      required: true
-  - type: dropdown
-    id: os_type
-    attributes:
-      label: "Operating System (OS)"
-      description: "What OSes are you are experiencing issues on?"
-      multiple: true
-      options:
-        - Linux
-        - macOS
-        - Windows
     validations:
       required: true
   - type: input
-    id: os_version
+    id: os_info
     attributes:
-      label: "OS Version"
+      label: OS version
-      description: "What OS version does this relate to?"
+      description: Which OS version are you using?
-      placeholder: "i.e. OS: Windows 7/8/10/11 ..., Ubuntu 22.04/Fedora 36 ..., macOS 10.15/11.1/12.3 ..."
+      placeholder: |
+        OS: Windows 7/8/10/11 ... , Ubuntu 22.04/Fedora 36 ... , macOS 10.15/11.1/12.3 ...
     validations:
       required: true
   - type: textarea
     id: system_info
     attributes:
       label: Additional system information
-      description: For the performance issue, please also show the CPU, Memory information; For the 3D Rendering issue, please also show the Display Card information.
+      description: For the performance issue, please also show the CPU、Memory information; For the 3D Rendering issue, please also show the Display Card information.
       placeholder: |
-        CPU: 11th gen Intel r core tm i7-1185g7/AMD Ryzen 7 6800h/...
+        CPU: 11th gen intel r core tm i7-1185g7/amd ryzen 7 6800h/...
         Memory: 32/16 GB...
         Display Card: NVIDIA Quadro P400/...
     validations:
@@ -72,8 +50,8 @@ body:
       description: Please described the detailed steps to reproduce this issue
       placeholder: |
         1. Go to '...'
-        2. Click on '...'
+        2. Click on '....'
-        3. Scroll down to '...'
+        3. Scroll down to '....'
         4. See error
     validations:
       required: true
@@ -122,12 +100,3 @@ body:
       options:
         - label: Log file
         - label: Project file
-  - type: textarea
-    attributes:
-      label: Anything else?
-      description: |
-        Screenshots? References? Anything that will give us more context about the issue you are encountering!
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Community Support (Discord channel)
-    url: https://discord.gg/P4VE9UY9gJ
-    about: Please ask and answer support "how do I?"questions here.
-  - name: Discussion Forum
-    url: https://github.com/SoftFever/OrcaSlicer/discussions
-    about: Please raise ideas and feature suggestions here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Which printers will be beneficial to this feature**
+E.g. Voron/Klipper based printer/etc...
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,66 +0,0 @@
-name: 🚀 Feature Request / Enhancement
-description: Suggest an improvement to make Orca Slicer even better!
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out this feature request!
-
-        If your idea is still at the formulation stage, or you're not sure it would
-        be useful to many users, you can raise it as a discussion topic under [Ideas](https://github.com/SoftFever/OrcaSlicer/discussions/categories/ideas)
-        or you can raise it on the [Discord server](https://discord.gg/P4VE9UY9gJ).
-  - type: checkboxes
-    attributes:
-      label: Is there an existing issue for this feature request?
-      description: |
-        Please search to see if an issue already exists for a feature, or perhaps one similar.
-        You can then comment and react so that we know know much interest there is in the feature request.
-      options:
-        - label: I have searched the existing issues
-          required: true
-  - type: textarea
-    attributes:
-      label: Is your feature request related to a problem?
-      description: A clear and concise description of what the problem is.
-      placeholder: I'm always frustrated when [...]
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: Which printers will be beneficial to this feature?
-      description: Select affected printer firmware type.
-      multiple: true
-      options: 
-        - Klipper
-        - Marlin
-        - Others
-        - All
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe the solution you'd like
-      description: A clear and concise description of what you want to happen.
-      placeholder: It should do [...]
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Describe alternatives you've considered
-      description: A clear and concise description of any alternative solutions or features you've considered.
-      placeholder: |
-        1. [...]
-        2. [...]
-        3. [...]
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Additional context
-      description: |
-        Add any other context, diagrams, illustations or screenshots about the feature request here.
-
-        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
-    validations:
-      required: false

.github/dependabot.yml

@@ -1,18 +0,0 @@
-version: 2
-updates:
-  # Only care about major updates to github actions
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    ignore: # Only suggest major updates for built-in actions
-      - dependency-name: "github/*"
-        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
-      - dependency-name: "actions/*"
-        update-types: ["version-update:semver-patch", "version-update:semver-minor"]
-  # Docker dependencies
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-  # no support for c/cpp

.github/pull_request_template.md

@@ -1,21 +0,0 @@
-# Description
-
-<!--
-> Please provide a summary of the changes made in this PR. Include details such as:
-  > * What issue does this PR address or fix?
-  > * What new features or enhancements does this PR introduce?
-  > * Are there any breaking changes or dependencies that need to be considered?
--->
-
-# Screenshots/Recordings/Graphs
-
-<!--
-> Please attach relevant screenshots to showcase the UI changes.
-> Please attach images that can help explain the changes.
--->
-
-## Tests
-
-<!--
-> Please describe the tests that you have conducted to verify the changes made in this PR.
--->

.github/workflows/assign.yml

@@ -1,24 +0,0 @@
-name: Assign Issue
-
-on:
-  schedule:
-    - cron: 0 0 * * *
-  issue_comment:
-    types: [created]
-  workflow_dispatch:
-
-jobs:
-  assign:
-    permissions:
-      issues: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Assign the user or unassign stale assignments
-        uses: takanome-dev/assign-issue-action@v2.3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          maintainers: 'noisyfox,softfever'
-          days_until_unassign: 30
-          block_assignment: false
-          reminder_days: 7
-          max_assignments: 12

.github/workflows/build_all.yml

@@ -13,7 +13,6 @@ on:
      - 'localization/**'
      - 'resources/**'
      - ".github/workflows/build_*.yml"
-     - 'scripts/flatpak/**'
 
   pull_request:
     branches:
@@ -25,13 +24,6 @@ on:
      - '**/CMakeLists.txt'
      - 'version.inc'
      - ".github/workflows/build_*.yml"
-     - 'build_linux.sh'
-     - 'build_release_vs2022.bat'
-     - 'build_release_macos.sh'
-     - 'scripts/flatpak/**'
-
-  schedule:
-      - cron: '35 7 * * *' # run once a day near midnight US Pacific time
 
   workflow_dispatch: # allows for manual dispatch
     inputs:
@@ -52,77 +44,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Deprecate 20.04appimage
+          - os: ubuntu-20.04
-          # - os: ubuntu-20.04
-          - os: ubuntu-24.04
           - os: windows-latest
-          - os: macos-14
+          - os: macos-12
+            arch: x86_64
+          - os: macos-12
             arch: arm64
     uses: ./.github/workflows/build_check_cache.yml
     with:
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
-      force-build: ${{ github.event_name == 'schedule' }}
+    secrets: inherit
-    secrets: inherit
-  flatpak:
-    name: "Flatpak"
-    container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47
-      options: --privileged
-      volumes:
-        - /usr/local/lib/android:/usr/local/lib/android
-        - /usr/share/dotnet:/usr/share/dotnet
-        - /opt/ghc:/opt/ghc1
-        - /usr/local/share/boost:/usr/local/share/boost1
-    strategy:
-      matrix:
-        variant:
-          - arch: x86_64
-            runner: ubuntu-24.04
-          - arch: aarch64
-            runner: ubuntu-24.04-arm
-    runs-on: ${{ matrix.variant.runner }}
-    env:
-      date:
-      ver:
-      ver_pure:
-    steps:
-    - name: "Remove unneeded stuff to free disk space"
-      run:
-        rm -rf /usr/local/lib/android/* /usr/share/dotnet/* /opt/ghc1/* "/usr/local/share/boost1/*"
-    - uses: actions/checkout@v5
-    - name: Get the version and date
-      run: |
-        ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
-        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-          ver="PR-${{ github.event.number }}"
-        else
-          ver=V$ver_pure
-        fi
-        echo "ver=$ver" >> $GITHUB_ENV
-        echo "ver_pure=$ver_pure" >> $GITHUB_ENV
-        echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
-      shell: bash
-    - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
-      with:
-        bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        manifest-path: scripts/flatpak/io.github.softfever.OrcaSlicer.yml
-        cache: true
-        arch: ${{ matrix.variant.arch }}
-        upload-artifact: false
-    - name: Upload artifacts Flatpak
-      uses: actions/upload-artifact@v4
-      with:
-        name: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        path: '/__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak'
-    - name: Deploy Flatpak to nightly release
-      if: ${{github.ref == 'refs/heads/main'}}
-      uses: WebFreak001/deploy-nightly@v3.2.0
-      with:
-        upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-        release_id: 137995723
-        asset_path: /__w/OrcaSlicer/OrcaSlicer/OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak
-        asset_name: OrcaSlicer-Linux-flatpak_nightly_${{ matrix.variant.arch }}.flatpak
-        asset_content_type: application/octet-stream
-        max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted

.github/workflows/build_check_cache.yml

@@ -12,9 +12,6 @@ on:
       build-deps-only:
         required: false
         type: boolean
-      force-build:
-        required: false
-        type: boolean
   
 jobs:
   check_cache: # determines if there is a cache and outputs variables used in caching process
@@ -26,23 +23,22 @@ jobs:
       valid-cache: ${{ steps.cache_deps.outputs.cache-hit }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
-        with:
-          lfs: 'true'
         
       - name: set outputs
         id: set_outputs
         env:
-          # todo: this is mad! refactor other build scripts to use same name
+          underscore-arch: ${{ inputs.os == 'macos-12' && '_' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
-          dep-folder-name: ${{ inputs.os == 'windows-latest' && '/OrcaSlicer_dep' || inputs.os == 'macos-14' && '' || inputs.os != 'macos-14' && '/destdir' || '' }}
+          dash-arch: ${{ inputs.os == 'macos-12' && '-' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
+          dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-12') && 'OrcaSlicer_dep' || 'destdir' }}
           output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
         run: |
-          echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
+          echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
-          echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }}
+          echo cache-path=${{ github.workspace }}/deps/build${{ env.underscore-arch }}/${{ env.dep-folder-name }}${{ env.underscore-arch }} >> ${{ env.output-cmd }}
             
       - name: load cache
         id: cache_deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ${{ steps.set_outputs.outputs.cache-path }}
           key: ${{ steps.set_outputs.outputs.cache-key }}
@@ -59,5 +55,4 @@ jobs:
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
       build-deps-only: ${{ inputs.build-deps-only }}
-      force-build: ${{ inputs.force-build }}
     secrets: inherit

.github/workflows/build_deps.yml

@@ -19,130 +19,111 @@ on:
       build-deps-only:
         required: false
         type: boolean
-      force-build:
-        required: false
-        type: boolean
 
 jobs:
   build_deps:
     name: Build Deps
-    if: inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true
+    if: inputs.build-deps-only || inputs.valid-cache != true
     runs-on: ${{ inputs.os }}
     env:
       date:
     steps:
-
+      
       # Setup the environment
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
-        with:
+        
-          lfs: 'true'
-
       - name: load cached deps
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: ${{ inputs.cache-path }}
           key: ${{ inputs.cache-key }}
 
-      - uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
-
       - name: setup dev on Windows
         if: inputs.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Get the date on Ubuntu and macOS
         if: inputs.os != 'windows-latest'
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
-
+        
       - name: Get the date on Windows
         if: inputs.os == 'windows-latest'
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
-
+        
       # Build Dependencies
       - name: Build on Windows
         if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
         run: |
             choco install strawberryperl
+            mkdir ${{ github.workspace }}/deps/build
+            mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
             .\build_release_vs2022.bat deps
             .\build_release_vs2022.bat pack
             cd ${{ github.workspace }}/deps/build
 
       - name: Build on Mac ${{ inputs.arch }}
-        if: inputs.os == 'macos-14'
+        if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-            brew install automake texinfo libtool
+            brew install cmake git gettext automake
             brew list
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
+            mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
             brew uninstall --ignore-dependencies zstd
-            ./build_release_macos.sh -dx -a universal -t 10.15 -1
+            ./build_release_macos.sh -dp -a ${{ inputs.arch }} -t 10.15
-            for arch in arm64 x86_64; do
-                (cd "${{ github.workspace }}/deps/build/${arch}" && \
-                find . -mindepth 1 -maxdepth 1 ! -name 'OrcaSlicer_dep' -exec rm -rf {} +)
-            done
             brew install zstd
 
 
-      - name: Install Ubuntu Build Dependencies
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
-        working-directory: ${{ github.workspace }}
-        env:
-          apt-cmd: ${{ (inputs.os == 'ubuntu-20.04' && 'apt-fast') || (inputs.os == 'ubuntu-24.04' && 'sudo apt-get') || '' }}
-          webkit-ver: ${{ (inputs.os == 'ubuntu-20.04' && '4.0') || (inputs.os == 'ubuntu-24.04' && '4.1') || '' }}
-        run: |
-            ${{ env.apt-cmd }} update
-            ${{ env.apt-cmd }} install -y cmake git g++ build-essential libgl1-mesa-dev m4 \
-            libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
-            libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-${{ env.webkit-ver }}-dev \
-            libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
-            gstreamer1.0-plugins-bad wget sudo autoconf curl libunwind-dev texinfo
-
       - name: Build on Ubuntu
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: inputs.os == 'ubuntu-20.04'
         working-directory: ${{ github.workspace }}
         run: |
+            sudo apt-get update
+            sudo apt-get install -y cmake git g++ build-essential libgl1-mesa-dev m4 \
+            libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \
+            libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-4.0-dev \
+            libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \
+            gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev
             mkdir -p ${{ github.workspace }}/deps/build
             mkdir -p ${{ github.workspace }}/deps/build/destdir
-            sudo ./build_linux.sh -ur
+            sudo ./BuildLinux.sh -ur
             sudo chown $USER -R ./
-            ./build_linux.sh -dr
+            ./BuildLinux.sh -dr
             cd deps/build
             tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
-
+      
-
+            
       # Upload Artifacts
-      # - name: Upload Mac ${{ inputs.arch }} artifacts
+      - name: Upload Mac ${{ inputs.arch }} artifacts
-      #   if: inputs.os == 'macos-14'
+        if: inputs.os == 'macos-12'
-      #   uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
-      #   with:
+        with:
-      #     name: OrcaSlicer_dep_mac_${{ env.date }}
+          name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}
-      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz
+          path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_win64_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
 
       - name: Upload Ubuntu artifacts
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
+        if: inputs.os == 'ubuntu-20.04'
-        env:
+        uses: actions/upload-artifact@v3
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
+          name: OrcaSlicer_dep_ubuntu_${{ env.date }}
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
-
+          
   build_orca:
     name: Build OrcaSlicer
     needs: [build_deps]
-    if: ${{ !cancelled() && !inputs.build-deps-only && inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
+    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
     uses: ./.github/workflows/build_orca.yml
     with:
       cache-key: ${{ inputs.cache-key }}
@@ -150,3 +131,4 @@ jobs:
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
     secrets: inherit
+        

.github/workflows/build_orca.yml

@@ -21,37 +21,23 @@ jobs:
     env:
       date:
       ver:
-      ver_pure:
-      ORCA_UPDATER_SIG_KEY: ${{ secrets.ORCA_UPDATER_SIG_KEY }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
-        with:
-          lfs: 'true'
 
-      - name: load cached deps
-        uses: actions/cache@v4
-        with:
-          path: ${{ inputs.cache-path }}
-          key: ${{ inputs.cache-key }}
-          fail-on-cache-miss: true
-
-      - uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
-          
       - name: Get the version and date on Ubuntu and macOS
         if: inputs.os != 'windows-latest'
         run: |
-          ver_pure=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
+          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            ver="nightly$(date +'%y%m%d')"
-            ver="PR-${{ github.event.number }}"
+          elif [[ "${{ github.event_name }}" == "pull_request" ]]; then
+            ver="PR${{ github.event.number }}"
           else
-            ver=V$ver_pure
+            ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
+            ver=V$ver
           fi
           echo "ver=$ver" >> $GITHUB_ENV
-          echo "ver_pure=$ver_pure" >> $GITHUB_ENV
           echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
@@ -62,8 +48,10 @@ jobs:
           $ref = "${{ github.ref }}"
           $eventName = "${{ github.event_name }}"
           $prNumber = "${{ github.event.number }}"
-
+      
-          if ($eventName -eq 'pull_request') {
+          if ($ref -eq 'refs/heads/main') {
+              $ver = "nightly" + $date.Substring(2)
+          } elseif ($eventName -eq 'pull_request') {
               $ver = "PR" + $prNumber
           } else {
               $versionContent = Get-Content version.inc -Raw
@@ -72,37 +60,37 @@ jobs:
               }
               $ver = "V$ver"
           }
-
+      
           echo "ver=$ver" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
           echo "date=$date" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
           echo "date: ${{ env.date }} version: ${{ env.ver }}"
         shell: pwsh
-
+      
+      - name: load cached deps
+        uses: actions/cache@v3
+        with:
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
+        
 #   Mac
       - name: Install tools mac
-        if: inputs.os == 'macos-14'
+        if: inputs.os == 'macos-12'
         run: |
-          brew install libtool
+          brew install cmake git gettext tree
           brew list
-          mkdir -p ${{ github.workspace }}/deps/build
+          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
-
+          mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
-      - name: Free disk space
+          tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
-        if: inputs.os == 'macos-14'
-        run: |
-          df -hI /dev/disk3s1s1
-          sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} +
-          sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
-          df -hI /dev/disk3s1s1
 
       - name: Build slicer mac
-        if: inputs.os == 'macos-14'
+        if: inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -x -a universal -t 10.15 -1
+          ./build_release_macos.sh -s -n -a ${{inputs.arch}} -t 10.15
 
  # Thanks to RaySajuuk, it's working now
       - name: Sign app and notary
-        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14'
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -119,101 +107,32 @@ jobs:
           security import $CERTIFICATE_PATH -P $P12_PASSWORD -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $P12_PASSWORD $KEYCHAIN_PATH
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/OrcaSlicer.app
-          # Sign OrcaSlicer_profile_validator.app if it exists
+          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
-          if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-            codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app
+          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-          fi
-          
-          # Create main OrcaSlicer DMG without the profile validator helper
-          mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg
-          rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
-          cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
-          ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          
-          # Create separate OrcaSlicer_profile_validator DMG if the app exists
-          if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
-            mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg
-            rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
-            cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
-            ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-            codesign --deep --force --verbose --options runtime --timestamp --entitlements ${{ github.workspace }}/scripts/disable_validation.entitlements --sign "$CERTIFICATE_ID" OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-          fi
-          
-          # Notarize main DMG
           xcrun notarytool store-credentials "notarytool-profile" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}"
-          xcrun notarytool submit "OrcaSlicer_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
+          xcrun notarytool submit "OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
-          xcrun stapler staple OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-          
-          # Notarize profile validator DMG if it exists
-          if [ -f "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" ]; then
-            xcrun notarytool submit "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" --keychain-profile "notarytool-profile" --wait
-            xcrun stapler staple OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-          fi
 
       - name: Create DMG without notary
-        if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14'
+        if: github.ref != 'refs/heads/main' && inputs.os == 'macos-12'
         working-directory: ${{ github.workspace }}
         run: |
-          mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg
+          ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
-          rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/*
+          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-          cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer.app ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/
-          ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_dmg/Applications
-          hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_dmg -ov -format UDZO OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          
-          # Create separate OrcaSlicer_profile_validator DMG if the app exists
-          if [ -f "${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
-            mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg
-            rm -rf ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/*
-            cp -R ${{ github.workspace }}/build/universal/OrcaSlicer/OrcaSlicer_profile_validator.app ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/
-            ln -sfn /Applications ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg/Applications
-            hdiutil create -volname "OrcaSlicer Profile Validator" -srcfolder ${{ github.workspace }}/build/universal/OrcaSlicer_profile_validator_dmg -ov -format UDZO OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-          fi
 
       - name: Upload artifacts mac
-        if: inputs.os == 'macos-14'
+        if: inputs.os == 'macos-12'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_Mac_universal_${{ env.ver }}
+          name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}
-          path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          path: ${{ github.workspace }}/OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
-
-      - name: Upload OrcaSlicer_profile_validator DMG mac
-        if: inputs.os == 'macos-14'
-        uses: actions/upload-artifact@v4
-        with:
-          name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }}
-          path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-          if-no-files-found: ignore
-
-      - name: Deploy Mac release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_Mac_universal_nightly.dmg
-          asset_content_type: application/octet-stream
-          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
-
-      - name: Deploy Mac OrcaSlicer_profile_validator DMG release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'macos-14'
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
-          asset_name: OrcaSlicer_profile_validator_Mac_universal_nightly.dmg
-          asset_content_type: application/octet-stream
-          max_releases: 1
 
 # Windows
       - name: setup MSVC
         if: inputs.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Install nsis
         if: inputs.os == 'windows-latest'
@@ -224,9 +143,6 @@ jobs:
       - name: Build slicer Win
         if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
-        env:
-          WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
-          WindowsSDKVersion: '10.0.26100.0\'
         run: .\build_release_vs2022.bat slicer
 
       - name: Create installer Win
@@ -246,172 +162,59 @@ jobs:
         working-directory: ${{ github.workspace }}/build/src/Release
         shell: cmd
         run: '"C:/Program Files/7-Zip/7z.exe" a -m0=lzma2 -mx9 Debug_PDB_${{ env.ver }}_for_developers_only.7z  *.pdb'
-
+          
       - name: Upload artifacts Win zip
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}_portable
-          path: ${{ github.workspace }}/build/OrcaSlicer
+          path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
 
       - name: Upload artifacts Win installer
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 
       - name: Upload artifacts Win PDB
         if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: PDB
           path: ${{ github.workspace }}/build/src/Release/Debug_PDB_${{ env.ver }}_for_developers_only.7z
 
-      - name: Upload OrcaSlicer_profile_validator Win
-        if: inputs.os == 'windows-latest'
-        uses: actions/upload-artifact@v4
-        with:
-          name: OrcaSlicer_profile_validator_Windows_${{ env.ver }}
-          path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
-
-      - name: Deploy Windows release portable
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_${{ env.ver }}_portable.zip
-          asset_name: OrcaSlicer_Windows_nightly_portable.zip
-          asset_content_type: application/x-zip-compressed
-          max_releases: 1
-
-      - name: Deploy Windows release installer
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/build/OrcaSlicer_Windows_Installer_${{ env.ver }}.exe
-          asset_name: OrcaSlicer_Windows_Installer_nightly.exe
-          asset_content_type: application/x-msdownload
-          max_releases: 1
-
-      - name: Deploy Windows OrcaSlicer_profile_validator release
-        if: github.ref == 'refs/heads/main' && inputs.os == 'windows-latest'
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/build/src/Release/OrcaSlicer_profile_validator.exe
-          asset_name: OrcaSlicer_profile_validator_Windows_nightly.exe
-          asset_content_type: application/x-msdownload
-          max_releases: 1
-
 # Ubuntu
       - name: Install dependencies
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: inputs.os == 'ubuntu-20.04'
-        env:
-          apt-cmd: ${{ (inputs.os == 'ubuntu-20.04' && 'apt-fast') || (inputs.os == 'ubuntu-24.04' && 'sudo apt-get') || '' }}
-          webkit-ver: ${{ (inputs.os == 'ubuntu-20.04' && '4.0') || (inputs.os == 'ubuntu-24.04' && '4.1') || '' }}
-          libfuse2-pkg: ${{ (inputs.os == 'ubuntu-20.04' && 'libfuse2') || (inputs.os == 'ubuntu-24.04' && 'libfuse2t64') || '' }}
         run: |
-          ${{ env.apt-cmd }} update
+          sudo apt-get update
-          ${{ env.apt-cmd }} install -y autoconf build-essential cmake curl eglexternalplatform-dev \
+          sudo apt-get install -y autoconf build-essential cmake curl eglexternalplatform-dev \
           extra-cmake-modules file git libcairo2-dev libcurl4-openssl-dev libdbus-1-dev libglew-dev libglu1-mesa-dev \
           libglu1-mesa-dev libgstreamer1.0-dev libgstreamerd-3-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev \
-          libgtk-3-dev libgtk-3-dev libmspack-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \
+          libgtk-3-dev libgtk-3-dev libmspack-dev libosmesa6-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \
-          libwebkit2gtk-${{ env.webkit-ver }}-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget ${{ env.libfuse2-pkg }}
+          libwebkit2gtk-4.0-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget
 
-      - name: Install dependencies from build_linux.sh
+      - name: Install dependencies from BuildLinux.sh
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: inputs.os == 'ubuntu-20.04'
         shell: bash
-        run: sudo env "ORCA_UPDATER_SIG_KEY=$ORCA_UPDATER_SIG_KEY" ./build_linux.sh -ur
+        run: sudo ./BuildLinux.sh -ur
 
       - name: Fix permissions
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: inputs.os == 'ubuntu-20.04'
         shell: bash
         run: sudo chown $USER -R ./
 
       - name: Build slicer
-        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
+        if: inputs.os == 'ubuntu-20.04'
-        shell: bash
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        run: |
-          ./build_linux.sh -isr
-          mv -n ./build/OrcaSlicer_Linux_V${{ env.ver_pure }}.AppImage ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
-          chmod +x ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
-
-      - name: Build orca_custom_preset_tests
-        if: github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04'
-        working-directory: ${{ github.workspace }}/build/src/Release
         shell: bash
         run: |
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -g 1
+          ./BuildLinux.sh -isr
-          cd ${{ github.workspace }}/resources/profiles
+          chmod +x ./build/OrcaSlicer_ubu64.AppImage
-          zip -r orca_custom_preset_tests.zip user/
+        
-
       - name: Upload artifacts Ubuntu
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
+        if: inputs.os == 'ubuntu-20.04'
-        env:
+        uses: actions/upload-artifact@v3
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        uses: actions/upload-artifact@v4
         with:
-          name: OrcaSlicer_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
+          name: OrcaSlicer_Linux_${{ env.ver }}
-          path: './build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage'
+          path: './build/OrcaSlicer_ubu64.AppImage'
-
-      - name: Upload OrcaSlicer_profile_validator Ubuntu
-        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
-        env:
-          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: OrcaSlicer_profile_validator_Linux_ubuntu_${{ env.ubuntu-ver }}_${{ env.ver }}
-          path: './build/src/Release/OrcaSlicer_profile_validator'
-
-      - name: Deploy Ubuntu release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ./build/OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_${{ env.ver }}.AppImage
-          asset_name: OrcaSlicer_Linux_AppImage${{ env.ubuntu-ver-str }}_nightly.AppImage
-          asset_content_type: application/octet-stream
-          max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted
-      - name: Deploy Ubuntu release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
-        uses: rickstaa/action-create-tag@v1
-        with:
-          tag: "nightly-builds"
-          tag_exists_error: false
-          force_push_tag: true
-          message: "nightly-builds"
-
-      - name: Deploy Ubuntu OrcaSlicer_profile_validator release
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
-        env:
-          ubuntu-ver-str: ${{ (inputs.os == 'ubuntu-24.04' && '_Ubuntu2404') || '' }}
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ./build/src/Release/OrcaSlicer_profile_validator
-          asset_name: OrcaSlicer_profile_validator_Linux${{ env.ubuntu-ver-str }}_nightly
-          asset_content_type: application/octet-stream
-          max_releases: 1
-
-      - name: Deploy orca_custom_preset_tests
-        if: ${{ ! env.ACT && github.ref == 'refs/heads/main' && inputs.os == 'ubuntu-24.04' }}
-        uses: WebFreak001/deploy-nightly@v3.2.0
-        with:
-          upload_url: https://uploads.github.com/repos/SoftFever/OrcaSlicer/releases/137995723/assets{?name,label}
-          release_id: 137995723
-          asset_path: ${{ github.workspace }}/resources/profiles/orca_custom_preset_tests.zip
-          asset_name: orca_custom_preset_tests.zip
-          asset_content_type: application/octet-stream
-          max_releases: 1

.github/workflows/check_locale.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       - name: Install gettext 
         run: |

.github/workflows/check_profiles.yml

@@ -1,51 +0,0 @@
-name: Check profiles
-on: 
-  pull_request:
-    branches: 
-    - main 
-    paths:
-    - 'resources/profiles/**'
-    - ".github/workflows/check_profiles.yml"
-
-  workflow_dispatch:
-    inputs:
-      logLevel:
-        description: 'Log level'     
-        required: true
-        default: 'warning'
-
-
-jobs:
-  check_translation:
-    name: Check profiles
-    runs-on: ubuntu-24.04
-    steps:  
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Run extra JSON check
-        run: |
-          python3 ./scripts/orca_extra_profile_check.py
-
-      # download
-      - name: Download 
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -LJO https://github.com/SoftFever/Orca_tools/releases/download/1/OrcaSlicer_profile_validator
-          chmod +x ./OrcaSlicer_profile_validator
-
-      # validate profiles
-      - name: validate system profiles
-        run: |
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
-
-      - name: validate custom presets
-        working-directory: ${{ github.workspace }}
-        run: |
-          curl -LJO https://github.com/SoftFever/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
-          unzip ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
-          ./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2
-
-
-
-

.github/workflows/claude-code-review.yml

@@ -1,71 +0,0 @@
-name: Claude Code Review
-
-on:
-  workflow_dispatch:
-
-jobs:
-  claude-review:
-    # Optional: Filter by PR author
-    # if: |
-    #   github.event.pull_request.user.login == 'external-contributor' ||
-    #   github.event.pull_request.user.login == 'new-developer' ||
-    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
-    
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@beta
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4.1)
-          # model: "claude-opus-4-1-20250805"
-
-          # Direct prompt for automated review (no @claude mention needed)
-          direct_prompt: |
-            Please review this pull request and provide feedback on:
-            - Code quality and best practices
-            - Potential bugs or issues
-            - Performance considerations
-            - Security concerns
-            - Test coverage
-            
-            Be constructive and helpful in your feedback.
-
-          # Optional: Use sticky comments to make Claude reuse the same comment on subsequent pushes to the same PR
-          # use_sticky_comment: true
-          
-          # Optional: Customize review based on file types
-          # direct_prompt: |
-          #   Review this PR focusing on:
-          #   - For TypeScript files: Type safety and proper interface usage
-          #   - For API endpoints: Security, input validation, and error handling
-          #   - For React components: Performance, accessibility, and best practices
-          #   - For tests: Coverage, edge cases, and test quality
-          
-          # Optional: Different prompts for different authors
-          # direct_prompt: |
-          #   ${{ github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR' && 
-          #   'Welcome! Please review this PR from a first-time contributor. Be encouraging and provide detailed explanations for any suggestions.' ||
-          #   'Please provide a thorough code review focusing on our coding standards and best practices.' }}
-          
-          # Optional: Add specific tools for running tests or linting
-          # allowed_tools: "Bash(npm run test),Bash(npm run lint),Bash(npm run typecheck)"
-          
-          # Optional: Skip review for certain conditions
-          # if: |
-          #   !contains(github.event.pull_request.title, '[skip-review]') &&
-          #   !contains(github.event.pull_request.title, '[WIP]')
-

.github/workflows/claude.yml

@@ -1,64 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@beta
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-          
-          # Optional: Specify model (defaults to Claude Sonnet 4, uncomment for Claude Opus 4.1)
-          # model: "claude-opus-4-1-20250805"
-          
-          # Optional: Customize the trigger phrase (default: @claude)
-          # trigger_phrase: "/claude"
-          
-          # Optional: Trigger when specific user is assigned to an issue
-          # assignee_trigger: "claude-bot"
-          
-          # Optional: Allow Claude to run specific commands
-          # allowed_tools: "Bash(npm install),Bash(npm run build),Bash(npm run test:*),Bash(npm run lint:*)"
-          
-          # Optional: Add custom instructions for Claude to customize its behavior for your project
-          # custom_instructions: |
-          #   Follow our coding standards
-          #   Ensure all new code has tests
-          #   Use TypeScript for new files
-          
-          # Optional: Custom environment variables for Claude
-          # claude_env: |
-          #   NODE_ENV: test
-

.github/workflows/orca_bot.yml

@@ -2,72 +2,25 @@ name: Orca bot
 on:
   schedule:
     - cron: "0 0 * * *"
-  workflow_dispatch:
+
-    inputs:
-      logLevel:
-        description: 'Log level'     
-        required: true
-        default: 'warning'
-        
 jobs:
-  stale:
+  close-issues:
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
-      contents: write # only for delete-branch option
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v5
         with:
-          # PAT for GitHub API authentication
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          # Max number of operations per run
-          operations-per-run: 1000
-          # Order to get issues/PRs
-          ascending: true
-
-          # ISSUES
-          # Do not auto-close an issue if it is assigned to a milestone
-          exempt-all-issue-milestones: true
-          # Exempt all issues with assignees from stale
-          exempt-all-issue-assignees: true
-          # Exempt feature requests
-          exempt-issue-labels: "enhancement"
-          # Idle number of days before marking issues stale
           days-before-issue-stale: 90
-          # Idle number of days before marking issues close
           days-before-issue-close: 7
-          # Label to apply on staled issues
+          operations-per-run: 1000
           stale-issue-label: "stale"
-          # Issue close reason
+          ascending: true
-          close-issue-reason: not_planned
+          stale-issue-message: "GitHub bot: this issue is stale because it has been open for 90 days with no activity."
-          # Remove stale label from issues on updates
+          close-issue-message: "GitHub bot: This issue was closed because it has been inactive for 7 days since being marked as stale."
-          remove-issue-stale-when-updated: true
-          # Issue stale message
-          stale-issue-message: "Orca bot: this issue is stale because it has been open for 90 days with no activity."
-          # Issue closure message
-          close-issue-message: "Orca bot: This issue was closed because it has been inactive for 7 days since being marked as stale."
-
-          # PRs
-          # Do not auto-close a PR if it is assigned to a milestone
-          exempt-all-pr-milestones: true
-          # Exempt all PRs with assignees from stale
-          exempt-all-pr-assignees: true
-          # Skip the stale action for draft PRs
-          exempt-draft-pr: true
-          # Idle number of days before marking PRs stale
           days-before-pr-stale: -1
-          # Idle number of days before marking PRs close
           days-before-pr-close: -1
-          # Label to apply on staled PRs
+          remove-issue-stale-when-updated: true
-          stale-pr-label: "stale"
+          remove-pr-stale-when-updated: true 
-          # Label to apply on closed PRs
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          close-pr-label: not_planned
-          # Remove stale label from PRs on updates
-          remove-pr-stale-when-updated: true
-          # PR stale message
-          stale-pr-message: "Orca bot: this PR is stale because it has been open for XX days with no activity."
-          # PR closure message
-          close-pr-message: "Orca bot: This PR was closed because it has been inactive for X days since being marked as stale."
-          # Delete branch after closing a stale PR
-          delete-branch: true

.github/workflows/publish_docs_to_wiki.yml

@@ -8,13 +8,6 @@ on:
     branches:
       - main # This can be changed to any branch of your preference
 
-  workflow_dispatch:
-    inputs:
-      logLevel:
-        description: 'Log level'     
-        required: true
-        default: 'warning'
-
 env:
   USER_TOKEN: ${{ secrets.GH_WIKI_PAT }} # This is the repository secret personal access token
   USER_NAME: ${{ vars.BOT_USER_NAME }} # Enter the username of your (bot) account
@@ -27,14 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:  
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v3
 
       # 1. Clone the current wiki master branch to a folder named `tmp_wiki`
       - name: Pull content from wiki
         run: |
           git config --global user.name "$USER_NAME"
           git config --global user.email "$USER_NAME"@users.noreply.github.com
-          git clone https://"$USER_TOKEN"@github.com/SoftFever/"$REPOSITORY_NAME".wiki.git tmp_wiki
+          git clone https://"$USER_TOKEN"@github.com/"$OWNER"/"$REPOSITORY_NAME".wiki.git tmp_wiki
       # 4. Synchronize differences between `doc` & `tmp_wiki`
       # 5. Push new Wiki content
       - name: Push main repo content to wiki

.github/workflows/shellcheck.yml

@@ -1,44 +0,0 @@
-on:
-  push:
-    paths:
-      - '**.sh'
-      - 'scripts/linux.d/*'
-  pull_request:
-    paths:
-      - '**.sh'
-      - 'scripts/linux.d/*'
-  schedule:
-      - cron: '55 7 * * *' # run once a day near midnight US Pacific time
-  workflow_dispatch: # allows for manual dispatch
-
-name: "Shellcheck"
-permissions: {}
-
-jobs:
-  shellcheck:
-    name: Shellcheck
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache shellcheck download
-        id: cache-shellcheck-v0_11
-        uses: actions/cache@v4
-        with:
-          path: ~/shellcheck
-          key: ${{ runner.os }}-shellcheck-v0_11
-
-      - name: Download shellcheck
-        if: steps.cache-shellcheck-v0_11.outputs.cache-hit != 'true'
-        shell: bash
-        env:
-          INPUT_VERSION: "v0.11.0"
-        run: |
-          curl -L#o ~/sc.tar.xz "https://github.com/koalaman/shellcheck/releases/download/${INPUT_VERSION}/shellcheck-${INPUT_VERSION}.linux.x86_64.tar.xz"
-          tar -xvf ~/sc.tar.xz -C ~
-          mv ~/shellcheck-"${INPUT_VERSION}"/shellcheck ~/shellcheck
-
-      - uses: actions/checkout@v5
-        with:
-          fetch-depth: 1
-
-      - name: Shellcheck scripts
-        run: 'find . -not -name \*.md \( -path ./scripts/linux.d/\* -o -name \*.sh \) -print0 | xargs -0 ~/shellcheck'

.github/workflows/update-translation.yml

@@ -1,38 +0,0 @@
-name: Update Translation Catalog
-on: 
-  # schedule:
-  #   - cron: 0 0 * * 1
-  workflow_dispatch:
-
-jobs:
-  update_translation:
-    name: Update translation
-    runs-on: ubuntu-latest
-    steps:  
-      - name: Checkout repository
-        uses: actions/checkout@v5
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - name: Install gettext
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y gettext
-
-      - name: Update translation catalog
-        run: |
-          ./scripts/run_gettext.sh --full
-          git add localization/i18n/*
-
-      - name: Commit translation catalog updates
-        uses: qoomon/actions--create-commit@v1
-        id: commit
-        with:
-          message: Update translation catalog
-          skip-empty: true
-
-      - name: Push changes
-        run: git push

.github/workflows/validate-documentation.yml

@@ -1,335 +0,0 @@
-name: Validate Documentation
-
-on:
-  pull_request:
-    paths:
-      - 'src/slic3r/GUI/Tab.cpp'
-      - 'doc/**/*.md'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-
-jobs:
-  validate:
-    runs-on: windows-latest
-    name: Check Documentation
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v46
-        with:
-          files: |
-            src/slic3r/GUI/Tab.cpp
-            doc/**/*.md
-      
-      - name: Run validation
-        if: steps.changed-files.outputs.any_changed == 'true'
-        shell: pwsh
-        run: |
-          # Helper Functions
-          function Normalize-Fragment($fragment) {
-              return $fragment.ToLower().Trim() -replace '[^a-z0-9\s-]', '' -replace ' ', '-' -replace '^-+|-+$', ''
-          }
-          
-          function Add-BrokenReference($sourceFile, $line, $target, $issue, $type) {
-              return @{
-                  SourceFile = $sourceFile
-                  Line = $line
-                  Target = $target
-                  Issue = $issue
-                  Type = $type
-              }
-          }
-          
-          function Validate-Fragment($fragment, $availableAnchors, $sourceFile, $line, $target, $type) {
-              $cleanFragment = $fragment.StartsWith('#') ? $fragment.Substring(1) : $fragment
-              $normalizedFragment = Normalize-Fragment $cleanFragment
-              
-              if ($availableAnchors -notcontains $normalizedFragment) {
-                  return Add-BrokenReference $sourceFile $line $target "Fragment does not exist" $type
-              }
-              return $null
-          }
-          
-          # Initialize
-          $tabFile = Join-Path $PWD "src/slic3r/GUI/Tab.cpp"
-          $docDir = Join-Path $PWD 'doc'
-          $brokenReferences = @()
-          $docIndex = @{}
-          
-          Write-Host "Validating documentation..." -ForegroundColor Blue
-          
-          # Validate paths
-          $hasTabFile = Test-Path $tabFile
-          if (-not $hasTabFile) { Write-Host "::warning::Tab.cpp file not found at: $tabFile" }
-          if (-not (Test-Path $docDir)) { Write-Host "::error::doc folder does not exist"; exit 1 }
-          
-          # Build documentation index
-          $mdFiles = Get-ChildItem -Path $docDir -Filter *.md -Recurse -File -ErrorAction SilentlyContinue
-          
-          foreach ($mdFile in $mdFiles) {
-              $baseName = [System.IO.Path]::GetFileNameWithoutExtension($mdFile.Name)
-              $relPath = (Resolve-Path $mdFile.FullName).Path.Substring($docDir.Length).TrimStart('\', '/')
-              $content = Get-Content -Path $mdFile.FullName -Encoding UTF8 -Raw
-              $lines = Get-Content -Path $mdFile.FullName -Encoding UTF8
-              
-              # Extract anchors
-              $anchors = @()
-              $anchors += [regex]::Matches($content, '(?i)<a\s+[^>]*(?:name|id)\s*=\s*[`"'']([^`"'']+)[`"'']') | 
-                  ForEach-Object { $_.Groups[1].Value.ToLower() }
-              $anchors += [regex]::Matches($content, '(?m)^#+\s+(.+)$') | 
-                  ForEach-Object { Normalize-Fragment $_.Groups[1].Value.Trim() }
-              
-              # Parse links
-              $links = @()
-              $inCodeFence = $false
-              for ($i = 0; $i -lt $lines.Count; $i++) {
-                  $line = $lines[$i]
-                  if ($line.TrimStart() -match '^(```|~~~)') { 
-                      $inCodeFence = -not $inCodeFence
-                      continue 
-                  }
-                  if ($inCodeFence) { continue }
-                  
-                  $lineForParsing = [regex]::Replace($line, '`[^`]*`', '')
-                  foreach ($linkMatch in [regex]::Matches($lineForParsing, '(?<!!)[^\]]*\]\(([^)]+)\)')) {
-                      $destRaw = $linkMatch.Groups[1].Value.Trim()
-                      
-                      # Handle internal fragments
-                      if ($destRaw.StartsWith('#')) {
-                          $fragment = $destRaw.Substring(1)
-                          if ($fragment.Contains('#')) {
-                              $brokenReferences += Add-BrokenReference $relPath ($i + 1) $destRaw "Internal link must use only one #." "Link"
-                          } else {
-                              $validationResult = Validate-Fragment $fragment $anchors $relPath ($i + 1) $destRaw "Link"
-                              if ($validationResult) { $brokenReferences += $validationResult }
-                          }
-                          continue
-                      }
-                      
-                      # Skip external URLs
-                      if ($destRaw -match '^(?:https?:|mailto:|data:|#|\\)') { continue }
-                      
-                      # Check for double ##
-                      if ($destRaw.Contains('##')) {
-                          $brokenReferences += Add-BrokenReference $relPath ($i + 1) $destRaw "Use single # for fragments." "Link"
-                          continue
-                      }
-                      
-                      # Parse file and fragment
-                      $destParts = $destRaw -split '#', 2
-                      $destNoFragment = $destParts[0]
-                      $fragment = ($destParts.Length -gt 1) ? $destParts[1] : $null
-                      
-                      if ($destNoFragment) {
-                          $leaf = ($destNoFragment -split '[\\/]')[-1]
-                          if ($leaf) {
-                              $targetBase = $leaf.ToLower().EndsWith('.md') ? $leaf.Substring(0, $leaf.Length - 3) : $leaf
-                              $targetBase = $targetBase.Trim()
-                              if ($targetBase) {
-                                  $linkInfo = @{
-                                      TargetBase = $targetBase
-                                      Fragment = $fragment
-                                      Line = $i + 1
-                                      SourceFile = $relPath
-                                  }
-                                  $links += $linkInfo
-                              }
-                          }
-                      }
-                  }
-              }
-              
-              $docIndex[$baseName] = @{ Anchors = $anchors; Links = $links }
-          }
-          
-          # Parse Tab.cpp references
-          if ($hasTabFile) {
-              $regex = 'optgroup->append_single_option_line\s*\(\s*(?:"([^"]+)"|([^,]+?))\s*,\s*"([^"]+)"\s*\)'
-              $lines = Get-Content -Path $tabFile -Encoding UTF8
-              
-              for ($i = 0; $i -lt $lines.Count; $i++) {
-                  foreach ($match in [regex]::Matches($lines[$i], $regex)) {
-                      $arg2Full = $match.Groups[3].Value.Trim()
-                      
-                      if ($arg2Full.Contains('##')) {
-                          $brokenReferences += Add-BrokenReference "Tab.cpp" ($i + 1) $arg2Full "Use single # for fragments." "Link"
-                          continue
-                      }
-                      
-                      $arg2Parts = $arg2Full -split '#', 2
-                      $docBase = $arg2Parts[0].Trim()
-                      $fragment = ($arg2Parts.Length -gt 1) ? $arg2Parts[1].Trim() : $null
-                      
-                      if (-not $docIndex.ContainsKey($docBase)) {
-                          $brokenReferences += Add-BrokenReference "Tab.cpp" ($i + 1) $docBase "File does not exist" "Link"
-                      } elseif ($fragment) {
-                          $validationResult = Validate-Fragment $fragment $docIndex[$docBase].Anchors "Tab.cpp" ($i + 1) "$docBase#$fragment" "Link"
-                          if ($validationResult) { $brokenReferences += $validationResult }
-                      }
-                  }
-              }
-          }
-          
-          # Validate markdown links
-          foreach ($baseName in $docIndex.Keys) {
-              foreach ($link in $docIndex[$baseName].Links) {
-                  if (-not $docIndex.ContainsKey($link.TargetBase)) {
-                      $brokenReferences += Add-BrokenReference $link.SourceFile $link.Line "$($link.TargetBase).md" "File does not exist" "Link"
-                  } elseif ($link.Fragment) {
-                      $validationResult = Validate-Fragment $link.Fragment $docIndex[$link.TargetBase].Anchors $link.SourceFile $link.Line "$($link.TargetBase)#$($link.Fragment)" "Link"
-                      if ($validationResult) { $brokenReferences += $validationResult }
-                  }
-              }
-          }
-          
-          # Validate images
-          Write-Host "Validating images..." -ForegroundColor Blue
-          $expectedUrlPattern = '^https://github\.com/SoftFever/OrcaSlicer/blob/main/([^?]+)\?raw=true$'
-          
-          foreach ($file in $mdFiles) {
-              $lines = Get-Content $file.FullName -Encoding UTF8
-              $relPath = (Resolve-Path $file.FullName).Path.Substring($docDir.Length).TrimStart('\', '/')
-              
-              $inCodeFence = $false
-              for ($lineNumber = 0; $lineNumber -lt $lines.Count; $lineNumber++) {
-                  $line = $lines[$lineNumber]
-                  if ($line.TrimStart() -match '^(```|~~~)') { 
-                      $inCodeFence = -not $inCodeFence
-                      continue 
-                  }
-                  if ($inCodeFence) { continue }
-                  
-                  $lineForParsing = [regex]::Replace($line, '`[^`]*`', '')
-                  
-                  # Process markdown and HTML images
-                  $imagePatterns = @(
-                      @{ Pattern = "!\[([^\]]*)\]\(([^)]+)\)"; Type = "Markdown"; AltGroup = 1; UrlGroup = 2 }
-                      @{ Pattern = '<img\s+[^>]*>'; Type = "HTML"; AltGroup = -1; UrlGroup = -1 }
-                  )
-                  
-                  foreach ($pattern in $imagePatterns) {
-                      foreach ($match in [regex]::Matches($lineForParsing, $pattern.Pattern)) {
-                          $altText = ""
-                          $url = ""
-                          
-                          if ($pattern.Type -eq "Markdown") {
-                              $altText = $match.Groups[$pattern.AltGroup].Value
-                              $url = $match.Groups[$pattern.UrlGroup].Value
-                          } else {
-                              # Extract from HTML
-                              $imgTag = $match.Value
-                              if ($imgTag -match 'alt\s*=\s*[`"'']([^`"'']*)[`"'']') { $altText = $matches[1] }
-                              if ($imgTag -match 'src\s*=\s*[`"'']([^`"'']*)[`"'']') { $url = $matches[1] }
-                          }
-                          
-                          if (-not $altText.Trim() -and $url) {
-                              $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $match.Value "[$($pattern.Type)] Missing alt text for image" "Image"
-                          } elseif ($url -and $altText) {
-                              # Validate URL format and file existence
-                              if ($url -match $expectedUrlPattern) {
-                                  $relativePathInUrl = $matches[1]
-                                  $fileNameFromUrl = [System.IO.Path]::GetFileNameWithoutExtension($relativePathInUrl)
-                                  
-                                  if ($altText -ne $fileNameFromUrl) {
-                                      $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $match.Value "[$($pattern.Type)] Alt text `"$altText`" ≠ filename `"$fileNameFromUrl`"" "Image"
-                                  }
-                                  
-                                  $expectedImagePath = Join-Path $PWD ($relativePathInUrl -replace "/", "\")
-                                  if (-not (Test-Path $expectedImagePath)) {
-                                      $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $match.Value "[$($pattern.Type)] Image not found at path: $relativePathInUrl" "Image"
-                                  }
-                              } else {
-                                  $urlIssues = @()
-                                  if (-not $url.StartsWith('https://github.com/SoftFever/OrcaSlicer/blob/main/')) { $urlIssues += "URL must start with expected prefix" }
-                                  if (-not $url.EndsWith('?raw=true')) { $urlIssues += "URL must end with '?raw=true'" }
-                                  if ($url -match '^https?://(?!github\.com/SoftFever/OrcaSlicer)') { $urlIssues += "External URLs not allowed" }
-                                  
-                                  $issueText = "[$($pattern.Type)] URL format issues: " + ($urlIssues -join '; ')
-                                  $brokenReferences += Add-BrokenReference $relPath ($lineNumber + 1) $match.Value $issueText "Image"
-                              }
-                          }
-                      }
-                  }
-              }
-          }
-          
-          # Report results
-          $linkErrors = $brokenReferences | Where-Object { $_.Type -eq "Link" }
-          $imageErrors = $brokenReferences | Where-Object { $_.Type -eq "Image" }
-          
-          if ($brokenReferences.Count -gt 0) {
-              Write-Host "::error::Documentation validation failed"
-              
-              # Build error summary for PR comment
-              $errorSummary = ""
-              
-              # Report link errors
-              if ($linkErrors) {
-                  Write-Host "::group::🔗 Link Validation Errors"
-                  $errorSummary += "## 🔗 Link Validation Errors`n`n"
-                  $linkErrors | Group-Object SourceFile | ForEach-Object {
-                      Write-Host "📄 $($_.Name):" -ForegroundColor Yellow
-                      $errorSummary += "**📄 doc/$($_.Name):**`n"
-                      $_.Group | Sort-Object Line | ForEach-Object {
-                          Write-Host "  Line $($_.Line): $($_.Target) - $($_.Issue)" -ForegroundColor Red
-                          Write-Host "::error file=doc/$($_.SourceFile),line=$($_.Line)::$($_.Target) - $($_.Issue)"
-                          $errorSummary += "- Line $($_.Line): ``$($_.Target)`` - $($_.Issue)`n"
-                      }
-                      $errorSummary += "`n"
-                  }
-                  Write-Host "::endgroup::"
-              }
-              
-              # Report image errors
-              if ($imageErrors) {
-                  Write-Host "::group::🖼️ Image Validation Errors"
-                  $errorSummary += "## 🖼️ Image Validation Errors`n`n"
-                  $imageErrors | Group-Object SourceFile | ForEach-Object {
-                      Write-Host "📄 $($_.Name):" -ForegroundColor Yellow
-                      $errorSummary += "**📄 doc/$($_.Name):**`n"
-                      $_.Group | Sort-Object Line | ForEach-Object {
-                          Write-Host "  Line $($_.Line): $($_.Issue)" -ForegroundColor Red
-                          Write-Host "::error file=doc/$($_.SourceFile),line=$($_.Line)::$($_.Issue)"
-                          $errorSummary += "- Line $($_.Line): $($_.Issue)`n"
-                      }
-                      $errorSummary += "`n"
-                  }
-                  Write-Host "::endgroup::"
-              }
-              
-              # Export error summary for PR comment
-              Add-Content -Path $env:GITHUB_ENV -Value "VALIDATION_ERRORS<<EOF"
-              Add-Content -Path $env:GITHUB_ENV -Value $errorSummary
-              Add-Content -Path $env:GITHUB_ENV -Value "EOF"
-              
-              exit 1
-          } else {
-              Write-Host "::notice::All documentation is valid!"
-              exit 0
-          }
-      
-      - name: Comment on PR
-        if: failure() && github.event_name == 'pull_request'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const validationErrors = process.env.VALIDATION_ERRORS || '';
-            
-            const body = `❌ **Documentation validation failed**
-            
-            ${validationErrors || 'Please check the workflow logs for details about the validation errors.'}`;
-            
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: body
-            })

.gitignore

@@ -1,9 +1,7 @@
 Build
 Build.bat
 /build*/
-CMakeLists.txt.user
+deps/build
-**/CMakeLists.txt.autosave
-deps/build*
 MYMETA.json
 MYMETA.yml
 _build
@@ -19,7 +17,6 @@ xs/assertlib*
 local-lib
 /src/TAGS
 /.vscode/
-/.vscode
 build-linux/*
 deps/build*/*
 **/.DS_Store
@@ -33,9 +30,4 @@ src/OrcaSlicer-doc/
 **/process_full/
 **/machine_full/
 **/filament_full/
-/deps/DL_CACHE/
+/deps/DL_CACHE/
-/deps/DL_CACHE
-**/.flatpak-builder/
-resources/profiles/user/default
-*.code-workspace
-deps_src/build/

AGENTS.md

@@ -1,23 +0,0 @@
-# Repository Guidelines
-
-## Project Structure & Module Organization
-OrcaSlicer’s C++17 sources live in `src/`, split by feature modules and platform adapters. User assets, icons, and printer presets are in `resources/`; translations stay in `localization/`. Tests sit in `tests/`, grouped by domain (`libslic3r/`, `sla_print/`, etc.) with fixtures under `tests/data/`. CMake helpers reside in `cmake/`, and longer references in `doc/` and `SoftFever_doc/`. Automation scripts belong in `scripts/` and `tools/`. Treat everything in `deps/` and `deps_src/` as vendored snapshots—do not modify without mirroring upstream tags.
-
-## Build, Test, and Development Commands
-Use out-of-source builds:
-- `cmake -S . -B build -DCMAKE_BUILD_TYPE=Release` configures dependencies and generates build files.
-- `cmake --build build --target OrcaSlicer --config Release` compiles the app; add `--parallel` to speed up.
-- `cmake --build build --target tests` then `ctest --test-dir build --output-on-failure` runs automated suites.
-Platform helpers such as `build_linux.sh`, `build_release_macos.sh`, and `build_release_vs2022.bat` wrap the same flow with toolchain flags. Use `build_release_macos.sh -sx` when reproducing macOS build issues, and `scripts/DockerBuild.sh` for reproducible container builds.
-
-## Coding Style & Naming Conventions
-`.clang-format` enforces 4-space indents, a 140-column limit, aligned initializers, and brace wrapping for classes and functions. Run `clang-format -i <file>` before committing; the CMake `clang-format` target is available when LLVM tools are on your PATH. Prefer `CamelCase` for classes, `snake_case` for functions and locals, and `SCREAMING_CASE` for constants, matching conventions in `src/`. Keep headers self-contained and align include order with the IWYU pragmas.
-
-## Testing Guidelines
-Unit tests rely on Catch2 (`tests/catch2/`). Name specs after the component under test—for example `tests/libslic3r/TestPlanarHole.cpp`—and tag long-running cases so `ctest -L fast` remains useful. Cover new algorithms with deterministic fixtures or sample G-code stored in `tests/data/`. Document manual printer validation or regression slicer checks in your PR when automated coverage is insufficient.
-
-## Commit & Pull Request Guidelines
-The history favors concise, sentence-style subject lines with optional issue references, e.g., `Fix grid lines origin for multiple plates (#10724)`. Squash fixups locally before opening a PR. Complete `.github/pull_request_template.md`, include reproduction steps or screenshots for UI changes, and mention impacted presets or translations. Link issues via `Closes #NNNN` when applicable, and call out dependency bumps or profile migrations for maintainer review.
-
-## Security & Configuration Tips
-Follow `SECURITY.md` for vulnerability reporting. Keep API tokens and printer credentials out of tracked configs; use `sandboxes/` for experimental settings. When touching third-party code in `deps_src/`, record the upstream commit or release in your PR description and run the relevant platform build script to confirm integration.

Build.PL

@@ -0,0 +1,132 @@
+#!/usr/bin/perl
+
+print "This script is currently used for installing Perl dependenices for running\n";
+print "the libslic3r unit / integration tests through Perl prove.\n";
+print "If you don't plan to run the unit / integration tests, you don't need to\n";
+print "install these dependencies to build and run OrcaSlicer.\n";
+
+use strict;
+use warnings;
+
+use Config;
+use File::Spec;
+
+my %prereqs = qw(
+    Devel::CheckLib                 0
+    ExtUtils::MakeMaker             6.80
+    ExtUtils::ParseXS               3.22
+    ExtUtils::XSpp                  0
+    ExtUtils::XSpp::Cmd             0
+    ExtUtils::CppGuess              0
+    ExtUtils::Typemaps              0
+    ExtUtils::Typemaps::Basic       0
+    File::Basename                  0
+    File::Spec                      0
+    Getopt::Long                    0
+    Module::Build::WithXSpp         0.14
+    Moo                             1.003001
+    POSIX                           0
+    Scalar::Util                    0
+    Test::More                      0
+    IO::Scalar                      0
+    Time::HiRes                     0
+);
+my %recommends = qw(
+    Class::XSAccessor               0
+    Test::Harness                   0
+);
+
+my $sudo    = grep { $_ eq '--sudo' } @ARGV;
+my $nolocal = grep { $_ eq '--nolocal' }  @ARGV;
+
+my @missing_prereqs = ();
+if ($ENV{SLIC3R_NO_AUTO}) {
+    foreach my $module (sort keys %prereqs) {
+        my $version = $prereqs{$module};
+        next if eval "use $module $version; 1";
+        push @missing_prereqs, $module if exists $prereqs{$module};
+        print "Missing prerequisite $module $version\n";
+    }
+    foreach my $module (sort keys %recommends) {
+        my $version = $recommends{$module};
+        next if eval "use $module $version; 1";
+        print "Missing optional $module $version\n";
+    }
+} else {
+    my @try = (
+        $ENV{CPANM} // (),
+        File::Spec->catfile($Config{sitebin}, 'cpanm'),
+        File::Spec->catfile($Config{installscript}, 'cpanm'),
+    );
+    
+    my $cpanm;
+    foreach my $path (@try) {
+        if (-e $path) {  # don't use -x because it fails on Windows
+            $cpanm = $path;
+            last;
+        }
+    }
+    if (!$cpanm) {
+        if ($^O =~ /^(?:darwin|linux)$/ && system(qw(which cpanm)) == 0) {
+            $cpanm = 'cpanm';
+        }
+    }
+    die <<'EOF'
+cpanm was not found. Please install it before running this script.
+
+There are several ways to install cpanm, try one of these:
+
+    apt-get install cpanminus
+    curl -L http://cpanmin.us | perl - --sudo App::cpanminus
+    cpan App::cpanminus
+
+If it is installed in a non-standard location you can do:
+    
+    CPANM=/path/to/cpanm perl Build.PL
+
+EOF
+        if !$cpanm;
+    my @cpanm_args = ();
+    push @cpanm_args, "--sudo" if $sudo;
+
+    # install local::lib without --local-lib otherwise it's not usable afterwards
+    if (!eval "use local::lib qw(local-lib); 1") {
+        my $res = system $cpanm, @cpanm_args, 'local::lib';
+        warn "Warning: local::lib is required. You might need to run the `cpanm --sudo local::lib` command in order to install it.\n"
+            if $res != 0;
+    }
+    
+    push @cpanm_args, ('--local-lib', 'local-lib') if ! $nolocal;
+
+    # make sure our cpanm is updated (old ones don't support the ~ syntax)
+    system $cpanm, @cpanm_args, 'App::cpanminus';
+    
+    my %modules = (%prereqs, %recommends);
+    foreach my $module (sort keys %modules) {
+        my $version = $modules{$module};
+        my @cmd = ($cpanm, @cpanm_args);
+        
+        # temporary workaround for upstream bug in test
+        push @cmd, '--notest'
+            if $module =~ /^(?:OpenGL|Test::Harness)$/;
+        
+        push @cmd, "$module~$version";
+
+        my $res = system @cmd;
+        if ($res != 0) {
+            if (exists $prereqs{$module}) {
+                push @missing_prereqs, $module;
+            } else {
+                printf "Don't worry, this module is optional.\n";
+            }
+        }
+    }
+}
+
+print "\n";
+print "In the next step, you need to build the OrcaSlicer C++ library.\n";
+print "1) Create a build directory and change to it\n";
+print "2) run cmake .. -DCMAKE_BUILD_TYPE=Release\n";
+print "3) run make\n";
+print "4) to execute the automatic tests, run ctest --verbose\n";
+__END__

BuildLinux.sh

@@ -0,0 +1,253 @@
+#!/bin/bash
+
+export ROOT=`pwd`
+export NCORES=`nproc --all`
+export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
+FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
+FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
+
+set -e # exit on first error
+
+function check_available_memory_and_disk() {
+    FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev)
+    MIN_MEM_GB=10
+
+    FREE_DISK_KB=$(df -k . | tail -1 | awk '{print $4}')
+    MIN_DISK_KB=$((10 * 1024 * 1024))
+
+    if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
+        echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
+        echo && free -h && echo
+        exit 2
+    fi
+
+    if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then 
+        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
+        echo && df -h . && echo
+        exit 1
+    fi
+}
+
+function usage() {
+    echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
+    echo "   -i: Generate appimage (optional)"
+    echo "   -g: force gtk2 build"
+    echo "   -b: build in debug mode"
+    echo "   -d: build deps (optional)"
+    echo "   -s: build orca-slicer (optional)"
+    echo "   -u: only update clock & dependency packets (optional and need sudo)"
+    echo "   -r: skip free ram check (low ram compiling)"
+    echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
+    echo "   and then './BuildLinux.sh -dsi'"
+}
+
+unset name
+while getopts ":dsiuhgbr" opt; do
+  case ${opt} in
+    u )
+        UPDATE_LIB="1"
+        ;;
+    i )
+        BUILD_IMAGE="1"
+        ;;
+    d )
+        BUILD_DEPS="1"
+        ;;
+    s )
+        BUILD_ORCA="1"
+        ;;
+    b )
+        BUILD_DEBUG="1"
+        ;;
+    g )
+        FOUND_GTK3=""
+        ;;
+    r )
+	SKIP_RAM_CHECK="1"
+	;;
+    h ) usage
+        exit 0
+        ;;
+  esac
+done
+
+if [ $OPTIND -eq 1 ]
+then
+    usage
+    exit 0
+fi
+
+# Addtional Dev packages for OrcaSlicer
+export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
+# libwebkit2gtk-4.1-dev ??
+export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
+if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
+    sudo apt install -y ${REQUIRED_DEV_PACKAGES} git cmake wget file gettext
+fi
+
+#FIXME: require root for -u option
+if [[ -n "$UPDATE_LIB" ]]
+then
+    echo -n -e "Updating linux ...\n"
+    # hwclock -s # DeftDawg: Why does SuperSlicer want to do this?
+    apt update
+    if [[ -z "$FOUND_GTK3" ]]
+    then
+        echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    else
+        echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
+        apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
+    fi
+    # for ubuntu 22+ and 23+:
+    ubu_major_version="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d /\"/)"
+    if [ $ubu_major_version == "22" ] || [ $ubu_major_version == "23" ]
+    then
+        apt install -y curl libfuse-dev libssl-dev libcurl4-openssl-dev m4
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n"
+        apt install -y libssl-dev libcurl4-openssl-dev
+    fi
+    echo -e "done\n"
+    exit 0
+fi
+
+FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev || echo '')
+FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')
+echo "FOUND_GTK2=$FOUND_GTK2)"
+if [[ -z "$FOUND_GTK2_DEV" ]]
+then
+if [[ -z "$FOUND_GTK3_DEV" ]]
+then
+    echo "Error, you must install the dependencies before."
+    echo "Use option -u with sudo"
+    exit 0
+fi
+fi
+
+echo "[1/9] Updating submodules..."
+{
+    # update submodule profiles
+    pushd resources/profiles
+    git submodule update --init
+    popd
+}
+
+echo "[2/9] Changing date in version..."
+{
+    # change date in version
+    sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
+}
+echo "done"
+
+# mkdir in deps
+if [ ! -d "deps/build" ]
+then
+    mkdir deps/build
+fi
+
+if ! [[ -n "$SKIP_RAM_CHECK" ]]
+then
+check_available_memory_and_disk
+fi
+
+if [[ -n "$BUILD_DEPS" ]]
+then
+    echo "[3/9] Configuring dependencies..."
+    BUILD_ARGS=""
+    if [[ -n "$FOUND_GTK3_DEV" ]]
+    then
+        BUILD_ARGS="-DDEP_WX_GTK3=ON"
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        # have to build deps with debug & release or the cmake won't find evrything it needs
+        mkdir deps/build/release
+        pushd deps/build/release
+            cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
+            make -j$NCORES
+        popd
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
+    fi
+    
+    # cmake deps
+    pushd deps/build
+        cmake .. $BUILD_ARGS
+        echo "done"
+        
+        # make deps
+        echo "[4/9] Building dependencies..."
+        make deps -j$NCORES
+        echo "done"
+
+        # rename wxscintilla # TODO: DeftDawg: Does OrcaSlicer need this?
+        # echo "[5/9] Renaming wxscintilla library..."
+        # pushd destdir/usr/local/lib
+        #     if [[ -z "$FOUND_GTK3_DEV" ]]
+        #     then
+        #         cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
+        #     else
+        #         cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
+        #     fi
+        # popd
+        # echo "done"
+
+        # FIXME: only clean deps if compiling succeeds; otherwise reruns waste tonnes of time!
+        # clean deps
+        # echo "[6/9] Cleaning dependencies..."
+        # rm -rf dep_*
+    popd
+    echo "done"
+fi
+
+# Create main "build" directory
+if [ ! -d "build" ]
+then
+    mkdir build
+fi
+
+if [[ -n "$BUILD_ORCA" ]]
+then
+    echo "[7/9] Configuring Slic3r..."
+    BUILD_ARGS=""
+    if [[ -n "$FOUND_GTK3_DEV" ]]
+    then
+        BUILD_ARGS="-DSLIC3R_GTK=3"
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
+    else
+        BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0"
+    fi
+    
+    # cmake
+    pushd build
+        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
+        echo "done"
+        
+        # make Slic3r
+        echo "[8/9] Building Slic3r..."
+        make -j$NCORES OrcaSlicer # Slic3r
+    popd
+    ./run_gettext.sh
+    echo "done"
+fi
+
+if [[ -e $ROOT/build/src/BuildLinuxImage.sh ]]; then
+# Give proper permissions to script
+chmod 755 $ROOT/build/src/BuildLinuxImage.sh
+
+echo "[9/9] Generating Linux app..."
+    pushd build
+        if [[ -n "$BUILD_IMAGE" ]]
+        then
+            $ROOT/build/src/BuildLinuxImage.sh -i
+        else
+            $ROOT/build/src/BuildLinuxImage.sh
+        fi
+    popd
+echo "done"
+fi

CLAUDE.md

@@ -1,257 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Overview
-
-OrcaSlicer is an open-source 3D slicer application forked from Bambu Studio, built using C++ with wxWidgets for the GUI and CMake as the build system. The project uses a modular architecture with separate libraries for core slicing functionality, GUI components, and platform-specific code.
-
-## Build Commands
-
-### Building on Windows
-```bash
-# Build everything
-build_release_vs2022.bat
-
-# Build with debug symbols
-build_release_vs2022.bat debug
-
-# Build only dependencies
-build_release_vs2022.bat deps
-
-# Build only slicer (after deps are built)
-build_release_vs2022.bat slicer
-
-
-```
-
-### Building on macOS
-```bash
-# Build everything (dependencies and slicer)
-./build_release_macos.sh
-
-# Build only dependencies
-./build_release_macos.sh -d
-
-# Build only slicer (after deps are built)
-./build_release_macos.sh -s
-
-# Use Ninja generator for faster builds
-./build_release_macos.sh -x
-
-# Build for specific architecture
-./build_release_macos.sh -a arm64    # or x86_64 or universal
-
-# Build for specific macOS version target
-./build_release_macos.sh -t 11.3
-```
-
-### Building on Linux
-```bash
-# First time setup - install system dependencies
-./build_linux.sh -u
-
-# Build dependencies and slicer
-./build_linux.sh -dsi
-
-# Build everything (alternative)
-./build_linux.sh -dsi
-
-# Individual options:
-./build_linux.sh -d    # dependencies only
-./build_linux.sh -s    # slicer only  
-./build_linux.sh -i    # build AppImage
-
-# Performance and debug options:
-./build_linux.sh -j N  # limit to N cores
-./build_linux.sh -1    # single core build
-./build_linux.sh -b    # debug build
-./build_linux.sh -c    # clean build
-./build_linux.sh -r    # skip RAM/disk checks
-./build_linux.sh -l    # use Clang instead of GCC
-```
-
-### Build System
-- Uses CMake with minimum version 3.13 (maximum 3.31.x on Windows)
-- Primary build directory: `build/`
-- Dependencies are built in `deps/build/`
-- The build process is split into dependency building and main application building
-- Windows builds use Visual Studio generators
-- macOS builds use Xcode by default, Ninja with -x flag
-- Linux builds use Ninja generator
-
-### Testing
-Tests are located in the `tests/` directory and use the Catch2 testing framework. Test structure:
-- `tests/libslic3r/` - Core library tests (21 test files)
-  - Geometry processing, algorithms, file formats (STL, 3MF, AMF)
-  - Polygon operations, clipper utilities, Voronoi diagrams
-- `tests/fff_print/` - Fused Filament Fabrication tests (12 test files)
-  - Slicing algorithms, G-code generation, print mechanics
-  - Fill patterns, extrusion, support material
-- `tests/sla_print/` - Stereolithography tests (4 test files)
-  - SLA-specific printing algorithms, support generation
-- `tests/libnest2d/` - 2D nesting algorithm tests
-- `tests/slic3rutils/` - Utility function tests
-- `tests/sandboxes/` - Experimental/sandbox test code
-
-Run all tests after building:
-```bash
-cd build && ctest
-```
-
-Run tests with verbose output:
-```bash
-cd build && ctest --output-on-failure
-```
-
-Run individual test suites:
-```bash
-# From build directory
-./tests/libslic3r/libslic3r_tests
-./tests/fff_print/fff_print_tests
-./tests/sla_print/sla_print_tests
-```
-
-## Architecture
-
-### Core Libraries
-- **libslic3r/**: Core slicing engine and algorithms (platform-independent)
-  - Main slicing logic, geometry processing, G-code generation
-  - Key classes: Print, PrintObject, Layer, GCode, Config
-  - Modular design with specialized subdirectories:
-    - `GCode/` - G-code generation, cooling, pressure equalization, thumbnails
-    - `Fill/` - Infill pattern implementations (gyroid, honeycomb, lightning, etc.)
-    - `Support/` - Tree supports and traditional support generation
-    - `Geometry/` - Advanced geometry operations, Voronoi diagrams, medial axis
-    - `Format/` - File I/O for 3MF, AMF, STL, OBJ, STEP formats
-    - `SLA/` - SLA-specific print processing and support generation
-    - `Arachne/` - Advanced wall generation using skeletal trapezoidation
-
-- **src/slic3r/**: Main application framework and GUI
-  - GUI application built with wxWidgets
-  - Integration between libslic3r core and user interface
-  - Located in `src/slic3r/GUI/` (not shown in this directory but exists)
-
-### Key Algorithmic Components
-- **Arachne Wall Generation**: Variable-width perimeter generation using skeletal trapezoidation
-- **Tree Supports**: Organic support generation algorithm  
-- **Lightning Infill**: Sparse infill optimization for internal structures
-- **Adaptive Slicing**: Variable layer height based on geometry
-- **Multi-material**: Multi-extruder and soluble support processing
-- **G-code Post-processing**: Cooling, fan control, pressure advance, conflict checking
-
-### File Format Support
-- **3MF/BBS_3MF**: Native format with extensions for multi-material and metadata
-- **STL**: Standard tessellation language for 3D models
-- **AMF**: Additive Manufacturing Format with color/material support  
-- **OBJ**: Wavefront OBJ with material definitions
-- **STEP**: CAD format support for precise geometry
-- **G-code**: Output format with extensive post-processing capabilities
-
-### External Dependencies
-- **Clipper2**: Advanced 2D polygon clipping and offsetting
-- **libigl**: Computational geometry library for mesh operations
-- **TBB**: Intel Threading Building Blocks for parallelization
-- **wxWidgets**: Cross-platform GUI framework
-- **OpenGL**: 3D graphics rendering and visualization
-- **CGAL**: Computational Geometry Algorithms Library (selective use)
-- **OpenVDB**: Volumetric data structures for advanced operations
-- **Eigen**: Linear algebra library for mathematical operations
-
-## File Organization
-
-### Resources and Configuration
-- `resources/profiles/` - Printer and material profiles organized by manufacturer
-- `resources/printers/` - Printer-specific configurations and G-code templates  
-- `resources/images/` - UI icons, logos, calibration images
-- `resources/calib/` - Calibration test patterns and data
-- `resources/handy_models/` - Built-in test models (benchy, calibration cubes)
-
-### Internationalization and Localization  
-- `localization/i18n/` - Source translation files (.pot, .po)
-- `resources/i18n/` - Runtime language resources
-- Translation managed via `scripts/run_gettext.sh` / `scripts/run_gettext.bat`
-
-### Platform-Specific Code
-- `src/libslic3r/Platform.cpp` - Platform abstractions and utilities
-- `src/libslic3r/MacUtils.mm` - macOS-specific utilities (Objective-C++)
-- Windows-specific build scripts and configurations
-- Linux distribution support scripts in `scripts/linux.d/`
-
-### Build and Development Tools
-- `cmake/modules/` - Custom CMake find modules and utilities
-- `scripts/` - Python utilities for profile generation and validation  
-- `tools/` - Windows build tools (gettext utilities)
-- `deps/` - External dependency build configurations
-
-## Development Workflow
-
-### Code Style and Standards
-- **C++17 standard** with selective C++20 features
-- **Naming conventions**: PascalCase for classes, snake_case for functions/variables
-- **Header guards**: Use `#pragma once` 
-- **Memory management**: Prefer smart pointers, RAII patterns
-- **Thread safety**: Use TBB for parallelization, be mindful of shared state
-
-### Common Development Tasks
-
-#### Adding New Print Settings
-1. Define setting in `PrintConfig.cpp` with proper bounds and defaults
-2. Add UI controls in appropriate GUI components  
-3. Update serialization in config save/load
-4. Add tooltips and help text for user guidance
-5. Test with different printer profiles
-
-#### Modifying Slicing Algorithms  
-1. Core algorithms live in `libslic3r/` subdirectories
-2. Performance-critical code should be profiled and optimized
-3. Consider multi-threading implications (TBB integration)
-4. Validate changes don't break existing profiles
-5. Add regression tests where appropriate
-
-#### GUI Development
-1. GUI code resides in `src/slic3r/GUI/` (not visible in current tree)
-2. Use existing wxWidgets patterns and custom controls
-3. Support both light and dark themes
-4. Consider DPI scaling on high-resolution displays
-5. Maintain cross-platform compatibility
-
-#### Adding Printer Support
-1. Create JSON profile in `resources/profiles/[manufacturer].json`
-2. Add printer-specific start/end G-code templates
-3. Configure build volume, capabilities, and material compatibility
-4. Test thoroughly with actual hardware when possible
-5. Follow existing profile structure and naming conventions
-
-### Dependencies and Build System
-- **CMake-based** with separate dependency building phase
-- **Dependencies** built once in `deps/build/`, then linked to main application  
-- **Cross-platform** considerations important for all changes
-- **Resource files** embedded at build time, platform-specific handling
-
-### Performance Considerations
-- **Slicing algorithms** are CPU-intensive, profile before optimizing
-- **Memory usage** can be substantial with complex models
-- **Multi-threading** extensively used via TBB
-- **File I/O** optimized for large 3MF files with embedded textures
-- **Real-time preview** requires efficient mesh processing
-
-## Important Development Notes
-
-### Codebase Navigation
-- Use search tools extensively - codebase has 500k+ lines
-- Key entry points: `src/OrcaSlicer.cpp` for application startup
-- Core slicing: `libslic3r/Print.cpp` orchestrates the slicing pipeline
-- Configuration: `PrintConfig.cpp` defines all print/printer/material settings
-
-### Compatibility and Stability
-- **Backward compatibility** maintained for project files and profiles
-- **Cross-platform** support essential (Windows/macOS/Linux)  
-- **File format** changes require careful version handling
-- **Profile migrations** needed when settings change significantly
-
-### Quality and Testing
-- **Regression testing** important due to algorithm complexity
-- **Performance benchmarks** help catch performance regressions
-- **Memory leak** detection important for long-running GUI application
-- **Cross-platform** testing required before releases

CMakeLists.txt

@@ -1,56 +1,10 @@
 cmake_minimum_required(VERSION 3.13)
 
-# Verify that your CMake version is exactly 3.31.x series or lower on windows
-if ( ((MSVC) OR (WIN32)) AND (${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0") )
-    message(FATAL_ERROR "Only cmake versions between 3.13.x and 3.31.x is supported on windows. Detected version: ${CMAKE_VERSION}")
-endif()
-
-if (WIN32)
-    # Detect known CI environments
-    set(IS_CI FALSE)
-    if(DEFINED ENV{CI})
-        set(IS_CI TRUE)
-    elseif(DEFINED ENV{GITHUB_ACTIONS})
-        set(IS_CI TRUE)
-    elseif(DEFINED ENV{GITLAB_CI})
-        set(IS_CI TRUE)
-    elseif(DEFINED ENV{TF_BUILD})
-        set(IS_CI TRUE)
-    elseif(DEFINED ENV{BUILD_NUMBER}) # Jenkins
-        set(IS_CI TRUE)
-    endif()
-
-    # Detect common misconfiguration (Strawberry Perl in PATH before CMake)
-    # We use ENV to check the PATH order
-    string(REPLACE "\\" "/" ENV_PATH "$ENV{PATH}")
-    string(FIND "${ENV_PATH}" "Strawberry/c/bin" STRAWBERRY_POS)
-    string(FIND "${ENV_PATH}" "Program Files/CMake/bin" CMAKE_POS)
-
-    if (STRAWBERRY_POS GREATER -1 AND CMAKE_POS GREATER -1 AND STRAWBERRY_POS LESS CMAKE_POS)
-        set(_warning_text "
-#############################################################
-Detected Strawberry Perl's 'c/bin' appearing before CMake in PATH.
-This is known to cause CMake to misbehave (e.g., missing modules).
-Please adjust your PATH so that:
-C:\\Program Files\\CMake\\bin
-appears before:
-C:\\Strawberry\\c\\bin
-You can do this in Environment Variables settings.
-#############################################################
-        ")
-
-        if(NOT IS_CI)
-            message(FATAL_ERROR "${_warning_text}")
-        endif()
-    endif()
-endif ()
-
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
     endif ()
-    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
 endif ()
 
 project(OrcaSlicer)
@@ -67,18 +21,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type (default Release)" FORCE)
 endif()
 
-find_package(Git)
-if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    # Check current Git commit hash
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_COMMIT_HASH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
-endif()
-
 if(DEFINED ENV{SLIC3R_STATIC})
         set(SLIC3R_STATIC_INITIAL $ENV{SLIC3R_STATIC})
 else()
@@ -108,15 +50,6 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
 
 set(IS_CROSS_COMPILE FALSE)
 
-option (COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
-if (${COLORED_OUTPUT})
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        add_compile_options (-fdiagnostics-color=always)
-    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        add_compile_options (-fcolor-diagnostics)
-    endif ()
-endif ()
-
 if (APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
@@ -127,6 +60,7 @@ if (APPLE)
     if (CMAKE_MACOSX_BUNDLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
 
     message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
@@ -134,13 +68,12 @@ endif ()
 
 # Proposal for C++ unit tests and sandboxes
 option(SLIC3R_BUILD_SANDBOXES   "Build development sandboxes" OFF)
-option(BUILD_TESTS       "Build unit tests" OFF)
+option(SLIC3R_BUILD_TESTS       "Build unit tests" OFF)
-option(ORCA_TOOLS       "Build Orca tools" OFF)
 
 if (IS_CROSS_COMPILE)
     message("Detected cross compilation setup. Tests and encoding checks will be forcedly disabled!")
     set(SLIC3R_PERL_XS OFF CACHE BOOL "" FORCE)
-    set(BUILD_TESTS OFF CACHE BOOL "" FORCE)
+    set(SLIC3R_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 endif ()
 
 # Print out the SLIC3R_* cache options
@@ -187,9 +120,6 @@ if (MSVC)
     # C4244: 'conversion' conversion from 'type1' to 'type2', possible loss of data. An integer type is converted to a smaller integer type.
     # C4267: The compiler detected a conversion from size_t to a smaller type.
     add_compile_options(/wd4244 /wd4267)
-    # Disable warnings on comparison of unsigned and signed
-    # C4018: signed/unsigned mismatch
-    add_compile_options(/wd4018)
 endif ()
 
 if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
@@ -236,7 +166,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(NOT WIN32)
     # Add DEBUG flags to debug builds.
-    add_compile_definitions("$<IF:$<CONFIG:Debug>,DEBUG,NDEBUG>")
+    add_compile_options("$<$<CONFIG:DEBUG>:-DDEBUG>")
 endif()
 
 # To be able to link libslic3r with the Perl XS module.
@@ -273,7 +203,7 @@ if(WIN32)
     if(WIN10SDK_INCLUDE_PATH)
         message("Building with Win10 Netfabb STL fixing service support")
         add_definitions(-DHAS_WIN10SDK)
-        include_directories(SYSTEM "${WIN10SDK_INCLUDE_PATH}")
+        include_directories("${WIN10SDK_INCLUDE_PATH}")
     else()
         message("Building without Win10 Netfabb STL fixing service support")
     endif()
@@ -301,7 +231,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(Threads REQUIRED)
 
     find_package(DBus REQUIRED)
-    include_directories(SYSTEM ${DBUS_INCLUDE_DIRS})
+    include_directories(${DBUS_INCLUDE_DIRS})
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
@@ -318,22 +248,6 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
     # On GCC and Clang, no return from a non-void function is a warning only. Here, we make it an error.
     add_compile_options(-Werror=return-type)
 
-    # Since some portions of code are just commented out or put under conditional compilation, there are
-    # a bunch of warning related to unused functions and variables. Suppress those warnings to not pollute
-    # compilers diagnostics output with warnings we not going to look at
-    add_compile_options(-Wno-unused-function -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-label -Wno-unused-local-typedefs)
-
-    # Ignore signed/unsigned comparison warnings
-    add_compile_options(-Wno-sign-compare)
-
-    # The mismatch of tabs and spaces throughout the project can sometimes
-    # cause this warning to appear even though the indentation is fine.
-    # Some includes also cause the warning
-    add_compile_options(-Wno-misleading-indentation)
-
-    # Disable warning if enum value does not have a corresponding case in switch statement
-    add_compile_options(-Wno-switch)
-
     # removes LOTS of extraneous Eigen warnings (GCC only supports it since 6.1)
     # https://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
@@ -347,31 +261,14 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
         add_compile_options(-Wno-deprecated-declarations)
     endif()
 
-    if((${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
-        add_compile_options(-Wno-error=enum-constexpr-conversion)
-    endif()
-
     #GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66943 or
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
     # We will turn the warning of for GCC for now:
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        # GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66943 or
-        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431
-        # We will turn the warning of for GCC for now:
         add_compile_options(-Wno-unknown-pragmas)
     endif()
 
-    # Bit of a hack for flatpak building: compress the debug info with zstd to save space in CI
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 13.0)
-        add_compile_options(-gz=zstd)
-    endif()
-
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=template-id-cdtor" )
-    endif()
-
 endif()
 
 if (SLIC3R_ASAN)
@@ -384,8 +281,6 @@ if (SLIC3R_ASAN)
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
         set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fsanitize=address")
-    else()
-        add_compile_definitions(_DISABLE_STRING_ANNOTATION=1 _DISABLE_VECTOR_ANNOTATION=1)
     endif ()
 
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -410,17 +305,17 @@ message(STATUS "LIBDIR: ${LIBDIR}")
 message(STATUS "LIBDIR_BIN: ${LIBDIR_BIN}")
 
 # For the bundled boost libraries (boost::nowide)
-include_directories(SYSTEM ${LIBDIR})
+include_directories(${LIBDIR})
 # For generated header files
-include_directories(SYSTEM ${LIBDIR_BIN}/dev-utils/platform)
+include_directories(${LIBDIR_BIN}/platform)
 # For ligigl
-include_directories(SYSTEM ${LIBDIR}/libigl)
+include_directories(${LIBDIR}/libigl)
 
 if(WIN32)
     add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
     if(MSVC)
         # BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
-        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
+        add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x601 -DBOOST_SYSTEM_USE_UTF8 )
         # Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
         add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
         add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -477,17 +372,14 @@ if(SLIC3R_STATIC)
     set(Boost_USE_STATIC_LIBS ON)
     # Use boost libraries linked statically to the C++ runtime.
     # set(Boost_USE_STATIC_RUNTIME ON)
-else()
-    add_definitions(-DBOOST_LOG_DYN_LINK)
 endif()
 #set(Boost_DEBUG ON)
 # set(Boost_COMPILER "-mgw81")
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
-if(POLICY CMP0167)
+set(MINIMUM_BOOST_VERSION "1.66.0")
-  cmake_policy(SET CMP0167 NEW)
+set(_boost_components "system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams")
-endif()
+find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS ${_boost_components})
-find_package(Boost 1.83.0 REQUIRED COMPONENTS system filesystem thread log log_setup locale regex chrono atomic date_time iostreams program_options nowide)
 
 add_library(boost_libs INTERFACE)
 add_library(boost_headeronly INTERFACE)
@@ -504,7 +396,7 @@ endif()
 function(slic3r_remap_configs targets from_Cfg to_Cfg)
     if(MSVC)
         string(TOUPPER ${from_Cfg} from_CFG)
-
+    
         foreach(tgt ${targets})
             if(TARGET ${tgt})
                 set_target_properties(${tgt} PROPERTIES MAP_IMPORTED_CONFIG_${from_CFG} ${to_Cfg})
@@ -513,8 +405,28 @@ function(slic3r_remap_configs targets from_Cfg to_Cfg)
     endif()
 endfunction()
 
-target_include_directories(boost_headeronly SYSTEM INTERFACE ${Boost_INCLUDE_DIRS})
+if(TARGET Boost::system)
-target_link_libraries(boost_libs INTERFACE boost_headeronly ${Boost_LIBRARIES})
+    message(STATUS "Boost::boost exists")
+    target_link_libraries(boost_headeronly INTERFACE Boost::boost)
+
+    # Only from cmake 3.12
+    # list(TRANSFORM _boost_components PREPEND Boost:: OUTPUT_VARIABLE _boost_targets)
+    set(_boost_targets "")
+    foreach(comp ${_boost_components})
+        list(APPEND _boost_targets "Boost::${comp}")
+    endforeach()
+
+    target_link_libraries(boost_libs INTERFACE
+        boost_headeronly # includes the custom compile definitions as well
+        ${_boost_targets}
+        )
+    slic3r_remap_configs("${_boost_targets}" RelWithDebInfo Release)
+else()
+    target_include_directories(boost_headeronly INTERFACE ${Boost_INCLUDE_DIRS})
+    target_link_libraries(boost_libs INTERFACE boost_headeronly ${Boost_LIBRARIES})
+endif()
+
+
 
 # Find and configure intel-tbb
 if(SLIC3R_STATIC)
@@ -523,7 +435,7 @@ endif()
 set(TBB_DEBUG 1)
 set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo Release "")
 find_package(TBB REQUIRED)
-# include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
+# include_directories(${TBB_INCLUDE_DIRS})
 # add_definitions(${TBB_DEFINITIONS})
 # if(MSVC)
 #     # Suppress implicit linking of the TBB libraries by the Visual Studio compiler.
@@ -534,7 +446,6 @@ find_package(TBB REQUIRED)
 
 find_package(OpenSSL REQUIRED)
 find_package(CURL REQUIRED)
-find_package(Freetype REQUIRED)
 
 
 add_library(libcurl INTERFACE)
@@ -566,7 +477,7 @@ if (SLIC3R_STATIC AND NOT SLIC3R_STATIC_EXCLUDE_CURL)
         find_package(OpenSSL REQUIRED)
         message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
         message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
-        target_include_directories(libcurl SYSTEM INTERFACE ${OPENSSL_INCLUDE_DIR})
+        target_include_directories(libcurl INTERFACE ${OPENSSL_INCLUDE_DIR})
         target_link_libraries(libcurl INTERFACE ${OPENSSL_LIBRARIES})
     endif()
 endif()
@@ -632,7 +543,7 @@ add_custom_target(gettext_make_pot
     COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
         -f "${BBL_L18N_DIR}/list.txt"
         -o "${BBL_L18N_DIR}/OrcaSlicer.pot"
-	COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
+	COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}	
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate pot file from strings in the source tree"
 )
@@ -687,9 +598,11 @@ endif ()
 
 find_path(SPNAV_INCLUDE_DIR spnav.h)
 if (SPNAV_INCLUDE_DIR)
-    find_library(SPNAV_LIB NAMES libspnav.a) # Force linking libspnav statically
+    find_library(HAVE_SPNAV spnav)
-    if (SPNAV_LIB)
+    if (HAVE_SPNAV)
         add_definitions(-DHAVE_SPNAV)
+        add_library(libspnav SHARED IMPORTED)
+        target_link_libraries(libspnav INTERFACE spnav)
         message(STATUS "SPNAV library found")
     else()
         message(STATUS "SPNAV library NOT found, Spacenavd not supported")
@@ -700,12 +613,10 @@ endif()
 
 set(TOP_LEVEL_PROJECT_DIR ${PROJECT_SOURCE_DIR})
 function(orcaslicer_copy_dlls target config postfix output_dlls)
-    if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+    if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-        set(_arch "x64")
+        set(_bits 64)
-    elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
+    elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-        set(_arch "x86")
+        set(_bits 32)
-    else ()
-        message(FATAL_ERROR "Unable to detect architecture")
     endif ()
 
     get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -722,9 +633,9 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
         message ("set out_dir to CMAKE_CURRENT_BINARY_DIR: ${_out_dir}")
     endif ()
 
-    file(COPY ${TOP_LEVEL_PROJECT_DIR}/deps/GMP/gmp/lib/win-${_arch}/libgmp-10.dll
+    file(COPY ${TOP_LEVEL_PROJECT_DIR}/deps/GMP/gmp/lib/win${_bits}/libgmp-10.dll
-            ${TOP_LEVEL_PROJECT_DIR}/deps/MPFR/mpfr/lib/win-${_arch}/libmpfr-4.dll
+            ${TOP_LEVEL_PROJECT_DIR}/deps/MPFR/mpfr/lib/win${_bits}/libmpfr-4.dll
-            ${TOP_LEVEL_PROJECT_DIR}/deps/WebView2/lib/win-${_arch}/WebView2Loader.dll
+            ${TOP_LEVEL_PROJECT_DIR}/deps/WebView2/lib/win${_bits}/WebView2Loader.dll
         DESTINATION ${_out_dir})
 
     file(COPY ${CMAKE_PREFIX_PATH}/bin/occt/TKBO.dll
@@ -792,12 +703,11 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
 
         PARENT_SCOPE
     )
-
+    
 endfunction()
 
 
 # libslic3r, OrcaSlicer GUI and the OrcaSlicer executable.
-add_subdirectory(deps_src)
 add_subdirectory(src)
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT OrcaSlicer_app_gui)
 
@@ -814,13 +724,18 @@ if(SLIC3R_BUILD_SANDBOXES)
     add_subdirectory(sandboxes)
 endif()
 
-if(BUILD_TESTS)
+if(SLIC3R_BUILD_TESTS)
     add_subdirectory(tests)
 endif()
 
 if (NOT WIN32 AND NOT APPLE)
     set(SLIC3R_APP_CMD "orca-slicer")
-    configure_file(${LIBDIR}/dev-utils/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh USE_SOURCE_PERMISSIONS @ONLY)
+    configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
+endif()
+
+option(BUILD_BBS_TEST_TOOLS          "Build bbs test tools" OFF)
+if(BUILD_BBS_TEST_TOOLS)
+    add_subdirectory(bbs_test_tools)
 endif()
 
 
@@ -828,7 +743,7 @@ endif()
 if (WIN32)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "./resources")
     set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
-    include(InstallRequiredSystemLibraries)
+    include(InstallRequiredSystemLibraries) 
     install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".")
 elseif (SLIC3R_FHS)
     # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
@@ -836,7 +751,7 @@ elseif (SLIC3R_FHS)
     install(DIRECTORY ${SLIC3R_RESOURCES_DIR}/ DESTINATION ${SLIC3R_FHS_RESOURCES}
         PATTERN "*/udev" EXCLUDE
     )
-    install(FILES src/dev-utils/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+    install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
     foreach(SIZE 32 128 192)
         install(FILES ${SLIC3R_RESOURCES_DIR}/images/OrcaSlicer_${SIZE}px.png
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${SIZE}x${SIZE}/apps RENAME OrcaSlicer.png
@@ -845,19 +760,19 @@ elseif (SLIC3R_FHS)
 elseif (CMAKE_MACOSX_BUNDLE)
     # install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/OrcaSlicer.app/Contents/resources")
 else ()
-    install(FILES src/dev-utils/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
+    install(FILES src/platform/unix/OrcaSlicer.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/resources/applications)
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 
 install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".")
-configure_file(${LIBDIR}/dev-utils/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/dev-utils/platform/unix/fhs.hpp)
+configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
 
 set (CPACK_PACKAGE_NAME "OrcaSlicer")
 set (CPACK_PACKAGE_VENDOR "SoftFever")
 set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
 set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
 set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
-set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_V${SoftFever_VERSION}")
+set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_Installer_${SoftFever_VERSION}")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
 set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})

README.md

@@ -1,157 +1,73 @@
-<div align="center">
+[![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
-
+# Orca Slicer     
-<picture>
+Orca Slicer is an open source slicer for FDM printers.   
-  <img alt="OrcaSlicer logo" src="resources/images/OrcaSlicer.png" width="15%" height="15%">
+You can download Orca Slicer here: [github releases page](https://github.com/SoftFever/OrcaSlicer/releases/).  
-</picture>
+![discord-mark-blue](https://github.com/SoftFever/OrcaSlicer/assets/103989404/b97d5ffc-072d-4d0a-bbda-e67ef373876f) Join community: [OrcaSlicer Official Discord Server](https://discord.gg/P4VE9UY9gJ)   
-
-<a href="https://trendshift.io/repositories/952" target="_blank"><img src="https://trendshift.io/api/badge/repositories/952" alt="SoftFever%2FOrcaSlicer | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
-[![GitHub Repo stars](https://img.shields.io/github/stars/SoftFever/OrcaSlicer)](https://github.com/SoftFever/OrcaSlicer/stargazers) [![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
-
-OrcaSlicer: an open source Next-Gen Slicing Software for Precision 3D Prints.  
-Optimize your prints with ultra-fast slicing, intelligent support generation, and seamless printer compatibility—engineered for perfection.
-<h3>
-
-# Official links and community
-
-#### Official Website:
-<a href="https://www.orcaslicer.com/" style="font-size:2em;">OrcaSlicer.com</a>
-
-#### Github Repository:
-<a href="https://github.com/SoftFever/OrcaSlicer"><img src="https://img.shields.io/badge/OrcaSlicer-181717?style=flat&logo=github&logoColor=white" width="200" alt="GitHub Logo"/> </a>
-
-#### Follow us:
-<a href="https://twitter.com/real_OrcaSlicer"><img src="https://img.shields.io/badge/real__OrcaSlicer-000000?style=flat&logo=x&logoColor=white" width="200" alt="X Logo"/> </a>
-
-#### Join our Discord community:
-<a href="https://discord.gg/P4VE9UY9gJ"><img src="https://img.shields.io/badge/-Discord-5865F2?style=flat&logo=discord&logoColor=fff" width="200" alt="discord logo"/> </a>
-
-<table border="2" style="border-color: #ffa500; background-color:rgb(232, 220, 180); color: #856404;">
-<tr>
-<td>
-<strong>⚠️ CAUTION:</strong><br><br>
-There are several clickbait and malicious websites pretending to be Official OrcaSlicer. These sites may redirect you to dangerous downloads or contain misleading information.
-<br><br>
-If you come across any of these in search results, please <a href="https://safebrowsing.google.com/safebrowsing/report_phish/?">report them as unsafe or phishing</a>  to help keep the community secure.
-</td>
-</tr>
-</table>
-
-</div>
 
 # Main features
+- Auto calibrations for all printers
+- Sandwich(inner-outer-inner) mode - an improved version of the `External perimeters first` mode
+- [Precise wall](https://github.com/SoftFever/OrcaSlicer/wiki/Precise-wall)
+- Polyholes conversion support [SuperSlicer Wiki: Polyholes](https://github.com/supermerill/SuperSlicer/wiki/Polyholes)
+- Klipper support
+- More granular controls
+- More features can be found in [change notes](https://github.com/SoftFever/OrcaSlicer/releases/)  
 
-- **[Advanced Calibration Tools](https://github.com/SoftFever/OrcaSlicer/wiki/Calibration)**  
+### Some background
-  Comprehensive suite: temperature towers, flow rate, retraction & more for optimal performance.
+OrcaSlicer is fork of Bambu Studio  
-- **[Precise Wall](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_precision#precise-wall) and [Seam Control](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_seam)**  
+It was previously known as BambuStudio-SoftFever  
-  Adjust outer wall spacing and apply scarf seams to enhance print accuracy.
+Bambu Studio is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community. 
-- **[Sandwich Mode](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_wall_and_surfaces#innerouterinner) and [Polyholes](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_precision#polyholes) Support**  
+Orca Slicer incorporates a lot of features from SuperSlicer by @supermerill
-  Use varied infill [patterns](https://github.com/SoftFever/OrcaSlicer/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity.
+Orca Slicer's logo is designed by community member Justin Levine(@freejstnalxndr)  
-- **[Overhang](https://github.com/SoftFever/OrcaSlicer/wiki/quality_settings_overhangs) and [Support Optimization](https://github.com/SoftFever/OrcaSlicer/wiki#support-settings)**  
-  Modify geometry for printable overhangs with precise support placement.
-- **[Granular Controls](https://github.com/SoftFever/OrcaSlicer/wiki#process-settings) and Customization**  
-  Fine-tune print speed, layer height, pressure, and temperature with precision.
-- **Network Printer Support**  
-  Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control.
-- **[Mouse Ear Brims](https://github.com/SoftFever/OrcaSlicer/wiki/others_settings_brim) & Adaptive Bed Mesh**  
-  Automatic brims and adaptive mesh calibration ensure consistent adhesion.
-- **User-Friendly Interface**  
-  Intuitive drag-and-drop design with pre-made profiles for popular printers.
-- **[Open-Source](https://github.com/SoftFever/OrcaSlicer) & [Community Driven](https://discord.gg/P4VE9UY9gJ)**  
-  Regular updates fueled by continuous community contributions.
-- **Wide Printer Compatibility**  
-  Supports a broad range of printers: Bambu Lab, Prusa, Creality, Voron, and more.
-- Additional features can be found in the [change notes](https://github.com/SoftFever/OrcaSlicer/releases/).
-
-# Wiki
-
-The wiki below aims to provide a detailed explanation of the slicer settings, including how to maximize their use and how to calibrate and set up your printer.
-
-Please note that the wiki is a work in progress. We appreciate your patience as we continue to develop and improve it!
-
-- **[Access the wiki here](https://github.com/SoftFever/OrcaSlicer/wiki)**
-- **[Contribute to the wiki](https://github.com/SoftFever/OrcaSlicer/wiki/How-to-wiki)**
-
-# Download
-
-## Stable Release
-
-📥 **[Download the Latest Stable Release](https://github.com/SoftFever/OrcaSlicer/releases/latest)**  
-Visit our GitHub Releases page for the latest stable version of OrcaSlicer, recommended for most users.
-
-## Nightly Builds
-
-🌙 **[Download the Latest Nightly Build](https://github.com/SoftFever/OrcaSlicer/releases/tag/nightly-builds)**  
-Explore the latest developments in OrcaSlicer with our nightly builds. Feedback on these versions is highly appreciated.
 
 # How to install
-
+**Windows**: 
-## Windows
+1.  Install and run  
-
-Download the **Windows Installer exe**  for your preferred version from the [releases page](https://github.com/SoftFever/OrcaSlicer/releases).
-
- - *For convenience there is also a portable build available.*
-    <details>
-    <summary>Troubleshooting</summary>
-
     - *If you have troubles to run the build, you might need to install following runtimes:*
-    - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
+      - [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)  
-        - [Details of this runtime](https://aka.ms/webview2)
+      - [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)  
-        - [Alternative Download Link Hosted by Microsoft](https://go.microsoft.com/fwlink/p/?LinkId=2124703)
-    - [vcredist2019_x64](https://github.com/SoftFever/OrcaSlicer/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
-        -  [Alternative Download Link Hosted by Microsoft](https://aka.ms/vs/17/release/vc_redist.x64.exe)
-        -  This file may already be available on your computer if you've installed visual studio.  Check the following location: `%VCINSTALLDIR%Redist\MSVC\v142`
-    </details>
-
-Windows Package Manager
-
-```shell
-winget install --id=SoftFever.OrcaSlicer -e
-```
-
-## Mac
-
-1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.
-2. Drag OrcaSlicer.app to Application folder.
-3. *If you want to run a build from a PR, you also need to follow the instructions below:*
-
-    <details>
-    <summary>Quarantine</summary>
 
+**Mac**:
+1. Download the DMG for your computer: `arm64` version for Apple Silicon and `x86_64` for Intel CPU.  
+2. Drag OrcaSlicer.app to Application folder. 
+3. *If you want to run a build from a PR, you also need following instructions below*  
+    <details quarantine>
     - Option 1 (You only need to do this once. After that the app can be opened normally.):
       - Step 1: Hold _cmd_ and right click the app, from the context menu choose **Open**.
-      - Step 2: A warning window will pop up, click _Open_
+      - Step 2: A warning window will pop up, click _Open_  
-
+      
-    - Option 2:
+    - Option 2:  
-      Execute this command in terminal:
+      Execute this command in terminal: `xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app`
-
+      ```console
-      ```shell
+          softfever@mac:~$ xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
-      xattr -dr com.apple.quarantine /Applications/OrcaSlicer.app
       ```
-
+    - Option 3:  
-    - Option 3:
         - Step 1: open the app, a warning window will pop up  
-            ![mac_cant_open](./SoftFever_doc/mac_cant_open.png)
+            ![image](./SoftFever_doc/mac_cant_open.png)  
         - Step 2: in `System Settings` -> `Privacy & Security`, click `Open Anyway`:  
-            ![mac_security_setting](./SoftFever_doc/mac_security_setting.png)
+            ![image](./SoftFever_doc/mac_security_setting.png)  
     </details>
+    
+**Linux(Ubuntu)**:
+ 1. If you run into trouble to execute it, try this command in terminal:  
+    `chmod +x /path_to_appimage/OrcaSlicer_ubu64.AppImage`
+# How to compile
+- Windows 64-bit  
+  - Tools needed: Visual Studio 2019, Cmake, git, Strawberry Perl.
+  - Run `build_release.bat` in `x64 Native Tools Command Prompt for VS 2019`
 
-## Linux (Ubuntu)
+- Mac 64-bit  
+  - Tools needed: Xcode, Cmake, git, gettext, libtool, automake, autoconf
+  - run `build_release_macos.sh`
 
- 1. If you run into trouble executing it, try this command in the terminal:
+- Ubuntu  
-    `chmod +x /path_to_appimage/OrcaSlicer_Linux.AppImage`
+  - run 'sudo ./BuildLinux.sh -u'
+  - run './BuildLinux.sh -dsir'
 
-# How to Compile
-
-All updated build instructions for Windows, macOS, and Linux are now available on the official [OrcaSlicer Wiki - How to build](https://github.com/SoftFever/OrcaSlicer/wiki/How-to-build) page.
-
-Please refer to the wiki to ensure you're following the latest and most accurate steps for your platform.
-
-# Klipper Note
 
+# Note: 
 If you're running Klipper, it's recommended to add the following configuration to your `printer.cfg` file.
-
+```
-```gcode
 # Enable object exclusion
 [exclude_object]
 
@@ -161,52 +77,49 @@ resolution: 0.1
 ```
 
 # Supports
-
+**Orca Slicer** is an open-source project, and I'm deeply grateful to all my sponsors and backers.   
-**OrcaSlicer** is an open-source project and I'm deeply grateful to all my sponsors and backers.  
+Their generous support enables me to purchase filaments and other essential 3D printing materials for the project.   
-Their generous support enables me to purchase filaments and other essential 3D printing materials for the project.  
 Thank you! :)
 
-## Sponsors:
+### Sponsors:  
-
 <table>
 <tr>
 <td>
-<a href="https://qidi3d.com/" style="display:inline-block; border-radius:8px; background:#fff;">
+<a href="https://peopoly.net/">
-  <img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="100" height="100">
+    <img src="SoftFever_doc\sponsor_logos\peopoly-standard-logo.png" alt="Peopoly" width="64" height="">
 </a>
-</td>
+</td> 
+</tr>
+<tr>
+<td> </td>
+</tr>
+<tr>
 <td>
-<a href="https://bigtree-tech.com/" style="display:inline-block; border-radius:8px; background:#222;">
+<a href="https://qidi3d.com/">
-    <img src="SoftFever_doc\sponsor_logos\BigTreeTech.png" alt="BIGTREE TECH" width="100" height="100">
+    <img src="SoftFever_doc\sponsor_logos\QIDI.png" alt="QIDI" width="64" height="">
 </a>
 </td>
 </tr>
 </table>
 
-## Backers:
+### Backers:  
+Ko-fi supporters: [Backers list](https://github.com/SoftFever/OrcaSlicer/wiki/OrcaSlicer-backers-%E2%80%90-28-Oct-2023)
 
-**Ko-fi supporters** ☕: [Backers list](https://github.com/user-attachments/files/16147016/Supporters_638561417699952499.csv)
+Support me  
-
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/G2G5IP3CP)
-## Support me
-
-<a href="https://github.com/sponsors/SoftFever"><img src="https://img.shields.io/badge/GitHub%20Sponsors-30363D?style=flat&logo=GitHub-Sponsors&logoColor=EA4AAA" height="50"></a>
-<a href="https://ko-fi.com/G2G5IP3CP"><img src="https://img.shields.io/badge/Support_me_on_Ko--fi-FF5E5B?style=flat&logo=ko-fi&logoColor=white" height="50"></a>
-<a href="https://paypal.me/softfever3d"><img src="https://img.shields.io/badge/PayPal-003087?style=flat&logo=paypal&logoColor=fff" height="50"></a>
-
-## Some background
-
-OrcaSlicer was originally forked from Bambu Studio, it was previously known as BambuStudio-SoftFever.
-
-[Bambu Studio](https://github.com/bambulab/BambuStudio) is forked from [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
-OrcaSlicer incorporates a lot of features from [SuperSlicer](https://github.com/supermerill/SuperSlicer) by @supermerill
-OrcaSlicer's logo is designed by community member Justin Levine (@freejstnalxndr).
 
 # License
+Orca Slicer is licensed under the GNU Affero General Public License, version 3. Orca Slicer is based on Bambu Studio by BambuLab.
+
+Bambu Studio is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
+
+PrusaSlicer is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
+
+Slic3r is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
+
+The GNU Affero General Public License, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
+
+Orca Slicer includes a pressure advance calibration pattern test adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
+
+The bambu networking plugin is based on non-free libraries from Bambulab. It is optional to the Orca Slicer and provides extended functionalities for Bambulab printer users.
 
-- **OrcaSlicer** is licensed under the GNU Affero General Public License, version 3. OrcaSlicer is based on Bambu Studio by BambuLab.
-- **Bambu Studio** is licensed under the GNU Affero General Public License, version 3. Bambu Studio is based on PrusaSlicer by PrusaResearch.
-- **PrusaSlicer** is licensed under the GNU Affero General Public License, version 3. PrusaSlicer is owned by Prusa Research. PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
-- **Slic3r** is licensed under the GNU Affero General Public License, version 3. Slic3r was created by Alessandro Ranellucci with the help of many other contributors.
-- The **GNU Affero General Public License**, version 3 ensures that if you use any part of this software in any way (even behind a web server), your software must be released under the same license.
-- OrcaSlicer includes a **pressure advance calibration pattern test** adapted from Andrew Ellis' generator, which is licensed under GNU General Public License, version 3. Ellis' generator is itself adapted from a generator developed by Sineos for Marlin, which is licensed under GNU General Public License, version 3.
-- The **Bambu networking plugin** is based on non-free libraries from BambuLab. It is optional to the OrcaSlicer and provides extended functionalities for Bambulab printer users.

Readme.txt

@@ -0,0 +1 @@
+Init Version

SECURITY.md

@@ -1,47 +0,0 @@
-# Security Policy
-
-At OrcaSlicer, we are committed to maintaining the security of our ecosystem. Our policy is to ensure that we do not introduce vulnerabilities and that any security issues are addressed promptly and responsibly. We appreciate your help in improving the security of OrcaSlicer and thank you for your responsible disclosure.
-Reporting Security Bugs
-
-## To report a security bug, please follow these guidelines:
-
-  * Email Security Bugs:
-        Send an email to the lead maintainer at softfeverever@gmail.com.
-        Include the word "SECURITY" in the subject line of your email.
-
-  * Response Times:
-        The lead maintainer will acknowledge receipt of your email within one week (7 days).
-        A detailed response will follow within 48 hours, outlining the next steps for handling your report.
-        After the initial reply, the security team will keep you informed about the progress toward a fix and any announcements.
-
-  * Information and Collaboration:
-        We may request additional information or guidance as we work on addressing the issue.
-
-  * Handling the Report:
-        OrcaSlicer will confirm the problem and determine the affected versions.
-        We will audit the code to find any similar issues and prepare fixes for all releases still under maintenance.
-        Fixes will be released as quickly as possible.
-
-  * Third-Party Modules:
-        Report security issues in third-party modules to the respective maintainer of those modules.
-
-## Security Disclosure Guidelines
-
-When disclosing a vulnerability, please follow these steps to ensure your report is clear and actionable:
-
-  * Provide Detailed Information:
-        Scope: Clearly define the scope of the vulnerability.
-        Potential Impact: Let us know who could be affected by this exploit.
-        Reproduction Steps: Document detailed steps to reproduce the vulnerability.
-
-    Reference OWASP Guidelines:
-        Follow the <a href="https://cheatsheetseries.owasp.org/cheatsheets/Vulnerability_Disclosure_Cheat_Sheet.html">OWASP Vulnerability Disclosure Cheat Sheet</a> for best practices in vulnerability disclosure.
-
-## Security Recommendations
-
-To enhance security when using OrcaSlicer, we recommend following these steps:
-
-  * SEE SOMETHING: If you notice anything suspicious or have concerns, please report it.
-  * SAY SOMETHING: If you have any doubts or need assistance, do not hesitate to contact us.
-
-### Thank you for your commitment to the security of OrcaSlicer. Your efforts help us maintain a safe and reliable ecosystem.

build_flatpak.sh

@@ -1,341 +0,0 @@
-#!/bin/bash
-
-# OrcaSlicer Flatpak Build Script
-# This script builds and packages OrcaSlicer as a Flatpak package locally
-# Based on the GitHub Actions workflow in .github/workflows/build_all.yml
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-# Default values
-ARCH=$(uname -m)
-BUILD_DIR="build_flatpak"
-CLEANUP=false
-INSTALL_RUNTIME=false
-JOBS=$(nproc)
-FORCE_CLEAN=false
-ENABLE_CCACHE=false
-CACHE_DIR=".flatpak-builder"
-
-# Help function
-show_help() {
-    echo "Usage: $0 [OPTIONS]"
-    echo ""
-    echo "Build OrcaSlicer as a Flatpak package"
-    echo ""
-    echo "Options:"
-    echo "  -a, --arch ARCH        Target architecture (x86_64, aarch64) [default: $ARCH]"
-    echo "  -d, --build-dir DIR    Build directory [default: $BUILD_DIR]"
-    echo "  -j, --jobs JOBS        Number of parallel build jobs for flatpak-builder and modules [default: $JOBS]"
-    echo "  -c, --cleanup          Clean build directory before building"
-    echo "  -f, --force-clean      Force clean build (disables caching)"
-    echo "  --ccache               Enable ccache for faster rebuilds (requires ccache in SDK)"
-    echo "  --cache-dir DIR        Flatpak builder cache directory [default: $CACHE_DIR]"
-    echo "  -i, --install-runtime  Install required Flatpak runtime and SDK"
-    echo "  -h, --help             Show this help message"
-    echo ""
-    echo "Examples:"
-    echo "  $0                     # Build for current architecture with caching enabled"
-    echo "  $0 -f                  # Force clean build (no caching)"
-    echo "  $0 --ccache -j 8       # Use ccache and 8 parallel jobs for faster builds"
-    echo "  $0 -a x86_64 -c       # Build for x86_64 and cleanup first"
-    echo "  $0 -i -j 16 --ccache  # Install runtime, build with 16 jobs and ccache"
-}
-
-# Parse command line arguments
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        -a|--arch)
-            ARCH="$2"
-            shift 2
-            ;;
-        -d|--build-dir)
-            BUILD_DIR="$2"
-            shift 2
-            ;;
-        -j|--jobs)
-            JOBS="$2"
-            shift 2
-            ;;
-        -c|--cleanup)
-            CLEANUP=true
-            shift
-            ;;
-        -f|--force-clean)
-            FORCE_CLEAN=true
-            shift
-            ;;
-        --ccache)
-            ENABLE_CCACHE=true
-            shift
-            ;;
-        --cache-dir)
-            CACHE_DIR="$2"
-            shift 2
-            ;;
-        -i|--install-runtime)
-            INSTALL_RUNTIME=true
-            shift
-            ;;
-        -h|--help)
-            show_help
-            exit 0
-            ;;
-        *)
-            echo -e "${RED}Error: Unknown option $1${NC}"
-            show_help
-            exit 1
-            ;;
-    esac
-done
-
-# Validate architecture
-if [[ "$ARCH" != "x86_64" && "$ARCH" != "aarch64" ]]; then
-    echo -e "${RED}Error: Unsupported architecture '$ARCH'. Supported: x86_64, aarch64${NC}"
-    exit 1
-fi
-
-# Validate jobs parameter
-if ! [[ "$JOBS" =~ ^[1-9][0-9]*$ ]]; then
-    echo -e "${RED}Error: Jobs must be a positive integer, got '$JOBS'${NC}"
-    exit 1
-fi
-
-echo -e "${BLUE}OrcaSlicer Flatpak Build Script${NC}"
-echo -e "${BLUE}================================${NC}"
-echo -e "Architecture: ${GREEN}$ARCH${NC}"
-echo -e "Build directory: ${GREEN}$BUILD_DIR${NC}"
-echo -e "Cache directory: ${GREEN}$CACHE_DIR${NC}"
-echo -e "Parallel jobs: ${GREEN}$JOBS${NC}"
-if [[ "$FORCE_CLEAN" == true ]]; then
-    echo -e "Cache mode: ${RED}DISABLED (force clean)${NC}"
-else
-    echo -e "Cache mode: ${GREEN}ENABLED${NC}"
-fi
-if [[ "$ENABLE_CCACHE" == true ]]; then
-    echo -e "Ccache: ${GREEN}ENABLED${NC}"
-else
-    echo -e "Ccache: ${YELLOW}DISABLED${NC}"
-fi
-echo ""
-
-# Check available disk space (flatpak builds need several GB)
-AVAILABLE_SPACE=$(df . | awk 'NR==2 {print $4}')
-REQUIRED_SPACE=$((5 * 1024 * 1024))  # 5GB in KB
-
-if [[ $AVAILABLE_SPACE -lt $REQUIRED_SPACE ]]; then
-    echo -e "${YELLOW}Warning: Low disk space detected.${NC}"
-    echo -e "Available: $(( AVAILABLE_SPACE / 1024 / 1024 ))GB, Recommended: 5GB+"
-    echo -e "Continue anyway? (y/N)"
-    read -r response
-    if [[ ! "$response" =~ ^[Yy]$ ]]; then
-        echo "Build cancelled by user"
-        exit 1
-    fi
-fi
-
-# Check if flatpak is installed
-if ! command -v flatpak &> /dev/null; then
-    echo -e "${RED}Error: Flatpak is not installed. Please install it first.${NC}"
-    echo "On Ubuntu/Debian: sudo apt install flatpak"
-    echo "On Fedora: sudo dnf install flatpak"
-    echo "On Arch: sudo pacman -S flatpak"
-    exit 1
-fi
-
-# Check if flatpak-builder is installed
-if ! command -v flatpak-builder &> /dev/null; then
-    echo -e "${RED}Error: flatpak-builder is not installed. Please install it first.${NC}"
-    echo "On Ubuntu/Debian: sudo apt install flatpak-builder"
-    echo "On Fedora: sudo dnf install flatpak-builder"
-    echo "On Arch: sudo pacman -S flatpak-builder"
-    exit 1
-fi
-
-# Check additional build dependencies
-echo -e "${YELLOW}Checking build dependencies...${NC}"
-MISSING_DEPS=()
-
-if ! command -v cmake &> /dev/null; then
-    MISSING_DEPS+=("cmake")
-fi
-
-if ! command -v ninja &> /dev/null && ! command -v make &> /dev/null; then
-    MISSING_DEPS+=("ninja or make")
-fi
-
-if ! command -v pkg-config &> /dev/null; then
-    MISSING_DEPS+=("pkg-config")
-fi
-
-if [ ${#MISSING_DEPS[@]} -ne 0 ]; then
-    echo -e "${RED}Error: Missing required build dependencies: ${MISSING_DEPS[*]}${NC}"
-    echo "On Ubuntu/Debian: sudo apt install cmake ninja-build pkg-config"
-    echo "On Fedora: sudo dnf install cmake ninja-build pkgconfig"
-    exit 1
-fi
-
-echo -e "${GREEN}All required dependencies found${NC}"
-
-# Install runtime and SDK if requested
-if [[ "$INSTALL_RUNTIME" == true ]]; then
-    echo -e "${YELLOW}Installing GNOME runtime and SDK...${NC}"
-    flatpak install --user -y flathub org.gnome.Platform//47
-    flatpak install --user -y flathub org.gnome.Sdk//47
-fi
-
-# Check if required runtime is available
-if ! flatpak info --user org.gnome.Platform//47 &> /dev/null; then
-    echo -e "${RED}Error: GNOME Platform 47 runtime is not installed.${NC}"
-    echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Platform//47"
-    exit 1
-fi
-
-if ! flatpak info --user org.gnome.Sdk//47 &> /dev/null; then
-    echo -e "${RED}Error: GNOME SDK 47 is not installed.${NC}"
-    echo "Run with -i flag to install it automatically, or install manually:"
-    echo "flatpak install --user flathub org.gnome.Sdk//47"
-    exit 1
-fi
-
-# Get version information
-echo -e "${YELLOW}Getting version information...${NC}"
-if [[ -f "version.inc" ]]; then
-    VER_PURE=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
-    VER="V$VER_PURE"
-    DATE=$(date +'%Y%m%d')
-    echo -e "Version: ${GREEN}$VER${NC}"
-    echo -e "Date: ${GREEN}$DATE${NC}"
-else
-    echo -e "${RED}Error: version.inc not found${NC}"
-    exit 1
-fi
-
-# Cleanup build directory if requested
-if [[ "$CLEANUP" == true ]]; then
-    echo -e "${YELLOW}Cleaning up flatpak-specific build directories...${NC}"
-    rm -rf deps/build_flatpak build_flatpak
-
-    echo -e "${YELLOW}Cleaning up flatpak build directories...${NC}"
-    rm -rf "$BUILD_DIR"
-    
-    # Only clean cache if force-clean is enabled
-    if [[ "$FORCE_CLEAN" == true ]]; then
-        echo -e "${YELLOW}Cleaning up flatpak build cache...${NC}"
-        rm -rf "$CACHE_DIR"
-    else
-        echo -e "${BLUE}Preserving build cache at: $CACHE_DIR${NC}"
-    fi
-    
-    echo -e "${BLUE}Note: Host build directories (deps/build, build) are preserved${NC}"
-fi
-
-# Create build directory
-mkdir -p "$BUILD_DIR"
-rm -rf "$BUILD_DIR/build-dir"
-
-# Check if flatpak manifest exists
-if [[ ! -f "./scripts/flatpak/io.github.softfever.OrcaSlicer.yml" ]]; then
-    echo -e "${RED}Error: Flatpak manifest not found at scripts/flatpak/io.github.softfever.OrcaSlicer.yml${NC}"
-    exit 1
-fi
-
-# Build the Flatpak
-echo -e "${YELLOW}Building Flatpak package...${NC}"
-echo -e "This may take a while (30+ minutes depending on your system)..."
-echo ""
-
-BUNDLE_NAME="OrcaSlicer-Linux-flatpak_${VER}_${ARCH}.flatpak"
-
-# Remove any existing bundle
-rm -f "$BUNDLE_NAME"
-
-# Create necessary directories inside repo
-mkdir -p "$BUILD_DIR/cache" "$BUILD_DIR/flatpak-builder"
-
-# Set environment variables to match GitHub Actions
-export FLATPAK_BUILDER_N_JOBS=$JOBS
-
-echo -e "${BLUE}Running flatpak-builder...${NC}"
-echo -e "Using $JOBS parallel jobs for flatpak-builder and $FLATPAK_BUILDER_N_JOBS for module builds"
-
-# Check flatpak-builder version to determine available options
-FLATPAK_BUILDER_VERSION=$(flatpak-builder --version 2>/dev/null | head -1 | awk '{print $2}' || echo "unknown")
-echo -e "flatpak-builder version: $FLATPAK_BUILDER_VERSION"
-
-# Build command with caching support
-BUILDER_ARGS=(
-    --arch="$ARCH"
-    --user
-    --install-deps-from=flathub
-    --repo="$BUILD_DIR/repo"
-    --verbose
-    --state-dir="$CACHE_DIR"
-    --jobs="$JOBS"
-)
-
-# Add force-clean only if explicitly requested (disables caching)
-if [[ "$FORCE_CLEAN" == true ]]; then
-    BUILDER_ARGS+=(--force-clean)
-    echo -e "${YELLOW}Using --force-clean (caching disabled)${NC}"
-else
-    echo -e "${GREEN}Using build cache for faster rebuilds${NC}"
-fi
-
-# Add ccache if enabled
-if [[ "$ENABLE_CCACHE" == true ]]; then
-    BUILDER_ARGS+=(--ccache)
-    echo -e "${GREEN}Using ccache for compiler caching${NC}"
-fi
-
-if ! flatpak-builder \
-    "${BUILDER_ARGS[@]}" \
-    "$BUILD_DIR/build-dir" \
-    scripts/flatpak/io.github.softfever.OrcaSlicer.yml; then
-    echo -e "${RED}Error: flatpak-builder failed${NC}"
-    echo -e "${YELLOW}Check the build log above for details${NC}"
-    exit 1
-fi
-
-# Create bundle
-echo -e "${YELLOW}Creating Flatpak bundle...${NC}"
-if ! flatpak build-bundle \
-    "$BUILD_DIR/repo" \
-    "$BUNDLE_NAME" \
-    io.github.softfever.OrcaSlicer \
-    --arch="$ARCH"; then
-    echo -e "${RED}Error: Failed to create Flatpak bundle${NC}"
-    exit 1
-fi
-
-# Success message
-echo ""
-echo -e "${GREEN}✓ Flatpak build completed successfully!${NC}"
-echo -e "Bundle created: ${GREEN}$BUNDLE_NAME${NC}"
-echo -e "Size: ${GREEN}$(du -h "$BUNDLE_NAME" | cut -f1)${NC}"
-if [[ "$FORCE_CLEAN" != true ]]; then
-    echo -e "Build cache: ${GREEN}$CACHE_DIR${NC} (preserved for faster future builds)"
-fi
-echo ""
-echo -e "${BLUE}To install the Flatpak:${NC}"
-echo -e "flatpak install --user $BUNDLE_NAME"
-echo ""
-echo -e "${BLUE}To run OrcaSlicer:${NC}"
-echo -e "flatpak run io.github.softfever.OrcaSlicer"
-echo ""
-echo -e "${BLUE}To uninstall:${NC}"
-echo -e "flatpak uninstall --user io.github.softfever.OrcaSlicer"
-echo ""
-if [[ "$FORCE_CLEAN" != true ]]; then
-    echo -e "${BLUE}Cache Management:${NC}"
-    echo -e "• Subsequent builds will be faster thanks to caching"
-    echo -e "• To force a clean build: $0 -f"
-    echo -e "• To clean cache manually: rm -rf $CACHE_DIR"
-fi

build_linux.sh

@@ -1,275 +0,0 @@
-#!/usr/bin/env bash
-set -e # Exit immediately if a command exits with a non-zero status.
-
-SCRIPT_NAME=$(basename "$0")
-SCRIPT_PATH=$(dirname "$(readlink -f "${0}")")
-
-pushd "${SCRIPT_PATH}" > /dev/null
-
-function usage() {
-    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-h][-i][-j N][-p][-r][-s][-t][-u][-l][-L]"
-    echo "   -1: limit builds to one core (where possible)"
-    echo "   -j N: limit builds to N cores (where possible)"
-    echo "   -b: build in debug mode"
-    echo "   -c: force a clean build"
-    echo "   -C: enable ANSI-colored compile output (GNU/Clang only)"
-    echo "   -d: download and build dependencies in ./deps/ (build prerequisite)"
-    echo "   -h: prints this help text"
-    echo "   -i: build the Orca Slicer AppImage (optional)"
-    echo "   -p: boost ccache hit rate by disabling precompiled headers (default: ON)"
-    echo "   -r: skip RAM and disk checks (low RAM compiling)"
-    echo "   -s: build the Orca Slicer (optional)"
-    echo "   -t: build tests (optional)"
-    echo "   -u: install system dependencies (asks for sudo password; build prerequisite)"
-    echo "   -l: use Clang instead of GCC (default: GCC)"
-    echo "   -L: use ld.lld as linker (if available)"
-    echo "For a first use, you want to './${SCRIPT_NAME} -u'"
-    echo "   and then './${SCRIPT_NAME} -dsi'"
-    echo "To build with tests: './${SCRIPT_NAME} -st' or './${SCRIPT_NAME} -dst'"
-}
-
-SLIC3R_PRECOMPILED_HEADERS="ON"
-
-unset name
-while getopts ":1j:bcCdhiprstulL" opt ; do
-  case ${opt} in
-    1 )
-        export CMAKE_BUILD_PARALLEL_LEVEL=1
-        ;;
-    j )
-        export CMAKE_BUILD_PARALLEL_LEVEL=$OPTARG
-        ;;
-    b )
-        BUILD_DEBUG="1"
-        ;;
-    c )
-        CLEAN_BUILD=1
-        ;;
-    C )
-        COLORED_OUTPUT="-DCOLORED_OUTPUT=ON"
-        ;;
-    d )
-        BUILD_DEPS="1"
-        ;;
-    h ) usage
-        exit 1
-        ;;
-    i )
-        BUILD_IMAGE="1"
-        ;;
-    p )
-        SLIC3R_PRECOMPILED_HEADERS="OFF"
-        ;;
-    r )
-        SKIP_RAM_CHECK="1"
-        ;;
-    s )
-        BUILD_ORCA="1"
-        ;;
-    t )
-        BUILD_TESTS="1"
-        ;;
-    u )
-        export UPDATE_LIB="1"
-        ;;
-    l )
-        USE_CLANG="1"
-        ;;
-    L )
-        USE_LLD="1"
-        ;;
-    * )
-	echo "Unknown argument '${opt}', aborting."
-	exit 1
-	;;
-  esac
-done
-
-if [ ${OPTIND} -eq 1 ] ; then
-    usage
-    exit 1
-fi
-
-function check_available_memory_and_disk() {
-    FREE_MEM_GB=$(free --gibi --total | grep 'Mem' | rev | cut --delimiter=" " --fields=1 | rev)
-    MIN_MEM_GB=10
-
-    FREE_DISK_KB=$(df --block-size=1K . | tail -1 | awk '{print $4}')
-    MIN_DISK_KB=$((10 * 1024 * 1024))
-
-    if [[ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]] ; then
-        echo -e "\nERROR: Orca Slicer Builder requires at least ${MIN_MEM_GB}G of 'available' mem (system has only ${FREE_MEM_GB}G available)"
-        echo && free --human && echo
-        echo "Invoke with -r to skip RAM and disk checks."
-        exit 2
-    fi
-
-    if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]] ; then
-        echo -e "\nERROR: Orca Slicer Builder requires at least $(echo "${MIN_DISK_KB}" |awk '{ printf "%.1fG\n", $1/1024/1024; }') (system has only $(echo "${FREE_DISK_KB}" | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
-        echo && df --human-readable . && echo
-        echo "Invoke with -r to skip ram and disk checks."
-        exit 1
-    fi
-}
-
-# cmake 4.x compatibility workaround
-export CMAKE_POLICY_VERSION_MINIMUM=3.5
-
-DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release | tr -d '"')
-DISTRIBUTION_LIKE=$(awk -F= '/^ID_LIKE=/ {print $2}' /etc/os-release | tr -d '"')
-# Check for direct distribution match to Ubuntu/Debian
-if [ "${DISTRIBUTION}" == "ubuntu" ] || [ "${DISTRIBUTION}" == "linuxmint" ] ; then
-    DISTRIBUTION="debian"
-# Check if distribution is Debian/Ubuntu-like based on ID_LIKE
-elif [[ "${DISTRIBUTION_LIKE}" == *"debian"* ]] || [[ "${DISTRIBUTION_LIKE}" == *"ubuntu"* ]] ; then
-    DISTRIBUTION="debian"
-elif [[ "${DISTRIBUTION_LIKE}" == *"arch"* ]] ; then
-    DISTRIBUTION="arch"
-fi
-
-if [ ! -f "./scripts/linux.d/${DISTRIBUTION}" ] ; then
-    echo "Your distribution \"${DISTRIBUTION}\" is not supported by system-dependency scripts in ./scripts/linux.d/"
-    echo "Please resolve dependencies manually and contribute a script for your distribution to upstream."
-    exit 1
-else
-    echo "resolving system dependencies for distribution \"${DISTRIBUTION}\" ..."
-    # shellcheck source=/dev/null
-    source "./scripts/linux.d/${DISTRIBUTION}"
-fi
-
-echo "FOUND_GTK3=${FOUND_GTK3}"
-if [[ -z "${FOUND_GTK3_DEV}" ]] ; then
-    echo "Error, you must install the dependencies before."
-    echo "Use option -u with sudo"
-    exit 1
-fi
-
-echo "Changing date in version..."
-{
-    # change date in version
-    sed --in-place "s/+UNKNOWN/_$(date '+%F')/" version.inc
-}
-echo "done"
-
-
-if [[ -z "${SKIP_RAM_CHECK}" ]] ; then
-    check_available_memory_and_disk
-fi
-
-export CMAKE_C_CXX_COMPILER_CLANG=()
-if [[ -n "${USE_CLANG}" ]] ; then
-    export CMAKE_C_CXX_COMPILER_CLANG=(-DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++)
-fi
-
-# Configure use of ld.lld as the linker when requested
-export CMAKE_LLD_LINKER_ARGS=()
-if [[ -n "${USE_LLD}" ]] ; then
-    if command -v ld.lld >/dev/null 2>&1 ; then
-        LLD_BIN=$(command -v ld.lld)
-        export CMAKE_LLD_LINKER_ARGS=(-DCMAKE_LINKER="${LLD_BIN}" -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld)
-    else
-        echo "Error: ld.lld not found. Please install the 'lld' package (e.g., sudo apt install lld) or omit -L."
-        exit 1
-    fi
-fi
-
-if [[ -n "${BUILD_DEPS}" ]] ; then
-    echo "Configuring dependencies..."
-    read -r -a BUILD_ARGS <<< "${DEPS_EXTRA_BUILD_ARGS}"
-    BUILD_ARGS+=(-DDEP_WX_GTK3=ON)
-    if [[ -n "${CLEAN_BUILD}" ]]
-    then
-        rm -fr deps/build
-    fi
-    mkdir -p deps/build
-    if [[ -n "${BUILD_DEBUG}" ]] ; then
-        # build deps with debug and release else cmake will not find required sources
-        mkdir -p deps/build/release
-	set -x
-	cmake -S deps -B deps/build/release "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja \
-	      -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \
-	      -DDESTDIR="${SCRIPT_PATH}/deps/build/destdir" \
-	      -DDEP_DOWNLOAD_DIR="${SCRIPT_PATH}/deps/DL_CACHE" \
-	      "${COLORED_OUTPUT}" \
-	      "${BUILD_ARGS[@]}"
-	set +x
-        cmake --build deps/build/release
-        BUILD_ARGS+=(-DCMAKE_BUILD_TYPE=Debug)
-    fi
-
-    set -x
-    cmake -S deps -B deps/build "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja \
-	  -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \
-	  -DDESTDIR="${SCRIPT_PATH}/deps/build/destdir" \
-	  -DDEP_DOWNLOAD_DIR="${SCRIPT_PATH}/deps/DL_CACHE" \
-	  "${COLORED_OUTPUT}" \
-	  "${BUILD_ARGS[@]}"
-    set +x
-    cmake --build deps/build
-fi
-
-if [[ -n "${BUILD_ORCA}" ]] ; then
-    echo "Configuring OrcaSlicer..."
-    if [[ -n "${CLEAN_BUILD}" ]] ; then
-        rm -fr build
-    fi
-    read -r -a BUILD_ARGS <<< "${ORCA_EXTRA_BUILD_ARGS}"
-    if [[ -n "${FOUND_GTK3_DEV}" ]] ; then
-        BUILD_ARGS+=(-DSLIC3R_GTK=3)
-    fi
-    if [[ -n "${BUILD_DEBUG}" ]] ; then
-        BUILD_ARGS+=(-DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1)
-    else
-        BUILD_ARGS+=(-DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0)
-    fi
-    if [[ -n "${BUILD_TESTS}" ]] ; then
-        BUILD_ARGS+=(-DBUILD_TESTS=ON)
-    fi
-    if [[ -n "${ORCA_UPDATER_SIG_KEY}" ]] ; then
-        BUILD_ARGS+=(-DORCA_UPDATER_SIG_KEY="${ORCA_UPDATER_SIG_KEY}")
-    fi
-
-    echo "Configuring OrcaSlicer..."
-    set -x
-    cmake -S . -B build "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G "Ninja Multi-Config" \
-	  -DSLIC3R_PCH="${SLIC3R_PRECOMPILED_HEADERS}" \
-	  -DCMAKE_PREFIX_PATH="${SCRIPT_PATH}/deps/build/destdir/usr/local" \
-	  -DSLIC3R_STATIC=1 \
-	  -DORCA_TOOLS=ON \
-	  "${COLORED_OUTPUT}" \
-	  "${BUILD_ARGS[@]}"
-    set +x
-    echo "done"
-    echo "Building OrcaSlicer ..."
-    if [[ -n "${BUILD_DEBUG}" ]] ; then
-        cmake --build build --config Debug --target OrcaSlicer
-    else
-        cmake --build build --config Release --target OrcaSlicer
-    fi
-    echo "Building OrcaSlicer_profile_validator .."
-    if [[ -n "${BUILD_DEBUG}" ]] ; then
-        cmake --build build --config Debug --target OrcaSlicer_profile_validator
-    else
-        cmake --build build --config Release --target OrcaSlicer_profile_validator
-    fi
-    ./scripts/run_gettext.sh
-    echo "done"
-fi
-
-if [[ -n "${BUILD_IMAGE}" || -n "${BUILD_ORCA}" ]] ; then
-    pushd build > /dev/null
-    echo "[9/9] Generating Linux app..."
-    build_linux_image="./src/build_linux_image.sh"
-    if [[ -e ${build_linux_image} ]] ; then
-        extra_script_args=""
-        if [[ -n "${BUILD_IMAGE}" ]] ; then
-            extra_script_args="-i"
-        fi
-        ${build_linux_image} ${extra_script_args}
-
-        echo "done"
-    fi
-    popd > /dev/null # build
-fi
-
-popd > /dev/null # ${SCRIPT_PATH}

build_release.bat

@@ -1,52 +1,26 @@
 set WP=%CD%
-
-set debug=OFF
-set debuginfo=OFF
-if "%1"=="debug" set debug=ON
-if "%2"=="debug" set debug=ON
-if "%1"=="debuginfo" set debuginfo=ON
-if "%2"=="debuginfo" set debuginfo=ON
-if "%debug%"=="ON" (
-    set build_type=Debug
-    set build_dir=build-dbg
-) else (
-    if "%debuginfo%"=="ON" (
-        set build_type=RelWithDebInfo
-        set build_dir=build-dbginfo
-    ) else (
-        set build_type=Release
-        set build_dir=build
-    )
-)
-echo build type set to %build_type%
-
 cd deps
-mkdir %build_dir%
+mkdir build
-cd %build_dir%
+cd build
 set DEPS=%CD%/OrcaSlicer_dep
-set "SIG_FLAG="
-if defined ORCA_UPDATER_SIG_KEY set "SIG_FLAG=-DORCA_UPDATER_SIG_KEY=%ORCA_UPDATER_SIG_KEY%"
 if "%1"=="slicer" (
     GOTO :slicer
 )
 echo "building deps.."
-
+cmake ../ -G "Visual Studio 16 2019" -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-echo cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake --build . --config Release --target deps -- -m
-cmake ../ -G "Visual Studio 16 2019" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
-cmake --build . --config %build_type% --target deps -- -m
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir %build_dir%
+mkdir build 
-cd %build_dir%
+cd build
 
-echo cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type%
+cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
-cmake .. -G "Visual Studio 16 2019" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
+cmake --build . --config Release --target ALL_BUILD -- -m
-cmake --build . --config %build_type% --target ALL_BUILD -- -m
 cd ..
-call scripts/run_gettext.bat
+call run_gettext.bat
-cd %build_dir%
+cd build
-cmake --build . --target install --config %build_type%
+cmake --build . --target install --config Release

build_release_macos.sh

@@ -1,10 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-set -e
+while getopts ":a:sdpt:hn" opt; do
-set -o pipefail
+  case ${opt} in
-
-while getopts ":dpa:snt:xbc:1h" opt; do
-  case "${opt}" in
     d )
         export BUILD_TARGET="deps"
         ;;
@@ -23,76 +20,25 @@ while getopts ":dpa:snt:xbc:1h" opt; do
     t )
         export OSX_DEPLOYMENT_TARGET="$OPTARG"
         ;;
-    x )
-        export SLICER_CMAKE_GENERATOR="Ninja Multi-Config"
-        export SLICER_BUILD_TARGET="all"
-        export DEPS_CMAKE_GENERATOR="Ninja"
-        ;;
-    b )
-        export BUILD_ONLY="1"
-        ;;
-    c )
-        export BUILD_CONFIG="$OPTARG"
-        ;;
-    1 )
-        export CMAKE_BUILD_PARALLEL_LEVEL=1
-        ;;
     h ) echo "Usage: ./build_release_macos.sh [-d]"
         echo "   -d: Build deps only"
-        echo "   -a: Set ARCHITECTURE (arm64 or x86_64 or universal)"
+        echo "   -a: Set ARCHITECTURE (arm64 or x86_64)"
         echo "   -s: Build slicer only"
         echo "   -n: Nightly build"
         echo "   -t: Specify minimum version of the target platform, default is 11.3"
-        echo "   -x: Use Ninja Multi-Config CMake generator, default is Xcode"
-        echo "   -b: Build without reconfiguring CMake"
-        echo "   -c: Set CMake build configuration, default is Release"
-        echo "   -1: Use single job for building"
         exit 0
         ;;
-    * )
-        ;;
   esac
 done
 
-# Set defaults
+if [ -z "$ARCH" ]
-
+then
-if [ -z "$ARCH" ]; then
+  export ARCH=$(uname -m)
-    ARCH="$(uname -m)"
-    export ARCH
 fi
 
-if [ -z "$BUILD_CONFIG" ]; then
+echo "Arch: $ARCH"
-  export BUILD_CONFIG="Release"
+echo "BUILD_TARGET: $BUILD_TARGET"
-fi
+echo "OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
-
-if [ -z "$BUILD_TARGET" ]; then
-  export BUILD_TARGET="all"
-fi
-
-if [ -z "$SLICER_CMAKE_GENERATOR" ]; then
-  export SLICER_CMAKE_GENERATOR="Xcode"
-fi
-
-if [ -z "$SLICER_BUILD_TARGET" ]; then
-  export SLICER_BUILD_TARGET="ALL_BUILD"
-fi
-
-if [ -z "$DEPS_CMAKE_GENERATOR" ]; then
-  export DEPS_CMAKE_GENERATOR="Unix Makefiles"
-fi
-
-if [ -z "$OSX_DEPLOYMENT_TARGET" ]; then
-  export OSX_DEPLOYMENT_TARGET="11.3"
-fi
-
-echo "Build params:"
-echo " - ARCH: $ARCH"
-echo " - BUILD_CONFIG: $BUILD_CONFIG"
-echo " - BUILD_TARGET: $BUILD_TARGET"
-echo " - CMAKE_GENERATOR: $SLICER_CMAKE_GENERATOR for Slicer, $DEPS_CMAKE_GENERATOR for deps"
-echo " - OSX_DEPLOYMENT_TARGET: $OSX_DEPLOYMENT_TARGET"
-echo
-
 # if which -s brew; then
 # 	brew --prefix libiconv
 # 	brew --prefix zstd
@@ -106,200 +52,57 @@ echo
 # 	exit 1
 # fi
 
-PROJECT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_BUILD_DIR="$PROJECT_DIR/build/$ARCH"
-DEPS_DIR="$PROJECT_DIR/deps"
-DEPS_BUILD_DIR="$DEPS_DIR/build/$ARCH"
-DEPS="$DEPS_BUILD_DIR/OrcaSlicer_deps"
-
-# For Multi-config generators like Ninja and Xcode
-export BUILD_DIR_CONFIG_SUBDIR="/$BUILD_CONFIG"
-
-function build_deps() {
-    # iterate over two architectures: x86_64 and arm64
-    for _ARCH in x86_64 arm64; do
-        # if ARCH is universal or equal to _ARCH
-        if [ "$ARCH" == "universal" ] || [ "$ARCH" == "$_ARCH" ]; then
-
-            PROJECT_BUILD_DIR="$PROJECT_DIR/build/$_ARCH"
-            DEPS_BUILD_DIR="$DEPS_DIR/build/$_ARCH"
-            DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep"
-
-            echo "Building deps..."
-            (
-                set -x
-                mkdir -p "$DEPS"
-                cd "$DEPS_BUILD_DIR"
-                if [ "1." != "$BUILD_ONLY". ]; then
-                    cmake "${DEPS_DIR}" \
-                        -G "${DEPS_CMAKE_GENERATOR}" \
-                        -DDESTDIR="$DEPS" \
-                        -DOPENSSL_ARCH="darwin64-${_ARCH}-cc" \
-                        -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-                        -DCMAKE_OSX_ARCHITECTURES:STRING="${_ARCH}" \
-                        -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
-                fi
-                cmake --build . --config "$BUILD_CONFIG" --target deps
-            )
-        fi
-    done
-}
-
-function pack_deps() {
-    echo "Packing deps..."
-    (
-        set -x
-        cd "$DEPS_DIR"
-        tar -zcvf "OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz" "build"
-    )
-}
-
-function build_slicer() {
-    # iterate over two architectures: x86_64 and arm64
-    for _ARCH in x86_64 arm64; do
-        # if ARCH is universal or equal to _ARCH
-        if [ "$ARCH" == "universal" ] || [ "$ARCH" == "$_ARCH" ]; then
-
-            PROJECT_BUILD_DIR="$PROJECT_DIR/build/$_ARCH"
-            DEPS_BUILD_DIR="$DEPS_DIR/build/$_ARCH"
-            DEPS="$DEPS_BUILD_DIR/OrcaSlicer_dep"
-
-            echo "Building slicer for $_ARCH..."
-            (
-                set -x
-            mkdir -p "$PROJECT_BUILD_DIR"
-            cd "$PROJECT_BUILD_DIR"
-            if [ "1." != "$BUILD_ONLY". ]; then
-                cmake "${PROJECT_DIR}" \
-                    -G "${SLICER_CMAKE_GENERATOR}" \
-                    -DBBL_RELEASE_TO_PUBLIC=1 \
-                    -DORCA_TOOLS=ON \
-                    ${ORCA_UPDATER_SIG_KEY:+-DORCA_UPDATER_SIG_KEY="$ORCA_UPDATER_SIG_KEY"} \
-                    -DCMAKE_PREFIX_PATH="$DEPS/usr/local" \
-                    -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" \
-                    -DCMAKE_BUILD_TYPE="$BUILD_CONFIG" \
-                    -DCMAKE_MACOSX_RPATH=ON \
-                    -DCMAKE_INSTALL_RPATH="${DEPS}/usr/local" \
-                    -DCMAKE_MACOSX_BUNDLE=ON \
-                    -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
-                    -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}"
-            fi
-            cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"
-        )
-
-        echo "Verify localization with gettext..."
-        (
-            cd "$PROJECT_DIR"
-            ./scripts/run_gettext.sh
-        )
-
-        echo "Fix macOS app package..."
-        (
-            cd "$PROJECT_BUILD_DIR"
-            mkdir -p OrcaSlicer
-            cd OrcaSlicer
-            # remove previously built app
-            rm -rf ./OrcaSlicer.app
-            # fully copy newly built app
-            cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer.app" ./OrcaSlicer.app
-            # fix resources
-            resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
-            rm ./OrcaSlicer.app/Contents/Resources
-            cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
-            # delete .DS_Store file
-            find ./OrcaSlicer.app/ -name '.DS_Store' -delete
-            
-            # Copy OrcaSlicer_profile_validator.app if it exists
-            if [ -f "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
-                echo "Copying OrcaSlicer_profile_validator.app..."
-                rm -rf ./OrcaSlicer_profile_validator.app
-                cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/OrcaSlicer_profile_validator.app" ./OrcaSlicer_profile_validator.app
-                # delete .DS_Store file
-                find ./OrcaSlicer_profile_validator.app/ -name '.DS_Store' -delete
-            fi
-        )
-
-        # extract version
-        # export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
-        # ver="_V${ver//\"}"
-        # echo $PWD
-        # if [ "1." != "$NIGHTLY_BUILD". ];
-        # then
-        #     ver=${ver}_dev
-        # fi
-
-        # zip -FSr OrcaSlicer${ver}_Mac_${_ARCH}.zip OrcaSlicer.app
 
+WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+cd $WD/deps
+mkdir -p build_$ARCH
+cd build_$ARCH
+DEPS=$PWD/OrcaSlicer_dep_$ARCH
+mkdir -p $DEPS
+if [ "slicer." != $BUILD_TARGET. ]; 
+then
+    echo "building deps..."
+    echo "cmake ../ -DDESTDIR=$DEPS -DOPENSSL_ARCH=darwin64-${ARCH}-cc -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}"
+    cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-${ARCH}-cc" -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES:STRING=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
+    cmake --build . --config Release --target deps 
+    if [ "1." == "$PACK_DEPS". ];
+    then
+        tar -zcvf OrcaSlicer_dep_mac_${ARCH}_$(date +"%Y%m%d").tar.gz OrcaSlicer_dep_$ARCH
     fi
-    done
-}
-
-function build_universal() {
-    echo "Building universal binary..."
-
-    PROJECT_BUILD_DIR="$PROJECT_DIR/build/$ARCH"
-    
-    # Create universal binary
-    echo "Creating universal binary..."
-    # PROJECT_BUILD_DIR="$PROJECT_DIR/build_Universal"
-    mkdir -p "$PROJECT_BUILD_DIR/OrcaSlicer"
-    UNIVERSAL_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer.app"
-    rm -rf "$UNIVERSAL_APP"
-    cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app" "$UNIVERSAL_APP"
-    
-    # Get the binary path inside the .app bundle
-    BINARY_PATH="Contents/MacOS/OrcaSlicer"
-    
-    # Create universal binary using lipo
-    lipo -create \
-        "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
-        "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer.app/$BINARY_PATH" \
-        -output "$UNIVERSAL_APP/$BINARY_PATH"
-        
-    echo "Universal binary created at $UNIVERSAL_APP"
-    
-    # Create universal binary for profile validator if it exists
-    if [ -f "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ] && \
-       [ -f "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/Contents/MacOS/OrcaSlicer_profile_validator" ]; then
-        echo "Creating universal binary for OrcaSlicer_profile_validator..."
-        UNIVERSAL_VALIDATOR_APP="$PROJECT_BUILD_DIR/OrcaSlicer/OrcaSlicer_profile_validator.app"
-        rm -rf "$UNIVERSAL_VALIDATOR_APP"
-        cp -R "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app" "$UNIVERSAL_VALIDATOR_APP"
-        
-        # Get the binary path inside the profile validator .app bundle
-        VALIDATOR_BINARY_PATH="Contents/MacOS/OrcaSlicer_profile_validator"
-        
-        # Create universal binary using lipo
-        lipo -create \
-            "$PROJECT_DIR/build/x86_64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \
-            "$PROJECT_DIR/build/arm64/OrcaSlicer/OrcaSlicer_profile_validator.app/$VALIDATOR_BINARY_PATH" \
-            -output "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH"
-            
-        echo "Universal binary for OrcaSlicer_profile_validator created at $UNIVERSAL_VALIDATOR_APP"
-    fi
-}
-
-case "${BUILD_TARGET}" in
-    all)
-        build_deps
-        build_slicer
-        ;;
-    deps)
-        build_deps
-        ;;
-    slicer)
-        build_slicer
-        ;;
-    *)
-        echo "Unknown target: $BUILD_TARGET. Available targets: deps, slicer, all."
-        exit 1
-        ;;
-esac
-
-if [ "$ARCH" = "universal" ] && [ "$BUILD_TARGET" != "deps" ]; then
-    build_universal
 fi
 
-if [ "1." == "$PACK_DEPS". ]; then
+
-    pack_deps
+if [ "deps." == "$BUILD_TARGET". ];
+then
+    exit 0
 fi
+
+cd $WD
+mkdir -p build_$ARCH
+cd build_$ARCH
+echo "building slicer..."
+cmake .. -GXcode -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON -DCMAKE_OSX_ARCHITECTURES=${ARCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET}
+cmake --build . --config Release --target ALL_BUILD 
+cd ..
+./run_gettext.sh
+cd build_$ARCH
+mkdir -p OrcaSlicer
+cd OrcaSlicer
+rm -r ./OrcaSlicer.app
+cp -pR ../src/Release/OrcaSlicer.app ./OrcaSlicer.app
+resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
+rm ./OrcaSlicer.app/Contents/Resources
+cp -R $resources_path ./OrcaSlicer.app/Contents/Resources
+# delete .DS_Store file
+find ./OrcaSlicer.app/ -name '.DS_Store' -delete
+# extract version
+# export ver=$(grep '^#define SoftFever_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
+# ver="_V${ver//\"}"
+# echo $PWD
+# if [ "1." != "$NIGHTLY_BUILD". ];
+# then
+#     ver=${ver}_dev
+# fi
+
+
+# zip -FSr OrcaSlicer${ver}_Mac_${ARCH}.zip OrcaSlicer.app

build_release_vs2022.bat

@@ -1,4 +1,4 @@
-@REM OrcaSlicer build script for Windows
+@REM OcarSlicer build script for Windows
 @echo off
 set WP=%CD%
 
@@ -13,57 +13,33 @@ if "%1"=="pack" (
     exit /b 0
 )
 
-set debug=OFF
-set debuginfo=OFF
-if "%1"=="debug" set debug=ON
-if "%2"=="debug" set debug=ON
-if "%1"=="debuginfo" set debuginfo=ON
-if "%2"=="debuginfo" set debuginfo=ON
-if "%debug%"=="ON" (
-    set build_type=Debug
-    set build_dir=build-dbg
-) else (
-    if "%debuginfo%"=="ON" (
-        set build_type=RelWithDebInfo
-        set build_dir=build-dbginfo
-    ) else (
-        set build_type=Release
-        set build_dir=build
-    )
-)
-echo build type set to %build_type%
-
 setlocal DISABLEDELAYEDEXPANSION 
 cd deps
-mkdir %build_dir%
+mkdir build
-cd %build_dir%
+cd build
 set DEPS=%CD%/OrcaSlicer_dep
-set "SIG_FLAG="
-if defined ORCA_UPDATER_SIG_KEY set "SIG_FLAG=-DORCA_UPDATER_SIG_KEY=%ORCA_UPDATER_SIG_KEY%"
 
 if "%1"=="slicer" (
     GOTO :slicer
 )
 echo "building deps.."
 
-echo on
+
-cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%DEPS%" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config %build_type% --target deps -- -m
+cmake --build . --config Release --target deps -- -m
-@echo off
 
 if "%1"=="deps" exit /b 0
 
 :slicer
 echo "building Orca Slicer..."
 cd %WP%
-mkdir %build_dir%
+mkdir build 
-cd %build_dir%
+cd build
 
-echo on
+echo cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release
-cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DORCA_TOOLS=ON %SIG_FLAG% -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=%build_type% -DWIN10SDK_PATH="%WindowsSdkDir%Include\%WindowsSDKVersion%\"
+cmake .. -G "Visual Studio 17 2022" -A x64 -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./OrcaSlicer" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0"
-cmake --build . --config %build_type% --target ALL_BUILD -- -m
+cmake --build . --config Release --target ALL_BUILD -- -m
-@echo off
 cd ..
-call scripts/run_gettext.bat
+call run_gettext.bat
-cd %build_dir%
+cd build
-cmake --build . --target install --config %build_type%
+cmake --build . --target install --config Release

cmake/modules/FindOpenVDB.cmake

@@ -123,7 +123,7 @@ if (OPENVDB_FIND_MODULE_PATH)
 endif ()
 # ###########################################################################
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.3)
 # Monitoring <PackageName>_ROOT variables
 if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)

cmake/modules/Findlibnoise.cmake

@@ -1,15 +0,0 @@
-find_path(LIBNOISE_INCLUDE_DIR libnoise/noise.h)
-find_library(LIBNOISE_LIBRARY NAMES libnoise libnoise_static liblibnoise_static)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(libnoise DEFAULT_MSG
-    LIBNOISE_LIBRARY
-    LIBNOISE_INCLUDE_DIR
-)
-
-if(libnoise_FOUND)
-    add_library(noise::noise STATIC IMPORTED)
-    set_target_properties(noise::noise PROPERTIES
-        IMPORTED_LOCATION "${LIBNOISE_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBNOISE_INCLUDE_DIR}"
-    )
-endif()

cmake/modules/MacOSXBundleInfo.plist.in

@@ -26,19 +26,6 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	<key>ATSApplicationFontsPath</key>
-  	<string>fonts/</string>
-  <key>CFBundleURLTypes</key>
-    <array>
-      <dict>
-        <key>CFBundleURLName</key>
-        <string>OrcaSlicer Downloads</string>
-        <key>CFBundleURLSchemes</key>
-        <array>
-          <string>orcaslicer</string>
-        </array>
-      </dict>
-    </array>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -48,7 +35,7 @@
 			<string>STL</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/stl.icns</string>
+			<string>stl.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -65,7 +52,7 @@
 			<string>OBJ</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>STL</string>
 			<key>CFBundleTypeRole</key>
@@ -82,7 +69,7 @@
 			<string>AMF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>AMF</string>
 			<key>CFBundleTypeRole</key>
@@ -99,7 +86,7 @@
 			<string>3MF</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/OrcaSlicer.icns</string>
+			<string>OrcaSlicer.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>3MF</string>
 			<key>CFBundleTypeRole</key>
@@ -116,7 +103,7 @@
 			<string>GCODE</string>
 			</array>
 			<key>CFBundleTypeIconFile</key>
-			<string>images/gcode.icns</string>
+			<string>gcode.icns</string>
 			<key>CFBundleTypeName</key>
 			<string>GCODE</string>
 			<key>CFBundleTypeRole</key>

deps/Boost/Boost.cmake

@@ -1,25 +1,203 @@
+include(ExternalProject)
 
-set(_context_abi_line "")
+# Use boost 1.78 for Windows, to support VS2022
-set(_context_arch_line "")
+if (WIN32)
-if (APPLE AND CMAKE_OSX_ARCHITECTURES)
+	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.gz")
-    if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
+	set(_boost_hash 94CED8B72956591C4775AE2207A9763D3600B30D9D7446562C552F0A14A63BE7)
-        set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
+    set(_bootstrap_cmd bootstrap.bat)
-    elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
+    set(_build_cmd  b2.exe)
-        set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
+else()
+	set(_boost_url "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz")
+	set(_boost_hash AEB26F80E80945E82EE93E5939BAEBDCA47B9DEE80A07D3144BE1E1A6A66DD6A)
+    set(_bootstrap_cmd ./bootstrap.sh)
+    set(_build_cmd ./b2)
+endif()
+
+set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/common.jam ./tools/build/src/tools/common.jam)
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
+    set(_boost_toolset gcc)
+    set(_patch_command ${_patch_command} && ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/boost-user-config.jam ./tools/build/src/tools/user-config.jam)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
+    if (MSVC_VERSION EQUAL 1800)
+    # 1800      = VS 12.0 (v120 toolset)
+        set(_boost_toolset "msvc-12.0")
+    elseif (MSVC_VERSION EQUAL 1900)
+    # 1900      = VS 14.0 (v140 toolset)
+        set(_boost_toolset "msvc-14.0")
+    elseif (MSVC_VERSION LESS 1920)
+    # 1910-1919 = VS 15.0 (v141 toolset)
+        set(_boost_toolset "msvc-14.1")
+    elseif (MSVC_VERSION LESS 1930)
+    # 1920-1929 = VS 16.0 (v142 toolset)
+        set(_boost_toolset "msvc-14.2")
+    elseif (MSVC_VERSION LESS 1940)
+    # 1930-1939 = VS 17.0 (v143 toolset)
+        set(_boost_toolset "msvc-14.3")
+    else ()
+        message(FATAL_ERROR "Unsupported MSVC version")
     endif ()
-    set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    if (WIN32)
+        set(_boost_toolset "clang-win")
+    else()
+        set(_boost_toolset "clang")
+    endif()
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    set(_boost_toolset "intel")
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    set(_boost_toolset "clang")
+endif()
+
+message(STATUS "Deduced boost toolset: ${_boost_toolset} based on ${CMAKE_CXX_COMPILER_ID} compiler")
+
+set(_libs "")
+foreach(_comp ${DEP_Boost_COMPONENTS})
+    list(APPEND _libs "--with-${_comp}")
+endforeach()
+
+if (BUILD_SHARED_LIBS)
+    set(_link shared)
+else()
+    set(_link static)
+endif()
+
+set(_bits "")
+if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    set(_bits 64)
+elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+    set(_bits 32)
 endif ()
 
-orcaslicer_add_cmake_project(Boost
+include(ProcessorCount)
-    URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz"
+ProcessorCount(NPROC)
-    URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95
+file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
-    LIST_SEPARATOR |
+
-    CMAKE_ARGS
+
-        -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
+set(_boost_variants "")
-        -DBOOST_LOCALE_ENABLE_ICU:BOOL=OFF # do not link to libicu, breaks compatibility between distros
+if(CMAKE_BUILD_TYPE)
-        -DBUILD_TESTING:BOOL=OFF
+    list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
-        "${_context_abi_line}"
+    list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
-        "${_context_arch_line}"
+endif()
+list(FIND CMAKE_CONFIGURATION_TYPES "Release" _cfg_rel)
+list(FIND CMAKE_CONFIGURATION_TYPES "RelWithDebInfo" _cfg_relwdeb)
+list(FIND CMAKE_CONFIGURATION_TYPES "MinSizeRel" _cfg_minsizerel)
+list(FIND CMAKE_CONFIGURATION_TYPES "Debug" _cfg_deb)
+
+if (_cfg_rel GREATER -1 OR _cfg_relwdeb GREATER -1 OR _cfg_minsizerel GREATER -1)
+    list(APPEND _boost_variants release)
+endif()
+
+if (MSVC AND ${DEP_DEBUG} )
+    list(APPEND _boost_variants debug)
+endif()
+
+if (NOT _boost_variants)
+    set(_boost_variants release)
+endif()
+
+if (IS_CROSS_COMPILE AND APPLE)
+    if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
+        message(STATUS "Compiling Boost for arm64.")
+        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
+        message(STATUS "Compiling Boost with libs ${_libs}.")
+        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
+        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
+        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
+        set(_arch_flags "-arch arm64")
+        set(_boost_linkflags "linkflags=${_arch_flags}")
+        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
+    elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
+        message(STATUS "Compiling Boost for x86_64.")
+        set(_arch_flags "-arch x86_64")
+    endif()
+    set(_boost_linkflags "linkflags=${_arch_flags}")
+endif ()
+
+set(_boost_flags "")
+if(APPLE)
+    set(_boost_flags 
+        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
+elseif (UNIX)
+    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
+endif()
+
+set(_build_cmd ${_build_cmd}
+               ${_boost_flags}
+               ${_boost_linkflags}
+               -j${NPROC}
+               ${_libs}
+               --layout=versioned
+               --debug-configuration
+               toolset=${_boost_toolset}
+               address-model=${_bits}
+               link=${_link}
+               threading=multi
+               boost.locale.icu=off
+               --disable-icu
+               ${_boost_variants}
+               stage)
+
+set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
+
+if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
+    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
+    message(STATUS "Standard boost build with patch command '${_patch_command}'")
+    message(STATUS "Standard boost build with build command '${_build_cmd}'")
+    message(STATUS "Standard boost build with install command '${_install_cmd}'")
+ExternalProject_Add(
+    dep_Boost
+	URL ${_boost_url}
+    URL_HASH SHA256=${_boost_hash}
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    CONFIGURE_COMMAND "${_bootstrap_cmd}"
+    PATCH_COMMAND ${_patch_command}
+    BUILD_COMMAND "${_build_cmd}"
+    BUILD_IN_SOURCE    ON
+    INSTALL_COMMAND "${_install_cmd}"
 )
 
-set(DEP_Boost_DEPENDS ZLIB)
+else()
+
+ExternalProject_Add(
+    dep_Boost
+	URL ${_boost_url}
+    URL_HASH SHA256=${_boost_hash}
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    CONFIGURE_COMMAND ./bootstrap.sh
+        --with-toolset=clang
+        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
+        "--prefix=${DESTDIR}/usr/local"
+#    PATCH_COMMAND ${_patch_command}
+    BUILD_COMMAND "${_build_cmd}"
+    BUILD_IN_SOURCE    ON
+    INSTALL_COMMAND "${_install_cmd}"
+)
+endif()
+
+if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    message(STATUS "Patch the boost::polygon library with a custom one.")
+    # Patch the boost::polygon library with a custom one.
+    ExternalProject_Add(dep_boost_polygon
+        EXCLUDE_FROM_ALL ON
+        # GIT_REPOSITORY "https://github.com/prusa3d/polygon"
+        # GIT_TAG prusaslicer_gmp
+        URL https://github.com/prusa3d/polygon/archive/refs/heads/prusaslicer_gmp.zip
+        URL_HASH SHA256=abeb9710f0a7069fb9b22181ae5c56f6066002f125db210e7ffb27032aed6824
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/boost_polygon
+        DEPENDS dep_Boost
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        ${_cmake_args_osx_arch}
+        INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
+            "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
+            "${DESTDIR}/usr/local/include/boost/polygon"
+    )
+    # Only override boost::Polygon Voronoi implementation with Vojtech's GMP hacks on 64bit platforms.
+    list(APPEND _dep_list "dep_boost_polygon")
+endif ()

deps/CGAL/0001-clang19.patch

@@ -1,59 +0,0 @@
---- a/BGL/include/CGAL/boost/graph/iterator.h	2022-10-07 19:04:41 UTC
-+++ b/BGL/include/CGAL/boost/graph/iterator.h
-@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public)
-   {}
- 
- #ifndef DOXYGEN_RUNNING
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_source_iterator::*bool_type)() const;
- 
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0;
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public)
-   {}
- 
- #ifndef DOXYGEN_RUNNING
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_target_iterator::*bool_type)() const;
- 
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0;
--  }
--
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);
-     return  ( g == i.g) && ( pos == i.pos) && ( winding == i.winding);
-@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public)
-   const value_type& operator *  ( ) const { return  pos; }
-   pointer           operator -> ( )       { return &pos; }
-   const value_type* operator -> ( ) const { return &pos; }
--
--  // design patter: "safe bool"
--  // will be replaced by explicit operator bool with C++11
--  typedef void (Halfedge_around_face_iterator::*bool_type)() const;
--
--  void this_type_does_not_support_comparisons() const {}
--
--  operator bool_type() const
--  {
--    return (! (this->base() == nullptr)) ?
--      &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0;
--  }
- 
-   bool operator==( const Self& i) const {
-     CGAL_assertion( anchor == anchor);

deps/CGAL/CGAL.cmake

@@ -1,7 +1,3 @@
-if (IN_GIT_REPO)
-    set(CGAL_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_CGAL-prefix/src/dep_CGAL)
-endif ()
-
 orcaslicer_add_cmake_project(
     CGAL
     # GIT_REPOSITORY https://github.com/CGAL/cgal.git
@@ -9,7 +5,6 @@ orcaslicer_add_cmake_project(
     # For whatever reason, this keeps downloading forever (repeats downloads if finished)
     URL      https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip
     URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0
-    PATCH_COMMAND git apply ${CGAL_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch
     DEPENDS dep_Boost dep_GMP dep_MPFR
 )
 

deps/CMakeLists.txt

@@ -24,16 +24,10 @@ cmake_minimum_required(VERSION 3.2)
 if (APPLE)
     # if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
     if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
+        set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version")
     endif ()
-    message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
-
 endif ()
 
-if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
-    cmake_policy(SET CMP0135 NEW)
-endif()
-
 project(OrcaSlicer-deps)
 
 include(ExternalProject)
@@ -45,21 +39,16 @@ if (NPROC EQUAL 0)
 endif ()
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
-set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/DL_CACHE CACHE PATH "Path for downloaded source packages.")
+set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
-set(FLATPAK FALSE CACHE BOOL "Toggles various build settings for flatpak, like /usr/local in DESTDIR or not building wxwidgets")
-if (NOT FLATPAK)
-    set(DESTDIR "${DESTDIR}/usr/local/")
-endif()
 
-get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
-
-if (_is_multi)
-    option(DEP_DEBUG "Build debug variants (only applicable on Windows)" OFF)
-    option(ORCA_INCLUDE_DEBUG_INFO "Includes debug information in a release build (like RelWithDebInfo) in a way that works with multi-configuration generators and incompatible dependencies. DEP_DEBUG option takes priority over this." OFF)
-endif ()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
     option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
+else() 
+    if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP
+        cmake_policy(SET CMP0135 NEW)
+    endif()
 endif()
 
 set(IS_CROSS_COMPILE FALSE)
@@ -88,7 +77,7 @@ endif ()
 # option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF)
 
 message(STATUS "OrcaSlicer deps DESTDIR: ${DESTDIR}")
-message(STATUS "OrcaSlicer download dir for source packages: ${DEP_DOWNLOAD_DIR}")
+message(STATUS "OrcaSlicer dowload dir for source packages: ${DEP_DOWNLOAD_DIR}")
 message(STATUS "OrcaSlicer deps debug build: ${DEP_DEBUG}")
 
 find_package(Git REQUIRED)
@@ -96,6 +85,8 @@ find_package(Git REQUIRED)
 # The default command line for patching. Only works for newer 
 set(PATCH_CMD ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix)
 
+get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
 if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
     message(STATUS "Forcing CMAKE_BUILD_TYPE to Release as it was not specified.")
@@ -106,11 +97,7 @@ function(orcaslicer_add_cmake_project projectname)
 
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
     if (_is_multi OR MSVC)
-        if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG)
+        set(_configs_line "")
-            set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-        else ()
-            set(_configs_line "")
-        endif ()
     endif ()
 
     set(_gen "")
@@ -124,13 +111,13 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
             -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
@@ -144,49 +131,16 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
        BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
        INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
-elseif(FLATPAK)
-    # the only reason this is here is because of the HACK at the bottom for ci
-    #
-    # note for future devs: shared libs may actually create a size reduction
-    # but orcaslicer_deps tends to get really funny regarding linking after that (notably boost)
-    # so, as much as I would like to use that, it's not happening
-    ExternalProject_Add(
-        dep_${projectname}
-        EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}
-        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
-        ${_gen}
-        CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
-            -DCMAKE_MODULE_PATH:STRING=${PROJECT_SOURCE_DIR}/../cmake/modules
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
-            -DCMAKE_DEBUG_POSTFIX:STRING=d
-            -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
-            -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
-            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
-            -DBUILD_SHARED_LIBS:BOOL=OFF
-            ${_cmake_osx_arch}
-            "${_configs_line}"
-            ${DEP_CMAKE_OPTS}
-            ${P_ARGS_CMAKE_ARGS}
-       ${P_ARGS_UNPARSED_ARGUMENTS}
-       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
-       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
-       # HACK: save space after each compile job, because CI
-       # reasoning: cmake changes directory after this command, so just keep only the folders
-       # so that it can navigate out
-       COMMAND find "${CMAKE_BINARY_DIR}/dep_${projectname}-prefix/" -type f -delete
-    )
 else()
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON
-        INSTALL_DIR         ${DESTDIR}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
         ${_gen}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
-            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}
+            -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DBUILD_SHARED_LIBS:BOOL=OFF
             ${_cmake_osx_arch}
             "${_configs_line}"
@@ -194,7 +148,7 @@ else()
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
        BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
-       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release 
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
 
 endif()
@@ -203,19 +157,20 @@ endfunction(orcaslicer_add_cmake_project)
 
 
 if (MSVC)
-    if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "AMD64")
+    if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
-        message(STATUS "\nDetected X64 compiler => building X64 deps bundle\n")
+        message(STATUS "\nDetected 64-bit compiler => building 64-bit deps bundle\n")
-        set(DEPS_ARCH "x64")
+        set(DEPS_BITS 64)
         include("deps-windows.cmake")
-    elseif ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "X86")
+    elseif ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
-        message(STATUS "\nDetected X86 compiler => building X86 deps bundle\n")
+        message(STATUS "\nDetected 32-bit compiler => building 32-bit deps bundle\n")
-        set(DEPS_ARCH "x86")
+        set(DEPS_BITS 32)
         include("deps-windows.cmake")
     else ()
         message(FATAL_ERROR "Unable to detect architecture")
     endif ()
 elseif (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
     if (CMAKE_OSX_DEPLOYMENT_TARGET)
         set(DEP_OSX_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET}")
         message("OS X Deployment Target: ${DEP_OSX_TARGET}")
@@ -240,19 +195,6 @@ else()
     include("deps-linux.cmake")
 endif()
 
-if(FLATPAK)
-    # flatpak bundles some deps with the layer, so attempt to find them first
-    # also, yes, this reduces CI by not needing to vendor certain deps
-    find_package(ZLIB)
-    find_package(PNG)
-    find_package(EXPAT)
-    find_package(CURL)
-    find_package(JPEG)
-    find_package(Freetype)
-    find_package(OpenSSL 1.1...<3.2)
-    find_package(CURL)
-endif()
-
 set(ZLIB_PKG "")
 if (NOT ZLIB_FOUND) 
     include(ZLIB/ZLIB.cmake)
@@ -264,7 +206,6 @@ if (NOT PNG_FOUND)
     set(PNG_PKG dep_PNG)
 endif ()
 set(EXPAT_PKG "")
-find_package(EXPAT)
 if (NOT EXPAT_FOUND) 
     include(EXPAT/EXPAT.cmake)
     set(EXPAT_PKG dep_EXPAT)
@@ -277,7 +218,6 @@ include(Boost/Boost.cmake)
 include(Cereal/Cereal.cmake)
 include(Qhull/Qhull.cmake)
 include(GLEW/GLEW.cmake)
-
 include(GLFW/GLFW.cmake)
 include(OpenCSG/OpenCSG.cmake)
 
@@ -292,83 +232,36 @@ include(MPFR/MPFR.cmake)
 include(CGAL/CGAL.cmake)
 
 include(NLopt/NLopt.cmake)
-include(libnoise/libnoise.cmake)
 
+include(OpenSSL/OpenSSL.cmake)
 
-# I *think* 1.1 is used for *just* md5 hashing?
-# 3.1 has everything in the right place, but the md5 funcs used are deprecated
-# a grep across the repo shows it is used for other things
-# TODO: update openssl and everything that uses <openssl/md5.h> 
-set(OPENSSL_PKG "")
-if(NOT OPENSSL_FOUND)
-    include(OpenSSL/OpenSSL.cmake)
-    set(OPENSSL_PKG dep_OpenSSL)
-endif()
-
-# we don't want to load a "wrong" openssl when loading curl
-# so, just don't even bother 
-# ...i think this is how it works? change if wrong
 set(CURL_PKG "")
-if (NOT OPENSSL_FOUND OR NOT CURL_FOUND)
+if (NOT CURL_FOUND)
     include(CURL/CURL.cmake)
     set(CURL_PKG dep_CURL)
 endif ()
 
-set(JPEG_PKG "")
+include(JPEG/JPEG.cmake)
-if (NOT JPEG_FOUND)
+include(TIFF/TIFF.cmake)
-    include(JPEG/JPEG.cmake)
+include(wxWidgets/wxWidgets.cmake)
-    set(JPEG_PKG dep_JPEG)
-endif()
-
-# flatpak builds wxwidgets separately 
-set(WXWIDGETS_PKG "")
-if (NOT FLATPAK)
-    include(wxWidgets/wxWidgets.cmake)
-    set(WXWIDGETS_PKG "dep_wxWidgets")
-endif()
-
-set(FREETYPE_PKG "")
-if(NOT FREETYPE_FOUND)
-    include(FREETYPE/FREETYPE.cmake)
-    set(FREETYPE_PKG "dep_FREETYPE") 
-endif()
-
-execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
-    RESULT_VARIABLE REV_PARSE_RESULT
-    OUTPUT_VARIABLE REV_PARSE_OUTPUT
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-# Will output "true" and have a 0 return code if within a git repo
-if((REV_PARSE_RESULT EQUAL 0) AND (REV_PARSE_OUTPUT STREQUAL "true"))
-    set(IN_GIT_REPO TRUE)
-    # Find relative path from root to source used for adjusting patch command
-    file(RELATIVE_PATH BINARY_DIR_REL  ${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR})
-endif ()
-
 include(OCCT/OCCT.cmake)
-include(OpenCV/OpenCV.cmake)
+include(FREETYPE/FREETYPE.cmake)
 
 set(_dep_list
     dep_Boost
     dep_TBB
-    ${OPENSSL_PKG}
     ${CURL_PKG}
-    ${WXWIDGETS_PKG}
+    dep_wxWidgets
     dep_Cereal
     dep_NLopt
     dep_OpenVDB
     dep_OpenCSG
-    dep_OpenCV
     dep_CGAL
+    dep_OpenSSL
     dep_GLFW
-    dep_OCCT
-    ${FREETYPE_PKG}
     ${PNG_PKG}
     ${ZLIB_PKG}
     ${EXPAT_PKG}
-    dep_libnoise
     )
 
 if (MSVC)
@@ -380,6 +273,9 @@ else()
     #list(APPEND _dep_list "dep_libigl")
 endif()
 
+list(APPEND _dep_list "dep_OCCT")
+list(APPEND _dep_list "dep_FREETYPE")
+
 add_custom_target(deps ALL DEPENDS ${_dep_list})
 
 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands

deps/CURL/CURL.cmake

@@ -72,10 +72,9 @@ orcaslicer_add_cmake_project(CURL
     ${_curl_platform_flags}
 )
 
-if(NOT OPENSSL_FOUND)
+# if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-  # (openssl may or may not be built)
+  add_dependencies(dep_CURL dep_OpenSSL)
-  add_dependencies(dep_CURL ${OPENSSL_PKG})
+# endif ()
-endif()
 
 if (MSVC)
     add_debug_dep(dep_CURL)

deps/FREETYPE/FREETYPE.cmake

@@ -11,7 +11,7 @@ else()
 endif()
 
 orcaslicer_add_cmake_project(FREETYPE
-    URL https://github.com/SoftFever/orca_deps/releases/download/freetype-2.12.1.tar.gz/freetype-2.12.1.tar.gz
+    URL https://mirror.ossplanet.net/nongnu/freetype/freetype-2.12.1.tar.gz
     URL_HASH SHA256=efe71fd4b8246f1b0b1b9bfca13cfff1c9ad85930340c27df469733bbb620938
     #DEPENDS ${ZLIB_PKG}
     #"${_patch_step}"

deps/GLEW/glew/README.md

@@ -22,6 +22,7 @@ https://github.com/nigels-com/glew
 		* [Install build tools](#install-build-tools)
 		* [Build](#build-1)
 		* [Linux EGL](#linux-egl)
+		* [Linux OSMesa](#linux-osmesa)
 		* [Linux mingw-w64](#linux-mingw-w64)
 	* [Using cmake](#using-cmake)
 		* [Install build tools](#install-build-tools-1)
@@ -94,6 +95,11 @@ _Note: you may need to call `make` in the  **auto** folder first_
 	$ sudo apt install libegl1-mesa-dev
 	$ make SYSTEM=linux-egl
 
+##### Linux OSMesa
+
+	$ sudo apt install libosmesa-dev
+	$ make SYSTEM=linux-osmesa
+
 ##### Linux mingw-w64
 
 	$ sudo apt install mingw-w64
@@ -134,6 +140,7 @@ RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel c
 | --------------- | ----------- |
 | BUILD_UTILS     | Build the `glewinfo` and `visualinfo` executables. |
 | GLEW_REGAL      | Build in Regal mode. |
+| GLEW_OSMESA     | Build in off-screen Mesa mode. |
 | BUILD_FRAMEWORK | Build as MacOSX Framework.  Setting `CMAKE_INSTALL_PREFIX` to `/Library/Frameworks` is recommended. |
 
 ### Windows

deps/GMP/0001-GMP_GCC15.patch

@@ -1,32 +0,0 @@
---- GMP/acinclude.m4	2025-05-14 18:50:11.396354745 -0400
-+++ GMP/acinclude.m4.2	2025-05-14 18:57:20.757853503 -0400
-@@ -609,7 +609,7 @@
-
- #if defined (__GNUC__) && ! defined (__cplusplus)
- typedef unsigned long long t1;typedef t1*t2;
--void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
- void h(){}
- static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
- {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
-
---- GMP/configure	2025-05-14 19:33:35.730593315 -0400
-+++ GMP/configure	2025-05-14 19:35:37.805619186 -0400
-@@ -6526,7 +6526,7 @@
-
- #if defined (__GNUC__) && ! defined (__cplusplus)
- typedef unsigned long long t1;typedef t1*t2;
--void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
- void h(){}
- static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
- {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
-@@ -8145,7 +8145,7 @@
-
- #if defined (__GNUC__) && ! defined (__cplusplus)
- typedef unsigned long long t1;typedef t1*t2;
--void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
- void h(){}
- static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
- {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}

deps/GMP/GMP.cmake

@@ -1,22 +1,19 @@
 
 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/gmp)
-
+set(_dstdir ${DESTDIR}/usr/local)
-if (IN_GIT_REPO)
-    set(GMP_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_GMP-prefix/src/dep_GMP)
-endif ()
 
 if (MSVC)
-    set(_output  ${DESTDIR}/include/gmp.h
+    set(_output  ${_dstdir}/include/gmp.h 
-                 ${DESTDIR}/lib/libgmp-10.lib
+                 ${_dstdir}/lib/libgmp-10.lib 
-                 ${DESTDIR}/bin/libgmp-10.dll)
+                 ${_dstdir}/bin/libgmp-10.dll)
 
     add_custom_command(
         OUTPUT  ${_output}
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/gmp.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/gmp.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libgmp-10.lib ${DESTDIR}/lib/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.lib ${_dstdir}/lib/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libgmp-10.dll ${DESTDIR}/bin/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libgmp-10.dll ${_dstdir}/bin/
     )
-
+    
     add_custom_target(dep_GMP SOURCES ${_output})
 
 else ()
@@ -63,10 +60,9 @@ else ()
         URL https://github.com/SoftFever/OrcaSlicer_deps/releases/download/gmp-6.2.1/gmp-6.2.1.tar.bz2
         URL_HASH SHA256=eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
-        PATCH_COMMAND git apply ${GMP_DIRECTORY_FLAG} --verbose ${CMAKE_CURRENT_LIST_DIR}/0001-GMP_GCC15.patch
+        BUILD_IN_SOURCE ON 
-        BUILD_IN_SOURCE ON
+        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
-        CONFIGURE_COMMAND  env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}" ${_gmp_build_tgt}
         BUILD_COMMAND     make -j
         INSTALL_COMMAND   make install
     )
-endif ()
+endif ()

deps/MPFR/MPFR.cmake

@@ -1,17 +1,18 @@
 set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/mpfr)
+set(_dstdir ${DESTDIR}/usr/local)
 
 if (MSVC)
-    set(_output  ${DESTDIR}/include/mpfr.h
+    set(_output  ${_dstdir}/include/mpfr.h
-                 ${DESTDIR}/include/mpf2mpfr.h
+                 ${_dstdir}/include/mpf2mpfr.h
-                 ${DESTDIR}/lib/libmpfr-4.lib 
+                 ${_dstdir}/lib/libmpfr-4.lib 
-                 ${DESTDIR}/bin/libmpfr-4.dll)
+                 ${_dstdir}/bin/libmpfr-4.dll)
 
     add_custom_command(
         OUTPUT  ${_output}
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpfr.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpfr.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpf2mpfr.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/mpf2mpfr.h ${_dstdir}/include/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libmpfr-4.lib ${DESTDIR}/lib/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.lib ${_dstdir}/lib/
-        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win-${DEPS_ARCH}/libmpfr-4.dll ${DESTDIR}/bin/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/libmpfr-4.dll ${_dstdir}/bin/
     )
 
     add_custom_target(dep_MPFR SOURCES ${_output})
@@ -25,12 +26,12 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_MPFR
-        URL https://www.mpfr.org/mpfr-4.2.2/mpfr-4.2.2.tar.bz2
+        URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2  # mirrors are allowed
-        URL_HASH SHA256=9ad62c7dc910303cd384ff8f1f4767a655124980bb6d8650fe62c815a231bb7b
+        URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
         BUILD_IN_SOURCE ON
         CONFIGURE_COMMAND autoreconf -f -i && 
-                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR} --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR} ${_gmp_build_tgt}
+                          env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         DEPENDS dep_GMP

deps/OCCT/0001-OCCT-fix.patch

@@ -195,27 +195,3 @@ index 5ae9899f..0a17372b 100644
  
    if (!myFTLib->IsValid())
    {
-From 7236e83dcc1e7284e66dc61e612154617ef715d6 Mon Sep 17 00:00:00 2001
-From: dpasukhi <dpasukhi@opencascade.com>
-Date: Tue, 27 Aug 2024 11:33:29 +0100
-Subject: [PATCH] 0033808: Coding - FreeType Use unsigned point and contour
- indexing in `FT_Outline`
-
-Changes to auto instead of specific type
----
- src/StdPrs/StdPrs_BRepFont.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
-index ab2d9b3c9f..cd701879b1 100644
---- a/src/StdPrs/StdPrs_BRepFont.cxx
-+++ b/src/StdPrs/StdPrs_BRepFont.cxx
-@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
-   for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
-   {
-     const FT_Vector* aPntList = &anOutline->points[aStartIndex];
--    const char* aTags      = &anOutline->tags[aStartIndex];
-+    const auto* aTags      = &anOutline->tags[aStartIndex];
-     const short anEndIndex = anOutline->contours[aContour];
-     const short aPntsNb    = (anEndIndex - aStartIndex) + 1;
-     aStartIndex = anEndIndex + 1;

deps/OCCT/OCCT.cmake

@@ -4,17 +4,17 @@ else()
     set(library_build_type "Static")
 endif()
 
-if (IN_GIT_REPO)
+
-    set(OCCT_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT)
+# get relative path of CMAKE_BINARY_DIR against root source directory
-endif ()
+file(RELATIVE_PATH BINARY_DIR_REL  ${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR})
 
 orcaslicer_add_cmake_project(OCCT
     URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip
     URL_HASH SHA256=28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc
     #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
-    PATCH_COMMAND git apply ${OCCT_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
+    PATCH_COMMAND git apply --directory ${BINARY_DIR_REL}/dep_OCCT-prefix/src/dep_OCCT --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
     #DEPENDS dep_Boost
-    DEPENDS ${FREETYPE_PKG}
+    #DEPENDS dep_FREETYPE
     CMAKE_ARGS
         -DBUILD_LIBRARY_TYPE=${library_build_type}
         -DUSE_TK=OFF
@@ -22,7 +22,6 @@ orcaslicer_add_cmake_project(OCCT
 	#-DUSE_FREETYPE=OFF
         -DUSE_FFMPEG=OFF
         -DUSE_VTK=OFF
-        -DBUILD_DOC_Overview=OFF
         -DBUILD_MODULE_ApplicationFramework=OFF
         #-DBUILD_MODULE_DataExchange=OFF
         -DBUILD_MODULE_Draw=OFF
@@ -32,4 +31,4 @@ orcaslicer_add_cmake_project(OCCT
         -DBUILD_MODULE_Visualization=OFF
 )
 
-# add_dependencies(dep_OCCT ${FREETYPE_PKG})
+add_dependencies(dep_OCCT dep_FREETYPE)

deps/OpenCV/0001-vs2022.patch

@@ -1,52 +0,0 @@
-From 6fb3f6333150a777e835fc7c48e49750591bf7fe Mon Sep 17 00:00:00 2001
-From: Benjamin Buch <bebuch@users.noreply.github.com>
-Date: Thu, 23 May 2024 16:05:19 +0200
-Subject: [PATCH] Support VS 2022 17.1x.y
-
-With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
----
- cmake/templates/OpenCVConfig.root-WIN32.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
-index b0f254ebe8..62e36272f3 100644
---- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
-+++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in
-@@ -137,7 +137,7 @@ elseif(MSVC)
-         set(OpenCV_RUNTIME vc14) # selecting previous compatible runtime version
-       endif()
-     endif()
--  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
-+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
-     set(OpenCV_RUNTIME vc17)
-     check_one_config(has_VS2022)
-     if(NOT has_VS2022)
--- 
-2.45.2.windows.1
-
-From f85818ba6f9031c450475a7453dee0acce31a881 Mon Sep 17 00:00:00 2001
-From: Benjamin Buch <bebuch@users.noreply.github.com>
-Date: Fri, 24 May 2024 11:10:09 +0200
-Subject: [PATCH] Support VS 2022 17.1x.y in OpenCVDetectCXXCompiler.cmake
-
-With 17.10.0 the MSVC toolset was set to 19.40.x which breaks the compatibility test in the OpenCV's CMake Config files.
----
- cmake/OpenCVDetectCXXCompiler.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake
-index 1743aca11f..448afd46ea 100644
---- a/cmake/OpenCVDetectCXXCompiler.cmake
-+++ b/cmake/OpenCVDetectCXXCompiler.cmake
-@@ -176,7 +176,7 @@ elseif(MSVC)
-     set(OpenCV_RUNTIME vc15)
-   elseif(MSVC_VERSION MATCHES "^192[0-9]$")
-     set(OpenCV_RUNTIME vc16)
--  elseif(MSVC_VERSION MATCHES "^193[0-9]$")
-+  elseif(MSVC_VERSION MATCHES "^19[34][0-9]$")
-     set(OpenCV_RUNTIME vc17)
-   else()
-     message(WARNING "OpenCV does not recognize MSVC_VERSION \"${MSVC_VERSION}\". Cannot set OpenCV_RUNTIME")
--- 
-2.45.2.windows.1
-

deps/OpenCV/0002-clang19-macos.patch

@@ -1,54 +0,0 @@
-From 893b8113f04d408cc6177c6de19c9889a48faa24 Mon Sep 17 00:00:00 2001
-From: Zixu Wang <zixu_wang@apple.com>
-Date: Thu, 18 Jan 2024 11:12:00 -0800
-Subject: [PATCH] Fix unused platform check and configuration for macOS
-
-In a similar manner as zlib (https://github.com/madler/zlib/pull/895),
-libpng contains a header configuration that's no longer valid and
-hasn't been exercised for the macOS target.
-
-- The target OS conditional macros are misused. Specifically
-  `TARGET_OS_MAC` covers all Apple targets, including iOS, and it
-  should not be checked with `#if defined` as they would always be
-  defined (to either 1 or 0) on Apple platforms.
-- `#include <fp.h>` no longer works for the macOS target and results
-  in a compilation failure. macOS ships all required functions in
-  `math.h`, and clients should use `math.h` instead.
-
-This problem has not been noticed until a recent extension in clang
-(https://github.com/llvm/llvm-project/pull/74676) exposed the issue
-and broke libpng builds on Apple platforms. The failure can be
-reproduced now by adding `#include <TargetConditionals.h>` before the
-block.
-
-Signed-off-by: Cosmin Truta <ctruta@gmail.com>
----
- AUTHORS   |  2 ++
- pngpriv.h | 14 ++------------
- 2 files changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/3rdparty/libpng/pngpriv.h b/3rdparty/libpng/pngpriv.h
-index 6c7280cf53..190eb85cbf 100644
---- a/3rdparty/libpng/pngpriv.h
-+++ b/3rdparty/libpng/pngpriv.h
-@@ -556,18 +556,8 @@
-     */
- #  include <float.h>
- 
--#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
--    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
--   /* We need to check that <math.h> hasn't already been included earlier
--    * as it seems it doesn't agree with <fp.h>, yet we should really use
--    * <fp.h> if possible.
--    */
--#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
--#      include <fp.h>
--#    endif
--#  else
--#    include <math.h>
--#  endif
-+#  include <math.h>
-+
- #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-     * MATH=68881

deps/OpenCV/OpenCV.cmake

@@ -1,77 +0,0 @@
-if (MSVC)
-    set(_use_IPP "-DWITH_IPP=ON")
-else ()
-    set(_use_IPP "-DWITH_IPP=OFF")
-endif ()
-
-if (IN_GIT_REPO)
-    set(OpenCV_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenCV-prefix/src/dep_OpenCV)
-endif ()
-
-orcaslicer_add_cmake_project(OpenCV
-    URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
-    URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-    PATCH_COMMAND git apply ${OpenCV_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs2022.patch  ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch
-    CMAKE_ARGS
-    -DBUILD_SHARED_LIBS=0
-       -DBUILD_PERE_TESTS=OFF
-       -DBUILD_TESTS=OFF
-       -DBUILD_opencv_python_tests=OFF
-       -DBUILD_EXAMPLES=OFF
-       -DBUILD_JASPER=OFF
-       -DBUILD_JAVA=OFF
-       -DBUILD_JPEG=ON
-       -DBUILD_APPS_LIST=version
-       -DBUILD_opencv_apps=OFF
-       -DBUILD_opencv_java=OFF
-       -DBUILD_OPENEXR=OFF
-       -DBUILD_PNG=ON
-       -DBUILD_TBB=OFF
-       -DBUILD_WEBP=OFF
-       -DBUILD_ZLIB=OFF
-       -DWITH_1394=OFF
-       -DWITH_CUDA=OFF
-       -DWITH_EIGEN=OFF
-       ${_use_IPP}
-       -DWITH_ITT=OFF
-       -DWITH_FFMPEG=OFF
-       -DWITH_GPHOTO2=OFF
-       -DWITH_GSTREAMER=OFF
-       -DOPENCV_GAPI_GSTREAMER=OFF
-       -DWITH_GTK_2_X=OFF
-       -DWITH_JASPER=OFF
-       -DWITH_LAPACK=OFF
-       -DWITH_MATLAB=OFF
-       -DWITH_MFX=OFF
-       -DWITH_DIRECTX=OFF
-       -DWITH_DIRECTML=OFF
-       -DWITH_OPENCL=OFF
-       -DWITH_OPENCL_D3D11_NV=OFF
-       -DWITH_OPENCLAMDBLAS=OFF
-       -DWITH_OPENCLAMDFFT=OFF
-       -DWITH_OPENEXR=OFF
-       -DWITH_OPENJPEG=OFF
-       -DWITH_QUIRC=OFF
-       -DWITH_VTK=OFF
-       -DWITH_WEBP=OFF
-       -DENABLE_PRECOMPILED_HEADERS=OFF
-       -DINSTALL_TESTS=OFF
-       -DINSTALL_C_EXAMPLES=OFF
-       -DINSTALL_PYTHON_EXAMPLES=OFF
-       -DOPENCV_GENERATE_SETUPVARS=OFF
-       -DOPENCV_INSTALL_FFMPEG_DOWNLOAD_SCRIPT=OFF
-       -DBUILD_opencv_python2=OFF
-       -DBUILD_opencv_python3=OFF
-       -DWITH_OPENVINO=OFF
-       -DWITH_INF_ENGINE=OFF
-       -DWITH_NGRAPH=OFF
-       -DBUILD_WITH_STATIC_CRT=OFF#set /MDd /MD
-       -DBUILD_LIST=core,imgcodecs,imgproc,world
-       -DBUILD_opencv_highgui=OFF
-       -DWITH_ADE=OFF
-       -DBUILD_opencv_world=ON
-       -DWITH_PROTOBUF=OFF
-       -DWITH_WIN32UI=OFF
-       -DHAVE_WIN32UI=FALSE
-)
-

deps/OpenEXR/OpenEXR.cmake

@@ -15,11 +15,11 @@ if (APPLE AND IS_CROSS_COMPILE)
         EXCLUDE_FROM_ALL    ON
         URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
         URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
-        INSTALL_DIR         ${DESTDIR}
+        INSTALL_DIR         ${DESTDIR}/usr/local
         DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/OpenEXR
         ${_openxr_list_sep}
         CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
             -DBUILD_SHARED_LIBS:BOOL=OFF
             -DCMAKE_POSITION_INDEPENDENT_CODE=ON
             -DBUILD_TESTING=OFF 
@@ -54,4 +54,4 @@ endif()
 
 if (MSVC)
     add_debug_dep(dep_OpenEXR)
-endif ()
+endif ()

deps/OpenSSL/OpenSSL.cmake

@@ -46,8 +46,8 @@ ExternalProject_Add(dep_OpenSSL
     # URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31
     DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenSSL
 	CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
-        "--openssldir=${DESTDIR}"
+        "--openssldir=${DESTDIR}/usr/local"
-        "--prefix=${DESTDIR}"
+        "--prefix=${DESTDIR}/usr/local"
         ${_cross_comp_prefix_line}
         no-shared
         no-asm
@@ -61,6 +61,6 @@ ExternalProject_Add(dep_OpenSSL
 ExternalProject_Add_Step(dep_OpenSSL install_cmake_files
     DEPENDEES install
 
-    COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
+    COMMAND ${CMAKE_COMMAND} -E copy_directory openssl "${DESTDIR}/usr/local/${CMAKE_INSTALL_LIBDIR}/cmake/openssl"
     WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
 )

deps/OpenVDB/0001-clang19.patch

@@ -1,29 +0,0 @@
---- a/openvdb/openvdb/tree/NodeManager.h	2023-11-01 20:31:11 UTC
-+++ b/openvdb/openvdb/tree/NodeManager.h
-@@ -327,7 +327,7 @@ class NodeList (private)
-         void operator()(const NodeRange& range) const
-         {
-             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
--                OpT::template eval(mNodeOp, it);
-+                OpT::eval(mNodeOp, it);
-             }
-         }
-         const NodeOp mNodeOp;
-@@ -347,7 +347,7 @@ class NodeList (private)
-         void operator()(const NodeRange& range) const
-         {
-             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
--                OpT::template eval(mNodeOp, it);
-+                OpT::eval(mNodeOp, it);
-             }
-         }
-         const NodeOp& mNodeOp;
-@@ -372,7 +372,7 @@ class NodeList (private)
-         void operator()(const NodeRange& range)
-         {
-             for (typename NodeRange::Iterator it = range.begin(); it; ++it) {
--                OpT::template eval(*mNodeOp, it);
-+                OpT::eval(*mNodeOp, it);
-             }
-         }
-         void join(const NodeReducer& other)

deps/OpenVDB/OpenVDB.cmake

@@ -6,15 +6,10 @@ else()
     set(_build_static ON)
 endif()
 
-if (IN_GIT_REPO)
-    set(OPENVDB_DIRECTORY_FLAG --directory ${BINARY_DIR_REL}/dep_OpenVDB-prefix/src/dep_OpenVDB)
-endif ()
-
 orcaslicer_add_cmake_project(OpenVDB
     #  support vs2022, update to 8.2
     URL https://github.com/tamasmeszaros/openvdb/archive/a68fd58d0e2b85f01adeb8b13d7555183ab10aa5.zip 
     URL_HASH SHA256=f353e7b99bd0cbfc27ac9082de51acf32a8bc0b3e21ff9661ecca6f205ec1d81
-    PATCH_COMMAND git apply ${OPENVDB_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch
     DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
     CMAKE_ARGS
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON 

deps/PNG/0002-clang19-macos.patch

@@ -1,29 +0,0 @@
---- a/pngpriv.h	2025-04-20 19:36:04.000000000 
-+++ b/pngpriv.h	2025-04-20 19:35:55.000000000 
-@@ -511,24 +511,14 @@
-     *  DBL_DIG  Maximum number of decimal digits (can be set to any constant)
-     *  DBL_MIN  Smallest normalized fp number (can be set to an arbitrary value)
-     *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)
-     */
- #  include <float.h>
- 
--#  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
--    defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
--   /* We need to check that <math.h> hasn't already been included earlier
--    * as it seems it doesn't agree with <fp.h>, yet we should really use
--    * <fp.h> if possible.
--    */
--#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
--#      include <fp.h>
--#    endif
--#  else
--#    include <math.h>
--#  endif
-+#  include <math.h>
-+
- #  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-    /* Amiga SAS/C: We must include builtin FPU functions when compiling using
-     * MATH=68881
-     */
- #    include <m68881.h>
- #  endif

deps/PNG/PNG.cmake

@@ -12,7 +12,7 @@ if(APPLE AND IS_CROSS_COMPILE)
         GIT_TAG v1.6.35
         DEPENDS ${ZLIB_PKG}
         PATCH_COMMAND       ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
-                            ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/macos-arm64.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch
+                            ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/macos-arm64.patch
         CMAKE_ARGS
             -DPNG_SHARED=OFF
             -DPNG_STATIC=ON
@@ -24,7 +24,7 @@ if(APPLE AND IS_CROSS_COMPILE)
 else ()
 set(_patch_step "")
     if (APPLE)
-        set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch)
+        set(_patch_step PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/PNG.patch)
     endif ()
     orcaslicer_add_cmake_project(PNG 
         # GIT_REPOSITORY https://github.com/glennrp/libpng.git 

deps/TBB/GNU.cmake

@@ -1,79 +0,0 @@
-# Copyright (c) 2020-2021 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if (MINGW)
-    set(TBB_LINK_DEF_FILE_FLAG "")
-    set(TBB_DEF_FILE_PREFIX "")
-elseif (APPLE)
-    set(TBB_LINK_DEF_FILE_FLAG -Wl,-exported_symbols_list,)
-    set(TBB_DEF_FILE_PREFIX mac${TBB_ARCH})
-
-    # For correct ucontext.h structures layout
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -D_XOPEN_SOURCE)
-else()
-    set(TBB_LINK_DEF_FILE_FLAG -Wl,--version-script=)
-    set(TBB_DEF_FILE_PREFIX lin${TBB_ARCH})
-endif()
-
-# Add -Wno-error=stringop-overflow to fix GCC 12+ build as suggested on https://github.com/oneapi-src/oneTBB/issues/843#issuecomment-1152646035
-set(TBB_WARNING_LEVEL -Wall -Wextra $<$<BOOL:${TBB_STRICT}>:-Werror> -Wfatal-errors -Wno-error=stringop-overflow)
-set(TBB_TEST_WARNING_FLAGS -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor)
-
-# Depfile options (e.g. -MD) are inserted automatically in some cases.
-# Don't add -MMD to avoid conflicts in such cases.
-if (NOT CMAKE_GENERATOR MATCHES "Ninja" AND NOT CMAKE_CXX_DEPENDS_USE_COMPILER)
-    set(TBB_MMD_FLAG -MMD)
-endif()
-
-# Enable Intel(R) Transactional Synchronization Extensions (-mrtm) and WAITPKG instructions support (-mwaitpkg) on relevant processors
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86|AMD64)")
-    set(TBB_COMMON_COMPILE_FLAGS ${TBB_COMMON_COMPILE_FLAGS} -mrtm $<$<AND:$<NOT:$<CXX_COMPILER_ID:Intel>>,$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},11.0>>>:-mwaitpkg>)
-endif()
-
-if (NOT MINGW)
-    set(TBB_COMMON_LINK_LIBS dl)
-endif()
-
-# Ignore -Werror set through add_compile_options() or added to CMAKE_CXX_FLAGS if TBB_STRICT is disabled.
-if (NOT TBB_STRICT AND COMMAND tbb_remove_compile_flag)
-    tbb_remove_compile_flag(-Werror)
-endif()
-
-if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL Intel)
-    # gcc 6.0 and later have -flifetime-dse option that controls elimination of stores done outside the object lifetime
-    set(TBB_DSE_FLAG $<$<NOT:$<VERSION_LESS:${CMAKE_CXX_COMPILER_VERSION},6.0>>:-flifetime-dse=1>)
-endif()
-
-# Workaround for heavy tests and too many symbols in debug (rellocation truncated to fit: R_MIPS_CALL16)
-if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "mips")
-    set(TBB_TEST_COMPILE_FLAGS ${TBB_TEST_COMPILE_FLAGS} -DTBB_TEST_LOW_WORKLOAD $<$<CONFIG:DEBUG>:-mxgot>)
-endif()
-
-if (MINGW)
-    list(APPEND TBB_COMMON_COMPILE_FLAGS -U__STRICT_ANSI__)
-endif()
-
-# For some reason GCC does not instrument code with Thread Sanitizer when lto is enabled and C linker is used.
-if (NOT TBB_SANITIZE MATCHES "thread")
-    set(TBB_IPO_COMPILE_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-    set(TBB_IPO_LINK_FLAGS $<$<NOT:$<CONFIG:Debug>>:-flto>)
-endif()
-
-# Disable lto flag
-set(TBB_IPO_COMPILE_FLAGS "")
-set(TBB_IPO_LINK_FLAGS "")
-
-# TBB malloc settings
-set(TBBMALLOC_LIB_COMPILE_FLAGS -fno-rtti -fno-exceptions)
-set(TBB_OPENMP_FLAG -fopenmp)

deps/TBB/TBB.cmake

@@ -1,14 +1,8 @@
-if (FLATPAK)
-    set(_patch_command ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/GNU.cmake ./cmake/compilers/GNU.cmake)
-else()
-    set(_patch_command "")
-endif()
-
 orcaslicer_add_cmake_project(
     TBB
     URL "https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.5.0.zip"
     URL_HASH SHA256=83ea786c964a384dd72534f9854b419716f412f9d43c0be88d41874763e7bb47
-    PATCH_COMMAND ${_patch_command}
+    #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-TBB-GCC13.patch
     CMAKE_ARGS          
         -DTBB_BUILD_SHARED=OFF
         -DTBB_BUILD_TESTS=OFF

deps/TIFF/TIFF.cmake

@@ -0,0 +1,32 @@
+find_package(OpenGL QUIET REQUIRED)
+
+if (APPLE)
+    message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.")
+    orcaslicer_add_cmake_project(TIFF
+        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip
+        URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726
+        DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
+        CMAKE_ARGS
+            -Dlzma:BOOL=OFF
+            -Dwebp:BOOL=OFF
+            -Djbig:BOOL=OFF
+            -Dzstd:BOOL=OFF
+            -Dpixarlog:BOOL=OFF
+    )
+else()
+    orcaslicer_add_cmake_project(TIFF
+        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
+        URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
+        DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
+        CMAKE_ARGS
+            -Dlzma:BOOL=OFF
+            -Dwebp:BOOL=OFF
+            -Djbig:BOOL=OFF
+            -Dzstd:BOOL=OFF
+            -Dpixarlog:BOOL=OFF
+    )
+
+endif()
+
+
+

deps/WebView2/include/WebView2EnvironmentOptions.h

@@ -5,27 +5,11 @@
 #ifndef __core_webview2_environment_options_h__
 #define __core_webview2_environment_options_h__
 
-// Adding the definition of this macro to enable unsafe buffer usage
-#ifndef UNSAFE_BUFFERS
-#if defined(__clang__)
-
-// clang-format off
-#define UNSAFE_BUFFERS(...)                  \
-  _Pragma("clang unsafe_buffer_usage begin") \
-  __VA_ARGS__                                \
-  _Pragma("clang unsafe_buffer_usage end")
-// clang-format on
-
-#else
-#define UNSAFE_BUFFERS(...) __VA_ARGS__
-#endif
-#endif
-
 #include <objbase.h>
 #include <wrl/implements.h>
 
-#include "WebView2.h"
+#include "webview2.h"
-#define CORE_WEBVIEW_TARGET_PRODUCT_VERSION L"138.0.3351.48"
+#define CORE_WEBVIEW_TARGET_PRODUCT_VERSION L"107.0.1418.22"
 
 #define COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(p)     \
  public:                                                      \
@@ -47,180 +31,21 @@
  protected:                                                   \
   AutoCoMemString m_##p;
 
-#define COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(p, defPVal) \
+#define COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(p)     \
- public:                                                         \
+ public:                                                    \
-  HRESULT STDMETHODCALLTYPE get_##p(BOOL* value) override {      \
+  HRESULT STDMETHODCALLTYPE get_##p(BOOL* value) override { \
-    if (!value)                                                  \
+    if (!value)                                             \
-      return E_POINTER;                                          \
+      return E_POINTER;                                     \
-    *value = m_##p;                                              \
+    *value = m_##p;                                         \
-    return S_OK;                                                 \
+    return S_OK;                                            \
-  }                                                              \
+  }                                                         \
-  HRESULT STDMETHODCALLTYPE put_##p(BOOL value) override {       \
+  HRESULT STDMETHODCALLTYPE put_##p(BOOL value) override {  \
-    m_##p = value;                                               \
+    m_##p = value;                                          \
-    return S_OK;                                                 \
+    return S_OK;                                            \
-  }                                                              \
+  }                                                         \
-                                                                 \
+                                                            \
- protected:                                                      \
+ protected:                                                 \
-  BOOL m_##p = defPVal ? TRUE : FALSE;
+  BOOL m_##p = FALSE;
-
-#define DEFINE_AUTO_COMEM_STRING()                                      \
- protected:                                                             \
-  class AutoCoMemString {                                               \
-   public:                                                              \
-    AutoCoMemString() {}                                                \
-    ~AutoCoMemString() { Release(); }                                   \
-    void Release() {                                                    \
-      if (m_string) {                                                   \
-        deallocate_fn(m_string);                                        \
-        m_string = nullptr;                                             \
-      }                                                                 \
-    }                                                                   \
-                                                                        \
-    LPCWSTR Set(LPCWSTR str) {                                          \
-      Release();                                                        \
-      if (str) {                                                        \
-        m_string = MakeCoMemString(str);                                \
-      }                                                                 \
-      return m_string;                                                  \
-    }                                                                   \
-    LPCWSTR Get() { return m_string; }                                  \
-    LPWSTR Copy() {                                                     \
-      if (m_string)                                                     \
-        return MakeCoMemString(m_string);                               \
-      return nullptr;                                                   \
-    }                                                                   \
-                                                                        \
-   protected:                                                           \
-    LPWSTR MakeCoMemString(LPCWSTR source) {                            \
-      const size_t length = wcslen(source);                             \
-      const size_t bytes = (length + 1) * sizeof(*source);              \
-                                                                        \
-      if (bytes <= length) {                                            \
-        return nullptr;                                                 \
-      }                                                                 \
-                                                                        \
-      wchar_t* result = reinterpret_cast<wchar_t*>(allocate_fn(bytes)); \
-                                                                        \
-      if (result)                                                       \
-        memcpy(result, source, bytes);                                  \
-      return result;                                                    \
-    }                                                                   \
-    LPWSTR m_string = nullptr;                                          \
-  };
-
-template <typename allocate_fn_t,
-          allocate_fn_t allocate_fn,
-          typename deallocate_fn_t,
-          deallocate_fn_t deallocate_fn>
-class CoreWebView2CustomSchemeRegistrationBase
-    : public Microsoft::WRL::RuntimeClass<
-          Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
-          ICoreWebView2CustomSchemeRegistration> {
- public:
-  CoreWebView2CustomSchemeRegistrationBase(LPCWSTR schemeName) {
-    m_schemeName.Set(schemeName);
-  }
-
-  CoreWebView2CustomSchemeRegistrationBase(
-      CoreWebView2CustomSchemeRegistrationBase&&) = default;
-  ~CoreWebView2CustomSchemeRegistrationBase() { ReleaseAllowedOrigins(); }
-
-  HRESULT STDMETHODCALLTYPE get_SchemeName(LPWSTR* schemeName) override {
-    if (!schemeName)
-      return E_POINTER;
-    *schemeName = m_schemeName.Copy();
-    if ((*schemeName == nullptr) && (m_schemeName.Get() != nullptr))
-      return HRESULT_FROM_WIN32(GetLastError());
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  GetAllowedOrigins(UINT32* allowedOriginsCount,
-                    LPWSTR** allowedOrigins) override {
-    if (!allowedOrigins || !allowedOriginsCount) {
-      return E_POINTER;
-    }
-    *allowedOriginsCount = 0;
-    if (m_allowedOriginsCount == 0) {
-      *allowedOrigins = nullptr;
-      return S_OK;
-    } else {
-      *allowedOrigins = reinterpret_cast<LPWSTR*>(
-          allocate_fn(m_allowedOriginsCount * sizeof(LPWSTR)));
-      if (!(*allowedOrigins)) {
-        return HRESULT_FROM_WIN32(GetLastError());
-      }
-      ZeroMemory(*allowedOrigins, m_allowedOriginsCount * sizeof(LPWSTR));
-      for (UINT32 i = 0; i < m_allowedOriginsCount; i++) {
-        UNSAFE_BUFFERS((*allowedOrigins)[i] = m_allowedOrigins[i].Copy();
-                       if (!(*allowedOrigins)[i]) {
-                         HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
-                         for (UINT32 j = 0; j < i; j++) {
-                           deallocate_fn((*allowedOrigins)[j]);
-                         }
-                         deallocate_fn(*allowedOrigins);
-                         return hr;
-                       })
-      }
-      *allowedOriginsCount = m_allowedOriginsCount;
-      return S_OK;
-    }
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  SetAllowedOrigins(UINT32 allowedOriginsCount,
-                    LPCWSTR* allowedOrigins) override {
-    ReleaseAllowedOrigins();
-    if (allowedOriginsCount == 0) {
-      return S_OK;
-    } else {
-      m_allowedOrigins = new AutoCoMemString[allowedOriginsCount];
-      if (!m_allowedOrigins) {
-        return HRESULT_FROM_WIN32(GetLastError());
-      }
-      for (UINT32 i = 0; i < allowedOriginsCount; i++) {
-        UNSAFE_BUFFERS(m_allowedOrigins[i].Set(allowedOrigins[i]);
-                       if (!m_allowedOrigins[i].Get()) {
-                         HRESULT hr = HRESULT_FROM_WIN32(GetLastError());
-                         for (UINT32 j = 0; j < i; j++) {
-                           m_allowedOrigins[j].Release();
-                         }
-                         m_allowedOriginsCount = 0;
-                         delete[] (m_allowedOrigins);
-                         return hr;
-                       })
-      }
-      m_allowedOriginsCount = allowedOriginsCount;
-      return S_OK;
-    }
-  }
-
- protected:
-  DEFINE_AUTO_COMEM_STRING()
-
-  void ReleaseAllowedOrigins() {
-    if (m_allowedOrigins) {
-      delete[] (m_allowedOrigins);
-      m_allowedOrigins = nullptr;
-    }
-  }
-
-  AutoCoMemString m_schemeName;
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(TreatAsSecure, false)
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(HasAuthorityComponent, false)
-
-  // WebView2EnvironmentOptions.h this is a publicly exposed header to clients
-  // and it used by them to integrate the webview2 enviorment as published at
-  // https://learn.microsoft.com/en-us/microsoft-edge/webview2/reference/win32/icorewebview2environmentoptions?view=webview2-1.0.3179.45
-  // This file is not included in msedge.dll/lib/exe and is limited to WebView2
-  // SDK which does not use partition alloc. So need to use raw_ptr_exclusion
-  // here.
-#if defined(__has_attribute)
-  __attribute__((annotate("raw_ptr_exclusion")))
-#endif
-  AutoCoMemString* m_allowedOrigins = nullptr;
-  unsigned int m_allowedOriginsCount = 0;
-};
 
 // This is a base COM class that implements ICoreWebView2EnvironmentOptions.
 template <typename allocate_fn_t,
@@ -231,183 +56,70 @@ class CoreWebView2EnvironmentOptionsBase
     : public Microsoft::WRL::Implements<
           Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom>,
           ICoreWebView2EnvironmentOptions,
-          ICoreWebView2EnvironmentOptions2,
+          ICoreWebView2EnvironmentOptions2> {
-          ICoreWebView2EnvironmentOptions3,
-          ICoreWebView2EnvironmentOptions4,
-          ICoreWebView2EnvironmentOptions5,
-          ICoreWebView2EnvironmentOptions6,
-          ICoreWebView2EnvironmentOptions7,
-          ICoreWebView2EnvironmentOptions8> {
  public:
-  static const COREWEBVIEW2_RELEASE_CHANNELS kInternalChannel =
-      static_cast<COREWEBVIEW2_RELEASE_CHANNELS>(1 << 4);
-  static const COREWEBVIEW2_RELEASE_CHANNELS kAllChannels =
-      COREWEBVIEW2_RELEASE_CHANNELS_STABLE |
-      COREWEBVIEW2_RELEASE_CHANNELS_BETA | COREWEBVIEW2_RELEASE_CHANNELS_DEV |
-      COREWEBVIEW2_RELEASE_CHANNELS_CANARY | kInternalChannel;
-
   CoreWebView2EnvironmentOptionsBase() {
-    // Initialize the target compatible browser version value to the version
+    // Initialize the target compatible browser version value to the version of
-    // of the browser binaries corresponding to this version of the SDK.
+    // the browser binaries corresponding to this version of the SDK.
     m_TargetCompatibleBrowserVersion.Set(CORE_WEBVIEW_TARGET_PRODUCT_VERSION);
   }
 
-  // ICoreWebView2EnvironmentOptions7
-  HRESULT STDMETHODCALLTYPE
-  get_ReleaseChannels(COREWEBVIEW2_RELEASE_CHANNELS* channels) override {
-    if (!channels) {
-      return E_POINTER;
-    }
-    *channels = m_releaseChannels;
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  put_ReleaseChannels(COREWEBVIEW2_RELEASE_CHANNELS channels) override {
-    m_releaseChannels = channels;
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  get_ChannelSearchKind(COREWEBVIEW2_CHANNEL_SEARCH_KIND* value) override {
-    if (!value) {
-      return E_POINTER;
-    }
-    *value = m_channelSearchKind;
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  put_ChannelSearchKind(COREWEBVIEW2_CHANNEL_SEARCH_KIND value) override {
-    m_channelSearchKind = value;
-    return S_OK;
-  }
-
-  // ICoreWebView2EnvironmentOptions8
-  HRESULT STDMETHODCALLTYPE
-  get_ScrollBarStyle(COREWEBVIEW2_SCROLLBAR_STYLE* style) override {
-    if (!style) {
-      return E_POINTER;
-    }
-    *style = m_scrollbarStyle;
-    return S_OK;
-  }
-
-  HRESULT STDMETHODCALLTYPE
-  put_ScrollBarStyle(COREWEBVIEW2_SCROLLBAR_STYLE style) override {
-    m_scrollbarStyle = style;
-    return S_OK;
-  }
-
  protected:
-  ~CoreWebView2EnvironmentOptionsBase() { ReleaseCustomSchemeRegistrations(); }
+  ~CoreWebView2EnvironmentOptionsBase() {}
 
-  void ReleaseCustomSchemeRegistrations() {
+  class AutoCoMemString {
-    if (m_customSchemeRegistrations) {
+   public:
-      for (UINT32 i = 0; i < m_customSchemeRegistrationsCount; i++) {
+    AutoCoMemString() {}
-        // SAFETY: Since we can't convert the raw buffer to safe type we do a
+    ~AutoCoMemString() { Release(); }
-        // bound check and use the macro to mitigate the error.
+    void Release() {
-        UNSAFE_BUFFERS(m_customSchemeRegistrations[i])->Release();
+      if (m_string) {
+        deallocate_fn(m_string);
+        m_string = nullptr;
       }
-      deallocate_fn(m_customSchemeRegistrations);
-      m_customSchemeRegistrations = nullptr;
-      m_customSchemeRegistrationsCount = 0;
     }
-  }
 
- private:
+    LPCWSTR Set(LPCWSTR str) {
-  // TODO(task.ms/56073082): Use raw_ptr.
+      Release();
-#if defined(__has_attribute)
+      if (str) {
-  __attribute__((annotate("raw_ptr_exclusion")))
+        m_string = MakeCoMemString(str);
-#endif
+      }
-  ICoreWebView2CustomSchemeRegistration** m_customSchemeRegistrations = nullptr;
+      return m_string;
-  unsigned int m_customSchemeRegistrationsCount = 0;
+    }
+    LPCWSTR Get() { return m_string; }
+    LPWSTR Copy() {
+      if (m_string)
+        return MakeCoMemString(m_string);
+      return nullptr;
+    }
 
-  COREWEBVIEW2_RELEASE_CHANNELS m_releaseChannels = kAllChannels;
+   protected:
-  COREWEBVIEW2_CHANNEL_SEARCH_KIND m_channelSearchKind =
+    LPWSTR MakeCoMemString(LPCWSTR source) {
-      COREWEBVIEW2_CHANNEL_SEARCH_KIND_MOST_STABLE;
+      const size_t length = wcslen(source);
+      const size_t bytes = (length + 1) * sizeof(*source);
+      // Ensure we didn't overflow during our size calculation.
+      if (bytes <= length) {
+        return nullptr;
+      }
 
-  // ICoreWebView2EnvironmentOptions8
+      wchar_t* result = reinterpret_cast<wchar_t*>(allocate_fn(bytes));
-  COREWEBVIEW2_SCROLLBAR_STYLE m_scrollbarStyle =
+      if (result)
-      COREWEBVIEW2_SCROLLBAR_STYLE_DEFAULT;
+        memcpy(result, source, bytes);
 
-  DEFINE_AUTO_COMEM_STRING()
+      return result;
+    }
+
+    LPWSTR m_string = nullptr;
+  };
 
- public:
   // ICoreWebView2EnvironmentOptions
   COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(AdditionalBrowserArguments)
   COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(Language)
   COREWEBVIEW2ENVIRONMENTOPTIONS_STRING_PROPERTY(TargetCompatibleBrowserVersion)
   COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(
-      AllowSingleSignOnUsingOSPrimaryAccount,
+      AllowSingleSignOnUsingOSPrimaryAccount)
-      false)
 
   // ICoreWebView2EnvironmentOptions2
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(ExclusiveUserDataFolderAccess,
+  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(ExclusiveUserDataFolderAccess)
-                                               false)
-
-  // ICoreWebView2EnvironmentOptions3
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(IsCustomCrashReportingEnabled,
-                                               false)
-
-  // ICoreWebView2EnvironmentOptions4
- public:
-  HRESULT STDMETHODCALLTYPE GetCustomSchemeRegistrations(
-      UINT32* count,
-      ICoreWebView2CustomSchemeRegistration*** schemeRegistrations) override {
-    if (!count || !schemeRegistrations) {
-      return E_POINTER;
-    }
-    *count = 0;
-    if (m_customSchemeRegistrationsCount == 0) {
-      *schemeRegistrations = nullptr;
-      return S_OK;
-    } else {
-      *schemeRegistrations =
-          reinterpret_cast<ICoreWebView2CustomSchemeRegistration**>(
-              allocate_fn(sizeof(ICoreWebView2CustomSchemeRegistration*) *
-                          m_customSchemeRegistrationsCount));
-      if (!*schemeRegistrations) {
-        return HRESULT_FROM_WIN32(GetLastError());
-      }
-      for (UINT32 i = 0; i < m_customSchemeRegistrationsCount; i++) {
-        // SAFETY: Since we can't convert the raw buffer to safe type we do a
-        // bound check and use the macro to mitigate the error.
-        UNSAFE_BUFFERS((*schemeRegistrations)[i] =
-                           m_customSchemeRegistrations[i];
-                       (*schemeRegistrations)[i]->AddRef();)
-      }
-      *count = m_customSchemeRegistrationsCount;
-      return S_OK;
-    }
-  }
-
-  HRESULT STDMETHODCALLTYPE SetCustomSchemeRegistrations(
-      UINT32 count,
-      ICoreWebView2CustomSchemeRegistration** schemeRegistrations) override {
-    ReleaseCustomSchemeRegistrations();
-    m_customSchemeRegistrations =
-        reinterpret_cast<ICoreWebView2CustomSchemeRegistration**>(allocate_fn(
-            sizeof(ICoreWebView2CustomSchemeRegistration*) * count));
-    if (!m_customSchemeRegistrations) {
-      return GetLastError();
-    }
-    for (UINT32 i = 0; i < count; i++) {
-      // SAFETY: Since we can't convert the raw buffer to safe type we do a
-      // bound check and use the macro to mitigate the error.
-      UNSAFE_BUFFERS(m_customSchemeRegistrations[i] = schemeRegistrations[i];
-                     m_customSchemeRegistrations[i]->AddRef());
-    }
-    m_customSchemeRegistrationsCount = count;
-    return S_OK;
-  }
-
-  // ICoreWebView2EnvironmentOptions5
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(EnableTrackingPrevention, true)
-
-  // ICoreWebView2EnvironmentOptions6
-  COREWEBVIEW2ENVIRONMENTOPTIONS_BOOL_PROPERTY(AreBrowserExtensionsEnabled,
-                                               false)
 };
 
 template <typename allocate_fn_t,
@@ -428,12 +140,6 @@ class CoreWebView2EnvironmentOptionsBaseClass
   ~CoreWebView2EnvironmentOptionsBaseClass() override {}
 };
 
-typedef CoreWebView2CustomSchemeRegistrationBase<decltype(&::CoTaskMemAlloc),
-                                                 ::CoTaskMemAlloc,
-                                                 decltype(&::CoTaskMemFree),
-                                                 ::CoTaskMemFree>
-    CoreWebView2CustomSchemeRegistration;
-
 typedef CoreWebView2EnvironmentOptionsBaseClass<decltype(&::CoTaskMemAlloc),
                                                 ::CoTaskMemAlloc,
                                                 decltype(&::CoTaskMemFree),

deps/deps-windows.cmake

@@ -15,8 +15,8 @@ elseif (MSVC_VERSION LESS 1930)
 # 1920-1929 = VS 16.0 (v142 toolset)
     set(DEP_VS_VER "16")
     set(DEP_BOOST_TOOLSET "msvc-14.2")
-elseif (MSVC_VERSION LESS 1950)
+elseif (MSVC_VERSION LESS 1940)
-# 1930-1949 = VS 17.0 (v143 toolset)
+# 1930-1939 = VS 17.0 (v143 toolset)
     set(DEP_VS_VER "17")
     set(DEP_BOOST_TOOLSET "msvc-14.3")
 else ()
@@ -27,13 +27,16 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL Clang)
     set(DEP_BOOST_TOOLSET "clang-win")
 endif ()
 
-set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}")
+if (${DEPS_BITS} EQUAL 32)
-if ("${DEPS_ARCH}" STREQUAL "x86")
+    set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}")
     set(DEP_PLATFORM "Win32")
-elseif ("${DEPS_ARCH}" STREQUAL "x64")
-    set(DEP_PLATFORM "x64")
 else ()
-    message(FATAL_ERROR "Unsupported OS architecture")
+    if (DEP_VS_VER LESS 16)
+        set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER} Win64")
+    else ()
+        set(DEP_MSVC_GEN "Visual Studio ${DEP_VS_VER}")
+    endif ()
+    set(DEP_PLATFORM "x64")
 endif ()
 
 if (${DEP_DEBUG})
@@ -54,14 +57,12 @@ if (${DEP_DEBUG})
 endif ()
 endmacro()
 
-if ("${DEPS_ARCH}" STREQUAL "x86")
+if (${DEPS_BITS} EQUAL 32)
     set(DEP_WXWIDGETS_TARGET "")
     set(DEP_WXWIDGETS_LIBDIR "vc_lib")
-elseif ("${DEPS_ARCH}" STREQUAL "x64")
+else ()
     set(DEP_WXWIDGETS_TARGET "TARGET_CPU=X64")
     set(DEP_WXWIDGETS_LIBDIR "vc_x64_lib")
-else ()
-    message(FATAL_ERROR "Unsupported OS architecture")
 endif ()
 
 find_package(Git REQUIRED)

deps/libnoise/libnoise.cmake

@@ -1,4 +0,0 @@
-orcaslicer_add_cmake_project(libnoise
-    URL https://github.com/SoftFever/Orca-deps-libnoise/archive/refs/tags/1.0.zip
-        URL_HASH SHA256=96ffd6cc47898dd8147aab53d7d1b1911b507d9dbaecd5613ca2649468afd8b6
-)

deps/wxWidgets/0001-patch-v3.2.1-for-OrcaSlicer.patch

@@ -0,0 +1,683 @@
+From f4fef135f0a58ca2916c45cd539923ab096935b6 Mon Sep 17 00:00:00 2001
+From: Ocraftyone <Ocraftyone@users.noreply.github.com>
+Date: Thu, 30 Nov 2023 03:25:54 -0500
+Subject: [PATCH] patch v3.2.1 for OrcaSlicer
+
+---
+ build/cmake/lib/webview/CMakeLists.txt |  4 +-
+ include/wx/fontutil.h                  | 15 +++++++-
+ include/wx/gdicmn.h                    |  3 ++
+ include/wx/generic/grid.h              |  4 +-
+ include/wx/msw/font.h                  |  2 +-
+ include/wx/msw/tooltip.h               |  4 +-
+ include/wx/osx/app.h                   |  2 +-
+ src/common/combocmn.cpp                | 11 +++++-
+ src/common/datavcmn.cpp                |  6 ++-
+ src/common/dcbufcmn.cpp                |  6 +++
+ src/common/gdicmn.cpp                  | 14 +++++++
+ src/common/image.cpp                   |  6 +--
+ src/generic/grid.cpp                   | 50 ++++++++++++++++++++-----
+ src/msw/bmpcbox.cpp                    |  9 ++++-
+ src/msw/font.cpp                       | 14 +++----
+ src/msw/menuitem.cpp                   |  2 +
+ src/msw/window.cpp                     | 52 +++++++++++++++++---------
+ src/osx/cocoa/dataview.mm              | 26 +++++++++++--
+ src/osx/cocoa/settings.mm              |  6 +--
+ src/osx/cocoa/window.mm                |  4 ++
+ 20 files changed, 184 insertions(+), 56 deletions(-)
+
+diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt
+index 085381d785..62146abc04 100644
+--- a/build/cmake/lib/webview/CMakeLists.txt
++++ b/build/cmake/lib/webview/CMakeLists.txt
+@@ -46,9 +46,9 @@ if(APPLE)
+ elseif(WXMSW)
+     if(wxUSE_WEBVIEW_EDGE)
+         # Update the following variables if updating WebView2 SDK
+-        set(WEBVIEW2_VERSION "1.0.705.50")
++        set(WEBVIEW2_VERSION "1.0.1418.22")
+         set(WEBVIEW2_URL "https://www.nuget.org/api/v2/package/Microsoft.Web.WebView2/${WEBVIEW2_VERSION}")
+-        set(WEBVIEW2_SHA256 "6a34bb553e18cfac7297b4031f3eac2558e439f8d16a45945c22945ac404105d")
++        set(WEBVIEW2_SHA256 "51d2ef56196e2a9d768a6843385bcb9c6baf9ed34b2603ddb074fb4995543a99")
+ 
+         set(WEBVIEW2_DEFAULT_PACKAGE_DIR "${CMAKE_BINARY_DIR}/packages/Microsoft.Web.WebView2.${WEBVIEW2_VERSION}")
+ 
+diff --git a/include/wx/fontutil.h b/include/wx/fontutil.h
+index 30529db8ce..e6a12366d5 100644
+--- a/include/wx/fontutil.h
++++ b/include/wx/fontutil.h
+@@ -294,7 +294,11 @@ public:
+     wxFontEncoding GetEncoding() const;
+ 
+     void SetPointSize(int pointsize);
+-    void SetFractionalPointSize(double pointsize);
++    void SetFractionalPointSize(double pointsize
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	);
+     void SetPixelSize(const wxSize& pixelSize);
+     void SetStyle(wxFontStyle style);
+     void SetNumericWeight(int weight);
+@@ -307,12 +311,19 @@ public:
+ 
+     // Helper used in many ports: use the normal font size if the input is
+     // negative, as we handle -1 as meaning this for compatibility.
+-    void SetSizeOrDefault(double size)
++    void SetSizeOrDefault(double size
++#if defined(__WXMSW__)
++    	, const wxWindow *window = nullptr
++#endif
++    	)
+     {
+         SetFractionalPointSize
+         (
+             size < 0 ? wxNORMAL_FONT->GetFractionalPointSize()
+                      : size
++#if defined(__WXMSW__)
++            ,window
++#endif
+         );
+     }
+ 
+diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
+index 2f5f8ee99f..39e9317d40 100644
+--- a/include/wx/gdicmn.h
++++ b/include/wx/gdicmn.h
+@@ -38,6 +38,7 @@ class WXDLLIMPEXP_FWD_CORE wxRegion;
+ class WXDLLIMPEXP_FWD_BASE wxString;
+ class WXDLLIMPEXP_FWD_CORE wxIconBundle;
+ class WXDLLIMPEXP_FWD_CORE wxPoint;
++class WXDLLIMPEXP_FWD_CORE wxWindow;
+ 
+ // ---------------------------------------------------------------------------
+ // constants
+@@ -1106,7 +1107,9 @@ extern int WXDLLIMPEXP_CORE wxDisplayDepth();
+ 
+ // get the display size
+ extern void WXDLLIMPEXP_CORE wxDisplaySize(int *width, int *height);
++extern void WXDLLIMPEXP_CORE wxDisplaySize(const wxWindow *window, int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize();
++extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySize(const wxWindow *window);
+ extern void WXDLLIMPEXP_CORE wxDisplaySizeMM(int *width, int *height);
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplaySizeMM();
+ extern wxSize WXDLLIMPEXP_CORE wxGetDisplayPPI();
+diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
+index 1bd58bbf04..903cb81319 100644
+--- a/include/wx/generic/grid.h
++++ b/include/wx/generic/grid.h
+@@ -3029,9 +3029,11 @@ private:
+     // Update the width/height of the column/row being drag-resized.
+     // Should be only called when m_dragRowOrCol != -1, i.e. dragging is
+     // actually in progress.
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     void DoGridDragResize(const wxPoint& position,
+                           const wxGridOperations& oper,
+-                          wxGridWindow* gridWindow);
++                          wxGridWindow* gridWindow,
++                          CursorMode mode);
+ 
+     // process different clicks on grid cells
+     void DoGridCellLeftDown(wxMouseEvent& event,
+diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h
+index 0f9768b44e..094d774918 100644
+--- a/include/wx/msw/font.h
++++ b/include/wx/msw/font.h
+@@ -23,7 +23,7 @@ public:
+     // ctors and such
+     wxFont() { }
+ 
+-    wxFont(const wxFontInfo& info);
++    wxFont(const wxFontInfo& info, const wxWindow *window = nullptr);
+ 
+     wxFont(int size,
+            wxFontFamily family,
+diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h
+index 4c3be08cec..96fb378d01 100644
+--- a/include/wx/msw/tooltip.h
++++ b/include/wx/msw/tooltip.h
+@@ -91,10 +91,10 @@ private:
+     // the one and only one tooltip control we use - never access it directly
+     // but use GetToolTipCtrl() which will create it when needed
+     static WXHWND ms_hwndTT;
+-
++public:
+     // create the tooltip ctrl if it doesn't exist yet and return its HWND
+     static WXHWND GetToolTipCtrl();
+-
++private:
+     // to be used in wxModule for deleting tooltip ctrl window when exiting mainloop
+     static void DeleteToolTipCtrl();
+ 
+diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
+index 317a0ca96f..58014ec1d4 100644
+--- a/include/wx/osx/app.h
++++ b/include/wx/osx/app.h
+@@ -161,7 +161,7 @@ private:
+ 
+ public:
+     bool                OSXInitWasCalled() { return m_inited; }
+-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
++    virtual void        OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
+     void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
+     void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
+ #endif
+diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
+index 80408c6677..aa07caebdc 100644
+--- a/src/common/combocmn.cpp
++++ b/src/common/combocmn.cpp
+@@ -2061,6 +2061,9 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     SetFocus();
+ 
++    //int displayIdx = wxDisplay::GetFromWindow(this);
++    //wxRect displayRect = wxDisplay(displayIdx != wxNOT_FOUND ? displayIdx : 0u).GetGeometry();
++
+     // Space above and below
+     int screenHeight;
+     wxPoint scrPos;
+@@ -2183,9 +2186,13 @@ void wxComboCtrlBase::ShowPopup()
+ 
+     int showFlags = CanDeferShow;
+ 
+-    if ( spaceBelow < szp.y )
++    int anchorSideVertical = m_anchorSide & (wxUP | wxDOWN);
++    if (// Pop up as asked for by the library user.
++        (anchorSideVertical & wxUP) ||
++        // Automatic: Pop up if it does not fit down.
++        (anchorSideVertical == 0 && spaceBelow < szp.y ))
+     {
+-        popupY = scrPos.y - szp.y;
++        popupY = scrPos.y - szp.y + displayRect.GetTop();
+         showFlags |= ShowAbove;
+     }
+ 
+diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
+index 0a1e43ad51..6c492aedab 100644
+--- a/src/common/datavcmn.cpp
++++ b/src/common/datavcmn.cpp
+@@ -1334,7 +1334,11 @@ wxDataViewItem wxDataViewCtrlBase::GetSelection() const
+ 
+     wxDataViewItemArray selections;
+     GetSelections(selections);
+-    return selections[0];
++    // BBS
++    if (!selections.empty())
++        return selections[0];
++    else
++        return wxDataViewItem(0);
+ }
+ 
+ namespace
+diff --git a/src/common/dcbufcmn.cpp b/src/common/dcbufcmn.cpp
+index 9b1c1f3159..ef5865ed4b 100644
+--- a/src/common/dcbufcmn.cpp
++++ b/src/common/dcbufcmn.cpp
+@@ -83,9 +83,15 @@ private:
+         const double scale = dc ? dc->GetContentScaleFactor() : 1.0;
+         wxBitmap* const buffer = new wxBitmap;
+ 
++#if __WXMSW__
++        // we must always return a valid bitmap but creating a bitmap of
++        // size 0 would fail, so create a 1*1 bitmap in this case
++        buffer->Create(wxMax(w, 1), wxMax(h, 1), 24);
++#else
+         // we must always return a valid bitmap but creating a bitmap of
+         // size 0 would fail, so create a 1*1 bitmap in this case
+         buffer->CreateWithDIPSize(wxMax(w, 1), wxMax(h, 1), scale);
++#endif
+ 
+         return buffer;
+     }
+diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
+index db8a01f961..162c1ce2dc 100644
+--- a/src/common/gdicmn.cpp
++++ b/src/common/gdicmn.cpp
+@@ -863,11 +863,25 @@ void wxDisplaySize(int *width, int *height)
+         *height = size.y;
+ }
+ 
++void wxDisplaySize(const wxWindow *window, int *width, int *height)
++{
++    const wxSize size = wxGetDisplaySize(window);
++    if ( width )
++        *width = size.x;
++    if ( height )
++        *height = size.y;    
++}
++
+ wxSize wxGetDisplaySize()
+ {
+     return wxDisplay().GetGeometry().GetSize();
+ }
+ 
++wxSize wxGetDisplaySize(const wxWindow *window)
++{
++    return window ? wxDisplay(window).GetGeometry().GetSize() : wxDisplay().GetGeometry().GetSize();
++}
++
+ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
+ {
+     const wxRect rect = wxGetClientDisplayRect();
+diff --git a/src/common/image.cpp b/src/common/image.cpp
+index 19fe34ec91..a449b60930 100644
+--- a/src/common/image.cpp
++++ b/src/common/image.cpp
+@@ -390,11 +390,11 @@ wxImage wxImage::ShrinkBy( int xFactor , int yFactor ) const
+                     unsigned char red = pixel[0] ;
+                     unsigned char green = pixel[1] ;
+                     unsigned char blue = pixel[2] ;
+-                    unsigned char alpha = 255  ;
+-                    if ( source_alpha )
+-                        alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                     if ( !hasMask || red != maskRed || green != maskGreen || blue != maskBlue )
+                     {
++                        unsigned char alpha = 255  ;
++                        if ( source_alpha )
++                            alpha = *(source_alpha + y_offset + x * xFactor + x1) ;
+                         if ( alpha > 0 )
+                         {
+                             avgRed += red ;
+diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
+index ed3d988994..d71cda122d 100644
+--- a/src/generic/grid.cpp
++++ b/src/generic/grid.cpp
+@@ -4068,7 +4068,8 @@ void wxGrid::ProcessRowColLabelMouseEvent( const wxGridOperations &oper, wxMouse
+         {
+             if ( m_cursorMode == oper.GetCursorModeResize() )
+             {
+-                DoGridDragResize(event.GetPosition(), oper, gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), oper, gridWindow, m_cursorMode);
+             }
+             else if ( m_cursorMode == oper.GetCursorModeSelect() && line >=0 )
+             {
+@@ -4691,12 +4692,14 @@ bool wxGrid::DoGridDragEvent(wxMouseEvent& event,
+ 
+         case WXGRID_CURSOR_RESIZE_ROW:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+             break;
+ 
+         case WXGRID_CURSOR_RESIZE_COL:
+             if ( m_dragRowOrCol != -1 )
+-                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++                //BBS: add cursor mode for DoGridDragResize's paremeters
++                DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+             break;
+ 
+         default:
+@@ -4791,6 +4794,8 @@ wxGrid::DoGridCellLeftDown(wxMouseEvent& event,
+                             case wxGridSelectCells:
+                             case wxGridSelectRowsOrColumns:
+                                 // nothing to do in these cases
++                                //BBS: select this cell when first click
++                                m_selection->SelectBlock(coords.GetRow(), coords.GetCol(), coords.GetRow(), coords.GetCol(), event);
+                                 break;
+ 
+                             case wxGridSelectRows:
+@@ -5049,9 +5054,11 @@ void wxGrid::ProcessGridCellMouseEvent(wxMouseEvent& event, wxGridWindow *eventG
+     }
+ }
+ 
++//BBS: add cursor mode for DoGridDragResize's paremeters
+ void wxGrid::DoGridDragResize(const wxPoint& position,
+                               const wxGridOperations& oper,
+-                              wxGridWindow* gridWindow)
++                              wxGridWindow* gridWindow,
++                              CursorMode mode)
+ {
+     wxCHECK_RET( m_dragRowOrCol != -1,
+                  "shouldn't be called when not drag resizing" );
+@@ -5064,10 +5071,28 @@ void wxGrid::DoGridDragResize(const wxPoint& position,
+     // orthogonal direction.
+     const int linePos = oper.Dual().Select(logicalPos);
+ 
+-    const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
+-    oper.SetLineSize(this, m_dragRowOrCol,
++    //BBS: add logic for resize multiplexed cols
++    if (mode == WXGRID_CURSOR_RESIZE_COL) {
++        int col_to_resize = m_dragRowOrCol;
++        int num_rows, num_cols;
++        this->GetCellSize(0, m_dragRowOrCol, &num_rows, &num_cols);
++        if (num_cols < 1)
++            col_to_resize = m_dragRowOrCol - 1;
++
++        const int lineEnd = oper.GetLineEndPos(this, m_dragRowOrCol);
++        const int lineSize = oper.GetLineSize(this, col_to_resize);
++        int size = linePos - lineEnd + lineSize;
++        oper.SetLineSize(this, col_to_resize,
++                     wxMax(size,
++                           oper.GetMinimalLineSize(this, col_to_resize)));
++    }
++    else {
++        const int lineStart = oper.GetLineStartPos(this, m_dragRowOrCol);
++
++        oper.SetLineSize(this, m_dragRowOrCol,
+                      wxMax(linePos - lineStart,
+                            oper.GetMinimalLineSize(this, m_dragRowOrCol)));
++    }
+ 
+     // TODO: generate RESIZING event, see #10754, if the size has changed.
+ }
+@@ -5090,7 +5115,8 @@ wxPoint wxGrid::GetPositionForResizeEvent(int width) const
+ 
+ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridRowOperations(), gridWindow, WXGRID_CURSOR_RESIZE_ROW);
+ 
+     SendGridSizeEvent(wxEVT_GRID_ROW_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5099,7 +5125,8 @@ void wxGrid::DoEndDragResizeRow(const wxMouseEvent& event, wxGridWindow* gridWin
+ 
+ void wxGrid::DoEndDragResizeCol(const wxMouseEvent& event, wxGridWindow* gridWindow)
+ {
+-    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow);
++    //BBS: add cursor mode for DoGridDragResize's paremeters
++    DoGridDragResize(event.GetPosition(), wxGridColumnOperations(), gridWindow, WXGRID_CURSOR_RESIZE_COL);
+ 
+     SendGridSizeEvent(wxEVT_GRID_COL_SIZE, m_dragRowOrCol, event);
+ 
+@@ -5113,9 +5140,10 @@ void wxGrid::DoHeaderStartDragResizeCol(int col)
+ 
+ void wxGrid::DoHeaderDragResizeCol(int width)
+ {
++    //BBS: add cursor mode for DoGridDragResize's paremeters
+     DoGridDragResize(GetPositionForResizeEvent(width),
+                      wxGridColumnOperations(),
+-                     m_gridWin);
++                     m_gridWin, WXGRID_CURSOR_RESIZE_COL);
+ }
+ 
+ void wxGrid::DoHeaderEndDragResizeCol(int width)
+@@ -6013,6 +6041,10 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
+                     DisableCellEditControl();
+ 
+                     MoveCursorDown( event.ShiftDown() );
++                    //BBS: select this cell when first click
++                    m_selection->SelectBlock(m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             m_currentCellCoords.GetRow(), m_currentCellCoords.GetCol(),
++                                             event);
+                 }
+                 break;
+ 
+diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
+index 011bd4f534..17e7f18740 100644
+--- a/src/msw/bmpcbox.cpp
++++ b/src/msw/bmpcbox.cpp
+@@ -156,13 +156,20 @@ void wxBitmapComboBox::RecreateControl()
+ 
+     wxComboBox::DoClear();
+ 
+-    HWND hwnd = GetHwnd();
++    WNDPROC wndproc_edit = nullptr;
++	WinStruct<COMBOBOXINFO> combobox_info;
++	HWND hwnd = GetHwnd();
++if (::GetComboBoxInfo(hwnd, &combobox_info))
++		wndproc_edit = (WNDPROC)wxGetWindowProc(combobox_info.hwndItem);
+     DissociateHandle();
+     ::DestroyWindow(hwnd);
+ 
+     if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
+         return;
+ 
++if (::GetComboBoxInfo(GetHwnd(), &combobox_info))
++    wxSetWindowProc(combobox_info.hwndItem, wndproc_edit);
++
+     // initialize the controls contents
+     for ( i = 0; i < numItems; i++ )
+     {
+diff --git a/src/msw/font.cpp b/src/msw/font.cpp
+index 434876939c..91d4603018 100644
+--- a/src/msw/font.cpp
++++ b/src/msw/font.cpp
+@@ -54,7 +54,7 @@ static const int PITCH_MASK = FIXED_PITCH | VARIABLE_PITCH;
+ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+ {
+ public:
+-    wxFontRefData(const wxFontInfo& info = wxFontInfo());
++    wxFontRefData(const wxFontInfo& info = wxFontInfo(), const wxWindow* window = nullptr);
+ 
+     wxFontRefData(const wxNativeFontInfo& info, WXHFONT hFont = 0)
+     {
+@@ -324,7 +324,7 @@ protected:
+ // wxFontRefData
+ // ----------------------------------------------------------------------------
+ 
+-wxFontRefData::wxFontRefData(const wxFontInfo& info)
++wxFontRefData::wxFontRefData(const wxFontInfo& info, const wxWindow *window)
+ {
+     m_hFont = NULL;
+ 
+@@ -335,7 +335,7 @@ wxFontRefData::wxFontRefData(const wxFontInfo& info)
+     }
+     else
+     {
+-        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize());
++        m_nativeFontInfo.SetSizeOrDefault(info.GetFractionalPointSize(), window);
+     }
+ 
+     SetStyle(info.GetStyle());
+@@ -518,12 +518,12 @@ wxFontEncoding wxNativeFontInfo::GetEncoding() const
+     return wxGetFontEncFromCharSet(lf.lfCharSet);
+ }
+ 
+-void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew)
++void wxNativeFontInfo::SetFractionalPointSize(double pointSizeNew, const wxWindow *window)
+ {
+     // We don't have the correct DPI to use here, so use that of the
+     // primary screen and rely on WXAdjustToPPI() changing it later if
+     // necessary.
+-    const int ppi = ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
++    const int ppi = window ? window->GetDPI().GetY() : ::GetDeviceCaps(ScreenHDC(), LOGPIXELSY);
+     lf.lfHeight = GetLogFontHeightAtPPI(pointSizeNew, ppi);
+ 
+     pointSize = pointSizeNew;
+@@ -812,9 +812,9 @@ wxFont::wxFont(const wxString& fontdesc)
+         (void)Create(info);
+ }
+ 
+-wxFont::wxFont(const wxFontInfo& info)
++wxFont::wxFont(const wxFontInfo& info, const wxWindow *window)
+ {
+-    m_refData = new wxFontRefData(info);
++    m_refData = new wxFontRefData(info, window);
+ }
+ 
+ bool wxFont::Create(const wxNativeFontInfo& info, WXHFONT hFont)
+diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
+index 0bd017a36a..3b98bf1678 100644
+--- a/src/msw/menuitem.cpp
++++ b/src/msw/menuitem.cpp
+@@ -368,6 +368,8 @@ void MenuDrawData::Init(wxWindow const* window)
+         // native menu uses small top margin for separator
+         if ( SeparatorMargin.cyTopHeight >= 2 )
+             SeparatorMargin.cyTopHeight -= 2;
++
++        SeparatorSize.cy = 0;
+     }
+     else
+ #endif // wxUSE_UXTHEME
+diff --git a/src/msw/window.cpp b/src/msw/window.cpp
+index c529a4fa3b..7e547c64df 100644
+--- a/src/msw/window.cpp
++++ b/src/msw/window.cpp
+@@ -4809,33 +4809,49 @@ static wxSize GetWindowDPI(HWND hwnd)
+ }
+ 
+ /*extern*/
+-int wxGetSystemMetrics(int nIndex, const wxWindow* window)
++int wxGetSystemMetrics(int nIndex, const wxWindow* win)
+ {
+ #if wxUSE_DYNLIB_CLASS
+-    if ( !window )
+-        window = wxApp::GetMainTopWindow();
++    const wxWindow* window = (!win && wxTheApp) ? wxTheApp->GetTopWindow() : win;
+ 
+-    if ( window )
++    if (window)
+     {
+-        typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
+-        static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
+-        static bool s_initDone = false;
+-
+-        if ( !s_initDone )
+-        {
+-            wxLoadedDLL dllUser32("user32.dll");
+-            wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
+-            s_initDone = true;
++#if 1
++        if (window->GetHWND() && (nIndex == SM_CXSCREEN || nIndex == SM_CYSCREEN)) {
++            HDC hdc = GetDC(window->GetHWND());
++#if 0
++            double dim = GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES);
++            ReleaseDC(window->GetHWND(), hdc);
++            wxSize dpi = window->GetDPI();
++            dim *= 96.0 / (nIndex == SM_CXSCREEN ? dpi.x : dpi.y);
++            return int(dim + 0.5);
++#else
++            return int(GetDeviceCaps(hdc, nIndex == SM_CXSCREEN ? HORZRES : VERTRES));
++#endif
+         }
+-
+-        if ( s_pfnGetSystemMetricsForDpi )
++        else
++#endif
+         {
+-            const int dpi = window->GetDPI().y;
+-            return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            typedef int (WINAPI * GetSystemMetricsForDpi_t)(int nIndex, UINT dpi);
++            static GetSystemMetricsForDpi_t s_pfnGetSystemMetricsForDpi = NULL;
++            static bool s_initDone = false;
++
++            if ( !s_initDone )
++            {
++                wxLoadedDLL dllUser32("user32.dll");
++                wxDL_INIT_FUNC(s_pfn, GetSystemMetricsForDpi, dllUser32);
++                s_initDone = true;
++            }
++
++            if ( s_pfnGetSystemMetricsForDpi )
++            {
++                const int dpi = window->GetDPI().y;
++                return s_pfnGetSystemMetricsForDpi(nIndex, (UINT)dpi);
++            }
+         }
+     }
+ #else
+-    wxUnusedVar(window);
++    wxUnusedVar(win);
+ #endif // wxUSE_DYNLIB_CLASS
+ 
+     return ::GetSystemMetrics(nIndex);
+diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
+index f188e61089..7b867002d1 100644
+--- a/src/osx/cocoa/dataview.mm
++++ b/src/osx/cocoa/dataview.mm
+@@ -1604,6 +1604,15 @@ outlineView:(NSOutlineView*)outlineView
+     }
+ }
+ 
++//FIXME Vojtech: This is a workaround to get at least the "mouse move" events at the wxDataViewControl,
++// so we can show the tooltips. The "mouse move" events are being send only if the wxDataViewControl
++// has focus, which is a limitation of wxWidgets. We may grab focus on "mouse entry" though.
++- (void)mouseMoved:(NSEvent *)event
++{
++if (! implementation->DoHandleMouseEvent(event))
++        [super mouseMoved:event];
++}
++
+ //
+ // contextual menus
+ //
+@@ -2006,7 +2015,8 @@ void wxCocoaDataViewControl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd
+         if ( !dvc->GetEventHandler()->ProcessEvent(eventDV) )
+             wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);
+     }
+-    else
++    //FIXME Vojtech's hack to get the accelerators assigned to the wxDataViewControl working.
++    else if (! DoHandleKeyEvent(event))
+     {
+         wxWidgetCocoaImpl::keyEvent(event, slf, _cmd);  // all other keys
+     }
+@@ -2540,12 +2550,22 @@ void wxCocoaDataViewControl::DoSetIndent(int indent)
+ 
+ void wxCocoaDataViewControl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const
+ {
+-    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),point);
++    NSTableHeaderView *headerView = [m_OutlineView headerView];
++    if (headerView && point.y < headerView.visibleRect.size.height) {
++    // The point is inside the header area.
++            columnPtr = NULL;
++            item      = wxDataViewItem();
++    return;
++        }
++    // Convert from the window coordinates to the virtual scrolled view coordinates.
++    NSScrollView *scrollView = [m_OutlineView enclosingScrollView];
++    const NSRect &visibleRect = scrollView.contentView.visibleRect;
++    NSPoint const nativePoint = wxToNSPoint((NSScrollView*) GetWXWidget(),
++    wxPoint(point.x + visibleRect.origin.x, point.y + visibleRect.origin.y));
+ 
+     int indexColumn;
+     int indexRow;
+ 
+-
+     indexColumn = [m_OutlineView columnAtPoint:nativePoint];
+     indexRow    = [m_OutlineView rowAtPoint:   nativePoint];
+     if ((indexColumn >= 0) && (indexRow >= 0))
+diff --git a/src/osx/cocoa/settings.mm b/src/osx/cocoa/settings.mm
+index c819deeb0c..dc3c3b0b53 100644
+--- a/src/osx/cocoa/settings.mm
++++ b/src/osx/cocoa/settings.mm
+@@ -222,7 +222,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
+ // ----------------------------------------------------------------------------
+ 
+ // Get a system metric, e.g. scrollbar size
+-int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUNUSED(win))
++int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* win)
+ {
+     int value;
+ 
+@@ -257,11 +257,11 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, const wxWindow* WXUN
+         // TODO case wxSYS_WINDOWMIN_Y:
+ 
+         case wxSYS_SCREEN_X:
+-            wxDisplaySize(&value, NULL);
++            wxDisplaySize(win, &value, NULL);
+             return value;
+ 
+         case wxSYS_SCREEN_Y:
+-            wxDisplaySize(NULL, &value);
++            wxDisplaySize(win, NULL, &value);
+             return value;
+ 
+         // TODO case wxSYS_FRAMESIZE_X:
+diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
+index 635ea286d4..42ae67e27a 100644
+--- a/src/osx/cocoa/window.mm
++++ b/src/osx/cocoa/window.mm
+@@ -191,6 +191,9 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
+ - (BOOL)isEnabled;
+ - (void)setEnabled:(BOOL)flag;
+ 
++- (BOOL)clipsToBounds;
++- (void)setClipsToBounds:(BOOL)clipsToBounds;
++
+ - (void)setImage:(NSImage *)image;
+ - (void)setControlSize:(NSControlSize)size;
+ 
+@@ -2559,6 +2562,7 @@ wxWidgetImpl( peer, flags )
+     if ( m_osxView )
+         CFRetain(m_osxView);
+     [m_osxView release];
++    m_osxView.clipsToBounds = YES;
+ }
+ 
+ 
+-- 
+2.42.0.windows.2
+