diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index a21bb03c9..b36d1990d 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -60,20 +60,21 @@ jobs: arch: ${{ matrix.arch }} build-deps-only: ${{ inputs.build-deps-only || false }} secrets: inherit - # flatpak: - # name: "Flatpak" - # runs-on: ubuntu-latest - # container: - # image: bilelmoussaoui/flatpak-github-actions:gnome-45 - # options: --privileged - # steps: - # # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd - # - name: "Remove unneeded stuff to free disk space" - # run: - # sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" - # - uses: actions/checkout@v4 - # - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 - # with: - # bundle: orcaslicer.flatpak - # manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml - # cache-key: flatpak-builder-${{ github.sha }} + flatpak: + name: "Flatpak" + runs-on: ubuntu-latest + container: + image: bilelmoussaoui/flatpak-github-actions:gnome-45 + options: --privileged + steps: + # maybe i'm too dumb and fucked up to do CI. OH WELL :D -ppd + - name: "Remove unneeded stuff to free disk space" + run: + sudo rm -rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" + - uses: actions/checkout@v4 + - uses: flatpak/flatpak-github-actions/flatpak-builder@v6 + with: + bundle: orcaslicer.flatpak + manifest-path: flatpak/io.github.softfever.OrcaSlicer.yml + cache-key: flatpak-builder-${{ github.sha }} + cache: false \ No newline at end of file diff --git a/deps/OCCT/OCCT.cmake b/deps/OCCT/OCCT.cmake index 651e40ec8..096da413d 100644 --- a/deps/OCCT/OCCT.cmake +++ b/deps/OCCT/OCCT.cmake @@ -22,6 +22,7 @@ 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 diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml index f5a148cda..c5ba50f02 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/flatpak/io.github.softfever.OrcaSlicer.yml @@ -44,6 +44,22 @@ modules: - type: archive url: http://mirrors.ircam.fr/pub/x.org/individual/app/xprop-1.2.5.tar.gz sha256: b7bf6b6be6cf23e7966a153fc84d5901c14f01ee952fbd9d930aa48e2385d670 + - name: python-flit_core + buildsystem: simple + build-commands: + - pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/c4/e6/c1ac50fe3eebb38a155155711e6e864e254ce4b6e17fe2429b4c4d5b9e80/flit_core-3.9.0.tar.gz + sha256: 72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba + - name: python-packaging + buildsystem: simple + build-commands: + - pip3 install --no-deps --no-build-isolation --verbose --prefix=${FLATPAK_DEST} . + sources: + - type: archive + url: https://files.pythonhosted.org/packages/51/65/50db4dda066951078f0a96cf12f4b9ada6e4b811516bf0262c0f4f7064d4/packaging-24.1.tar.gz + sha256: 026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 - name: python-setuptools_scm buildsystem: simple build-commands: diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index f49a6a405..9897bdfe6 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -580,6 +580,10 @@ target_link_libraries(libslic3r opencv_world ) +if(NOT SLIC3R_STATIC) + target_compile_definitions(libslic3r PUBLIC BOOST_ALL_DYN_LINK) +endif() + if(NOT WIN32) target_link_libraries(libslic3r freetype) if (NOT APPLE) diff --git a/src/libslic3r/GCode/Thumbnails.cpp b/src/libslic3r/GCode/Thumbnails.cpp index 43f2d4b2a..526ba8249 100644 --- a/src/libslic3r/GCode/Thumbnails.cpp +++ b/src/libslic3r/GCode/Thumbnails.cpp @@ -2,6 +2,7 @@ #include "../miniz_extension.hpp" #include "format.hpp" +#include #include #include #include @@ -594,7 +595,7 @@ std::string get_error_string(const ThumbnailErrors& errors) std::string error_str; if (errors.has(ThumbnailError::InvalidVal)) - error_str += "\n - " + format("Invalid input format. Expected vector of dimensions in the following format: \"%1%\"", "XxY/EXT, XxY/EXT, ..."); + error_str += "\n - " + Slic3r::format("Invalid input format. Expected vector of dimensions in the following format: \"%1%\"", "XxY/EXT, XxY/EXT, ..."); if (errors.has(ThumbnailError::OutOfRange)) error_str += "\n - Input value is out of range"; if (errors.has(ThumbnailError::InvalidExt)) diff --git a/src/libslic3r/GCode/Thumbnails.hpp b/src/libslic3r/GCode/Thumbnails.hpp index 38a939b74..bcee02fea 100644 --- a/src/libslic3r/GCode/Thumbnails.hpp +++ b/src/libslic3r/GCode/Thumbnails.hpp @@ -3,6 +3,7 @@ #include "../Point.hpp" #include "../PrintConfig.hpp" +#include "../enum_bitmask.hpp" #include "ThumbnailData.hpp" #include "../enum_bitmask.hpp" diff --git a/src/libslic3r/MeshBoolean.cpp b/src/libslic3r/MeshBoolean.cpp index e246c16d4..c412553a2 100644 --- a/src/libslic3r/MeshBoolean.cpp +++ b/src/libslic3r/MeshBoolean.cpp @@ -6,6 +6,7 @@ #undef PI #include +#include "boost/log/trivial.hpp" // Include igl first. It defines "L" macro which then clashes with our localization #include #undef L @@ -27,7 +28,6 @@ #include // BBS: for boolean using mcut #include "mcut/include/mcut/mcut.h" -#include "boost/log/trivial.hpp" namespace Slic3r { namespace MeshBoolean { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 809368d38..ddcb4bcbf 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -12,7 +12,6 @@ #include #include #include - #include namespace { @@ -6071,7 +6070,7 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config) auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(thumbnails_str, extention); if (errors != enum_bitmask()) { - std::string error_str = "\n" + format("Invalid value provided for parameter %1%: %2%", "thumbnails", thumbnails_str); + std::string error_str = "\n" + Slic3r::format("Invalid value provided for parameter %1%: %2%", "thumbnails", thumbnails_str); error_str += GCodeThumbnails::get_error_string(errors); throw BadOptionValueException(error_str); } @@ -6080,7 +6079,7 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config) const auto& extentions = ConfigOptionEnum::get_enum_names(); thumbnails_str.clear(); for (const auto& [ext, size] : thumbnails_list) - thumbnails_str += format("%1%x%2%/%3%, ", size.x(), size.y(), extentions[int(ext)]); + thumbnails_str += Slic3r::format("%1%x%2%/%3%, ", size.x(), size.y(), extentions[int(ext)]); thumbnails_str.resize(thumbnails_str.length() - 2); config.set_key_value("thumbnails", new ConfigOptionString(thumbnails_str));