git: d62e2fd749c4 - main - cad/PrusaSlicer: unbreak build with boost-1.85
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Oct 2024 10:27:20 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d62e2fd749c41c26c5b88b822cab14545ee17639 commit d62e2fd749c41c26c5b88b822cab14545ee17639 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2024-10-02 23:18:26 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-10-03 10:24:50 +0000 cad/PrusaSlicer: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- cad/PrusaSlicer/Makefile | 2 +- cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt | 7 ++++--- cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp | 10 ++++++++++ cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp | 10 ++++++++++ 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile index 782f9e0ecb52..1a91b82b1bc4 100644 --- a/cad/PrusaSlicer/Makefile +++ b/cad/PrusaSlicer/Makefile @@ -1,7 +1,7 @@ PORTNAME= PrusaSlicer DISTVERSIONPREFIX=version_ DISTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad DIST_SUBDIR= PrusaSlicer diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt index 5f0492369639..4d1d84d171cd 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt +++ b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt @@ -1,20 +1,21 @@ --- src/slic3r/CMakeLists.txt.orig 2024-06-27 09:25:47 UTC +++ src/slic3r/CMakeLists.txt -@@ -375,7 +375,7 @@ set(SLIC3R_GUI_SOURCES +@@ -375,7 +375,8 @@ set(SLIC3R_GUI_SOURCES Utils/PrusaConnect.cpp ) -find_package(NanoSVG REQUIRED) +# find_package(NanoSVG REQUIRED) ++find_package(OpenSSL REQUIRED) if (APPLE) list(APPEND SLIC3R_GUI_SOURCES -@@ -404,11 +404,11 @@ encoding_check(libslic3r_gui) +@@ -404,11 +405,11 @@ encoding_check(libslic3r_gui) 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 imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl crypto ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude imgui libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto) if (MSVC) target_link_libraries(libslic3r_gui Setupapi.lib) diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp new file mode 100644 index 000000000000..9f340e31fbf0 --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Snapshot.cpp @@ -0,0 +1,10 @@ +--- src/slic3r/Config/Snapshot.cpp.orig 2024-04-05 09:25:31 UTC ++++ src/slic3r/Config/Snapshot.cpp +@@ -12,6 +12,7 @@ + #include <boost/property_tree/ini_parser.hpp> + #include <boost/property_tree/ptree_fwd.hpp> + #include <boost/filesystem/operations.hpp> ++#include <boost/filesystem/directory.hpp> + #include <boost/log/trivial.hpp> + + #include "libslic3r/PresetBundle.hpp" diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp new file mode 100644 index 000000000000..2481d172a47e --- /dev/null +++ b/cad/PrusaSlicer/files/patch-src_slic3r_Config_Version.cpp @@ -0,0 +1,10 @@ +--- src/slic3r/Config/Version.cpp.orig 2024-04-05 09:25:31 UTC ++++ 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"