juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 18:56:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Install proto before flatpack when there is internet. Add missing include that caused fail only on Unix

Browse Source
This commit is contained in:
ExPikaPaka
2026-06-04 17:41:40 +02:00
parent 7c34e089e4
commit 0458925f85
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_all.yml vendored
View File

@@ -211,6 +211,12 @@ jobs:
sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n build-options:\n env:\n git_commit_hash: \"$git_commit_hash\"|}" \ sed -i "/name: OrcaSlicer/{n;s|buildsystem: simple|buildsystem: simple\n build-options:\n env:\n git_commit_hash: \"$git_commit_hash\"|}" \
scripts/flatpak/com.orcaslicer.OrcaSlicer.yml scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
shell: bash shell: bash
- name: Generate config sources
run: |
python3 -m venv /tmp/codegen_venv
/tmp/codegen_venv/bin/pip install grpcio-tools pyyaml -q
/tmp/codegen_venv/bin/python tools/run_codegen.py
shell: bash
- uses: flatpak/flatpak-github-actions/flatpak-builder@master - uses: flatpak/flatpak-github-actions/flatpak-builder@master
with: with:
bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak bundle: OrcaSlicer-Linux-flatpak_${{ env.ver }}_${{ matrix.variant.arch }}.flatpak

2
scripts/flatpak/com.orcaslicer.OrcaSlicer.yml
View File

@@ -326,8 +326,6 @@ modules:
- name: OrcaSlicer - name: OrcaSlicer
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- pip3 install grpcio-tools -q
- python3 tools/run_codegen.py
- | - |
cmake . -B build_flatpak \ cmake . -B build_flatpak \
-DFLATPAK=ON \ -DFLATPAK=ON \

1
src/slic3r/GUI/TabLayoutExtra.cpp
View File

@@ -18,6 +18,7 @@
#include "WipeTowerDialog.hpp" // RammingDialog #include "WipeTowerDialog.hpp" // RammingDialog
#include "MsgDialog.hpp" // InfoDialog #include "MsgDialog.hpp" // InfoDialog
#include "libslic3r/GCode/Thumbnails.hpp" #include "libslic3r/GCode/Thumbnails.hpp"
#include "format.hpp"
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {