pool/PrusaSlicer
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
pool:devel
..
compare: pool:devel
Branches Tags
pool:factory
pool:devel

No commits in common. "factory" and "devel" have entirely different histories.
factory ... devel

4 changed files with 88 additions and 0 deletions
Show Stats Expand all files Collapse all files

54
PrusaSlicer-2.8.0-slic3r-includes.patch Normal file
View File

@ -0,0 +1,54 @@
From ac3e07ee03b439932b9f7b00849ca202602f8901 Mon Sep 17 00:00:00 2001
From: randomtechguy <50642148+Rose-David@users.noreply.github.com>
Date: Fri, 12 Jul 2024 17:24:16 -0400
Subject: [PATCH 1/3] Update CMakeLists.txt to fix linux compile error
---
src/slic3r/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
===================================================================
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/CMakeLists.txt
+++ PrusaSlicer-version_2.8.0/src/slic3r/CMakeLists.txt
@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
)
find_package(NanoSVG REQUIRED)
+find_package(OpenSSL REQUIRED)
if (APPLE)
list(APPEND SLIC3R_GUI_SOURCES
@@ -404,7 +405,7 @@ endforeach()
encoding_check(libslic3r_gui)
-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast)
+target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
if (MSVC)
target_link_libraries(libslic3r_gui Setupapi.lib)
Index: PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
===================================================================
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/Config/Version.cpp
+++ PrusaSlicer-version_2.8.0/src/slic3r/Config/Version.cpp
@@ -7,6 +7,7 @@
#include <cctype>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
#include <boost/nowide/fstream.hpp>
#include "libslic3r/libslic3r.h"
Index: PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
===================================================================
--- PrusaSlicer-version_2.8.0.orig/src/slic3r/GUI/UserAccountCommunication.cpp
+++ PrusaSlicer-version_2.8.0/src/slic3r/GUI/UserAccountCommunication.cpp
@@ -13,6 +13,7 @@
#include <boost/filesystem.hpp>
#include <boost/nowide/cstdio.hpp>
#include <boost/nowide/fstream.hpp>
+#include <boost/nowide/convert.hpp>
#include <curl/curl.h>
#include <string>

3
PrusaSlicer-version_2.7.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6370a9593aeac5c56543e66d167ab5fd053df55b9376392c2d6184eb0bf65fc8
size 65396083

3
PrusaSlicer-version_2.8.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:58d484f85b34d83026f8220bab983f855fbcd72767d0887f21f5cc382e5b19ab
size 69806919

28
up-occt-version.patch Normal file
View File

@ -0,0 +1,28 @@
Index: PrusaSlicer-version_2.8.1/src/occt_wrapper/CMakeLists.txt
===================================================================
--- PrusaSlicer-version_2.8.1.orig/src/occt_wrapper/CMakeLists.txt 2024-09-18 15:39:04.000000000 +0200
+++ PrusaSlicer-version_2.8.1/src/occt_wrapper/CMakeLists.txt 2024-12-08 10:38:01.245676008 +0100
@@ -19,14 +19,10 @@ include(GenerateExportHeader)
generate_export_header(OCCTWrapper)
-find_package(OpenCASCADE 7.6.1 REQUIRED)
+find_package(OpenCASCADE REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ TKDESTEP
TKXCAF
TKXSBase
TKVCAF
@@ -59,5 +55,5 @@ target_link_libraries(OCCTWrapper libsli
include(GNUInstallDirs)
-install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_BINDIR}")
+install(TARGETS OCCTWrapper DESTINATION "${CMAKE_INSTALL_LIBDIR}")