Attachment #222504 for bug #253569

View | Details | Raw Unified | Return to bug 253569
Collapse All | Expand All

Lines 3-9 Link Here

(-)PrusaSlicer/Makefile (-2 / +2 lines)
3	PORTNAME= PrusaSlicer	3	PORTNAME= PrusaSlicer
4	DISTVERSIONPREFIX=version_	4	DISTVERSIONPREFIX=version_
5	DISTVERSION= 2.3.0	5	DISTVERSION= 2.3.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= cad	7	CATEGORIES= cad
8		8
9	MAINTAINER= teodorsigaev@gmail.com	9	MAINTAINER= teodorsigaev@gmail.com
Lines 23-29 Link Here
23	libmpfr.so:math/mpfr \	23	libmpfr.so:math/mpfr \
24	libdbus-1.so:devel/dbus \	24	libdbus-1.so:devel/dbus \
25	libpng.so:graphics/png	25	libpng.so:graphics/png
26	BUILD_DEPENDS= cereal>=1.2.2:devel/cereal \	26	BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \
27	cgal>=5.0.2:math/cgal	27	cgal>=5.0.2:math/cgal
28		28
29	USES= cmake desktop-file-utils eigen:3 gettext gl iconv pkgconfig	29	USES= cmake desktop-file-utils eigen:3 gettext gl iconv pkgconfig

Line 0 Link Here

(-)PrusaSlicer/files/patch-src_CMakeLists.txt (+11 lines)
	1	--- src/CMakeLists.txt.orig 2021-02-16 20:42:55 UTC
	2	+++ src/CMakeLists.txt
	3	@@ -111,7 +111,7 @@ if (NOT WIN32 AND NOT APPLE)
	4	set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
	5	endif ()
	6
	7	-target_link_libraries(PrusaSlicer libslic3r cereal)
	8	+target_link_libraries(PrusaSlicer libslic3r)
	9	if (APPLE)
	10	# add_compile_options(-stdlib=libc++)
	11	# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)

Line 0 Link Here

(-)PrusaSlicer/files/patch-src_libslic3r_CMakeLists.txt (+10 lines)
	1	--- src/libslic3r/CMakeLists.txt.orig 2021-02-16 20:42:21 UTC
	2	+++ src/libslic3r/CMakeLists.txt
	3	@@ -297,7 +297,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_IN
	4	target_link_libraries(libslic3r
	5	libnest2d
	6	admesh
	7	- cereal
	8	libigl
	9	miniz
	10	boost_libs

Lines 1-8 Link Here

(-)PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt (-3 / +6 lines)
1	--- src/slic3r/CMakeLists.txt.orig 2021-01-12 12:07:42 UTC	1	--- src/slic3r/CMakeLists.txt.orig 2021-01-11 13:01:51 UTC
2	+++ src/slic3r/CMakeLists.txt	2	+++ src/slic3r/CMakeLists.txt
3	@@ -234,7 +234,7 @@ encoding_check(libslic3r_gui)	3	@@ -232,9 +232,9 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}
4		4
5	target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES})	5	encoding_check(libslic3r_gui)
		6
		7	-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES})
		8	+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES})
6		9
7	-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")	10	-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
8	+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")	11	+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

Return to bug 253569