Attachment #221534 for bug #252611

Lines 2-9 Link Here

(-)PrusaSlicer/Makefile (-17 / +9 lines)
2		2
3	PORTNAME= PrusaSlicer	3	PORTNAME= PrusaSlicer
4	DISTVERSIONPREFIX= version_	4	DISTVERSIONPREFIX= version_
5	DISTVERSION= 2.2.0	5	DISTVERSION= 2.3.0
6	PORTREVISION= 9	6	PORTREVISION= 1
7	CATEGORIES= cad	7	CATEGORIES= cad
8		8
9	MAINTAINER= teodorsigaev@gmail.com	9	MAINTAINER= teodorsigaev@gmail.com
Lines 20-26 Link Here
20	libexpat.so:textproc/expat2 \	20	libexpat.so:textproc/expat2 \
21	libopenvdb.so:misc/openvdb \	21	libopenvdb.so:misc/openvdb \
22	libgmp.so:math/gmp \	22	libgmp.so:math/gmp \
23	libmpfr.so:math/mpfr	23	libmpfr.so:math/mpfr \
		24	libdbus-1.so:devel/dbus
24	BUILD_DEPENDS= cereal>=1.2.2:devel/cereal \	25	BUILD_DEPENDS= cereal>=1.2.2:devel/cereal \
25	googletest>=1.7:devel/googletest \	26	googletest>=1.7:devel/googletest \
26	boost-libs>=1.64:devel/boost-libs \	27	boost-libs>=1.64:devel/boost-libs \
Lines 30-61 Link Here
30	openvdb>=6.1.0:misc/openvdb \	31	openvdb>=6.1.0:misc/openvdb \
31	gmp>=6.1.2:math/gmp \	32	gmp>=6.1.2:math/gmp \
32	mpfr>=4.0.2:math/mpfr \	33	mpfr>=4.0.2:math/mpfr \
33	qt5-buildtools>=0:devel/qt5-buildtools	34	qt5-buildtools>=0:devel/qt5-buildtools \
		35	cgal>=5.0.2:math/cgal \
		36	dbus>=1.12:devel/dbus
34		37
35	USES= cmake eigen:3 gettext gl iconv pkgconfig	38	USES= cmake eigen:3 gettext gl iconv pkgconfig
36		39
37	CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config \	40	CMAKE_ARGS+= -DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wxgtk3u-3.1-config \
38	-DCGAL_DIR=${WRKSRC}/CGAL/lib/cmake/CGAL	41	-DSLIC3R_GTK=3
39	CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME}	42	CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME}
40		43
41	USE_GITHUB= yes	44	USE_GITHUB= yes
42	GH_ACCOUNT= prusa3d	45	GH_ACCOUNT= prusa3d
43	GH_TUPLE= CGAL:cgal:releases/CGAL-5.0.2:cgal
44	USE_WX= 3.1	46	USE_WX= 3.1
45	USE_GL= gl glu glew	47	USE_GL= gl glu glew
46		48
47	post-patch:	49	post-patch:
48	${REINPLACE_CMD} -e 's,%%WRKSRC%%,${WRKSRC},' \	50	${REINPLACE_CMD} -e 's,%%WRKSRC%%,${WRKSRC},' \
49	${WRKSRC}/CMakeLists.txt	51	${WRKSRC}/CMakeLists.txt
50
51	pre-configure:
52	cd ${WRKSRC_cgal} && \
53	${CMAKE_BIN} -E remove CGALConfig-installation-dirs.cmake && \
54	${MKDIR} build && cd build && \
55	${CMAKE_BIN} -DCMAKE_INSTALL_PREFIX=${WRKSRC}/CGAL \
56	-DCMAKE_PREFIX_PATH=${WRKSRC}/CGAL \
57	-DCMAKE_MODULE_PATH=${WRKSRC}/cmake/modules \
58	-DCMAKE_BUILD_TYPE=Release .. && \
59	${BSDMAKE} all install
60		52
61	.include <bsd.port.mk>	53	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)PrusaSlicer/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1585766317	1	TIMESTAMP = 1610441839
2	SHA256 (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0	2	SHA256 (prusa3d-PrusaSlicer-version_2.3.0_GH0.tar.gz) = cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
3	SIZE (prusa3d-PrusaSlicer-version_2.2.0_GH0.tar.gz) = 30811929	3	SIZE (prusa3d-PrusaSlicer-version_2.3.0_GH0.tar.gz) = 34785471
4	SHA256 (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 7d824efce318fe901fd9d6f233a1f27e2d956d787602621df035a759b587c40c
5	SIZE (CGAL-cgal-releases-CGAL-5.0.2_GH0.tar.gz) = 146441795




--- CMakeLists.txt.orig	2021-01-11 13:01:51 UTC
+++ CMakeLists.txt
@@ -3,6 +3,7 @@ project(PrusaSlicer)
 
 include("version.inc")
 include(GNUInstallDirs)
+include_directories(BEFORE SYSTEM "%%WRKSRC%%/CGAL/include")
+add_compile_options(-DNDEBUG)
 
 set(SLIC3R_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
 file(TO_NATIVE_PATH "${SLIC3R_RESOURCES_DIR}" SLIC3R_RESOURCES_DIR_WIN)
@@ -154,7 +155,7 @@ if (APPLE)
     endif ()
 endif ()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     find_package(PkgConfig REQUIRED)
 
     if (CMAKE_VERSION VERSION_LESS "3.1")

Line 0 Link Here

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




--- src/slic3r/GUI/InstanceCheck.cpp.orig	2021-01-11 13:01:51 UTC
+++ src/slic3r/GUI/InstanceCheck.cpp
@@ -23,7 +23,7 @@
 #include <strsafe.h>
 #endif //WIN32
 
-#if __linux__
+#if defined(__linux__) || defined (__FreeBSD__)
 #include <dbus/dbus.h> /* Pull in all of D-Bus headers. */
 #endif //__linux__
 
@@ -169,7 +169,7 @@ namespace instance_check_internal
 		return false;
 	}
 
-#elif defined(__linux__)
+#elif defined(__linux__) || defined (__FreeBSD__)
 
 	static bool  send_message(const std::string &message_text, const std::string &version)
 	{

Lines 1-6 Link Here

(-)PrusaSlicer/pkg-plist (-10 / +136 lines)
		1	PrusaSlicer/resources/applications/PrusaSlicer.desktop
		2	PrusaSlicer/resources/applications/PrusaGcodeviewer.desktop
		3	PrusaSlicer/resources/data/flatpak/com.prusa3d.PrusaSlicer.desktop
		4	PrusaSlicer/resources/data/flatpak/com.prusa3d.PrusaSlicer.metainfo.xml
1	PrusaSlicer/resources/fonts/NotoSans-Regular.ttf	5	PrusaSlicer/resources/fonts/NotoSans-Regular.ttf
2	PrusaSlicer/resources/fonts/NotoSansCJK-Regular.ttc	6	PrusaSlicer/resources/fonts/NotoSansCJK-Regular.ttc
3	PrusaSlicer/resources/fonts/README.txt	7	PrusaSlicer/resources/fonts/README.txt
		8	PrusaSlicer/resources/icons/Pmetal_001.png
		9	PrusaSlicer/resources/icons/PrusaSlicer-gcodeviewer.ico
		10	PrusaSlicer/resources/icons/PrusaSlicer-gcodeviewer_128px.png
		11	PrusaSlicer/resources/icons/PrusaSlicer-gcodeviewer_192px.png
		12	PrusaSlicer/resources/icons/PrusaSlicer-gcodeviewer_32px.png
4	PrusaSlicer/resources/icons/PrusaSlicer.icns	13	PrusaSlicer/resources/icons/PrusaSlicer.icns
5	PrusaSlicer/resources/icons/PrusaSlicer.ico	14	PrusaSlicer/resources/icons/PrusaSlicer.ico
6	PrusaSlicer/resources/icons/PrusaSlicer.png	15	PrusaSlicer/resources/icons/PrusaSlicer.png
Lines 16-28 Link Here
16	PrusaSlicer/resources/icons/add_part.svg	25	PrusaSlicer/resources/icons/add_part.svg
17	PrusaSlicer/resources/icons/advanced_plus.svg	26	PrusaSlicer/resources/icons/advanced_plus.svg
18	PrusaSlicer/resources/icons/arrange.svg	27	PrusaSlicer/resources/icons/arrange.svg
		28	PrusaSlicer/resources/icons/attention.svg
19	PrusaSlicer/resources/icons/browse.svg	29	PrusaSlicer/resources/icons/browse.svg
20	PrusaSlicer/resources/icons/bullet_black.png	30	PrusaSlicer/resources/icons/bullet_black.png
21	PrusaSlicer/resources/icons/cog.svg
22	PrusaSlicer/resources/icons/bullet_blue.png	31	PrusaSlicer/resources/icons/bullet_blue.png
23	PrusaSlicer/resources/icons/bullet_white.png	32	PrusaSlicer/resources/icons/bullet_white.png
		33	PrusaSlicer/resources/icons/cancel.svg
24	PrusaSlicer/resources/icons/change_extruder.svg	34	PrusaSlicer/resources/icons/change_extruder.svg
		35	PrusaSlicer/resources/icons/cog.svg
		36	PrusaSlicer/resources/icons/cog_.svg
25	PrusaSlicer/resources/icons/cog_go.png	37	PrusaSlicer/resources/icons/cog_go.png
		38	PrusaSlicer/resources/icons/collapse.svg
26	PrusaSlicer/resources/icons/colorchange_add.svg	39	PrusaSlicer/resources/icons/colorchange_add.svg
27	PrusaSlicer/resources/icons/colorchange_add_f.svg	40	PrusaSlicer/resources/icons/colorchange_add_f.svg
28	PrusaSlicer/resources/icons/colorchange_add_m.svg	41	PrusaSlicer/resources/icons/colorchange_add_m.svg
Lines 37-47 Link Here
37	PrusaSlicer/resources/icons/copy_menu.svg	50	PrusaSlicer/resources/icons/copy_menu.svg
38	PrusaSlicer/resources/icons/cross.svg	51	PrusaSlicer/resources/icons/cross.svg
39	PrusaSlicer/resources/icons/cross_focus.svg	52	PrusaSlicer/resources/icons/cross_focus.svg
		53	PrusaSlicer/resources/icons/cross_focus_large.svg
40	PrusaSlicer/resources/icons/cut.svg	54	PrusaSlicer/resources/icons/cut.svg
41	PrusaSlicer/resources/icons/delete.svg	55	PrusaSlicer/resources/icons/delete.svg
42	PrusaSlicer/resources/icons/delete_all.svg	56	PrusaSlicer/resources/icons/delete_all.svg
43	PrusaSlicer/resources/icons/delete_all_menu.svg	57	PrusaSlicer/resources/icons/delete_all_menu.svg
44	PrusaSlicer/resources/icons/dot.svg	58	PrusaSlicer/resources/icons/dot.svg
		59	PrusaSlicer/resources/icons/dot_small.svg
45	PrusaSlicer/resources/icons/dot_white.svg	60	PrusaSlicer/resources/icons/dot_white.svg
46	PrusaSlicer/resources/icons/down_half_circle.png	61	PrusaSlicer/resources/icons/down_half_circle.png
47	PrusaSlicer/resources/icons/drop_to_bed.svg	62	PrusaSlicer/resources/icons/drop_to_bed.svg
Lines 53-71 Link Here
53	PrusaSlicer/resources/icons/editor.svg	68	PrusaSlicer/resources/icons/editor.svg
54	PrusaSlicer/resources/icons/editor_menu.svg	69	PrusaSlicer/resources/icons/editor_menu.svg
55	PrusaSlicer/resources/icons/eject_sd.svg	70	PrusaSlicer/resources/icons/eject_sd.svg
		71	PrusaSlicer/resources/icons/empty.svg
56	PrusaSlicer/resources/icons/error_tick.svg	72	PrusaSlicer/resources/icons/error_tick.svg
57	PrusaSlicer/resources/icons/error_tick_f.svg	73	PrusaSlicer/resources/icons/error_tick_f.svg
58	PrusaSlicer/resources/icons/exclamation.svg	74	PrusaSlicer/resources/icons/exclamation.svg
		75	PrusaSlicer/resources/icons/exit.svg
59	PrusaSlicer/resources/icons/export_config.svg	76	PrusaSlicer/resources/icons/export_config.svg
60	PrusaSlicer/resources/icons/export_config_bundle.svg	77	PrusaSlicer/resources/icons/export_config_bundle.svg
61	PrusaSlicer/resources/icons/export_gcode.svg	78	PrusaSlicer/resources/icons/export_gcode.svg
62	PrusaSlicer/resources/icons/export_plater.svg	79	PrusaSlicer/resources/icons/export_plater.svg
63	PrusaSlicer/resources/icons/export_to_sd.svg	80	PrusaSlicer/resources/icons/export_to_sd.svg
64	PrusaSlicer/resources/icons/eye_closed.svg	81	PrusaSlicer/resources/icons/eye_closed.svg
		82	PrusaSlicer/resources/icons/funnel.svg
65	PrusaSlicer/resources/icons/eye_open.svg	83	PrusaSlicer/resources/icons/eye_open.svg
		84	PrusaSlicer/resources/icons/fdm_supports.svg
66	PrusaSlicer/resources/icons/flag_green.svg	85	PrusaSlicer/resources/icons/flag_green.svg
67	PrusaSlicer/resources/icons/flag_red.svg	86	PrusaSlicer/resources/icons/flag_red.svg
68	PrusaSlicer/resources/icons/funnel.svg
69	PrusaSlicer/resources/icons/gcode.icns	87	PrusaSlicer/resources/icons/gcode.icns
70	PrusaSlicer/resources/icons/hollow.svg	88	PrusaSlicer/resources/icons/hollow.svg
71	PrusaSlicer/resources/icons/hollowing.svg	89	PrusaSlicer/resources/icons/hollowing.svg
Lines 75-87 Link Here
75	PrusaSlicer/resources/icons/infill.svg	93	PrusaSlicer/resources/icons/infill.svg
76	PrusaSlicer/resources/icons/instance_add.svg	94	PrusaSlicer/resources/icons/instance_add.svg
77	PrusaSlicer/resources/icons/instance_remove.svg	95	PrusaSlicer/resources/icons/instance_remove.svg
		96	PrusaSlicer/resources/icons/ironing.svg
78	PrusaSlicer/resources/icons/layers.svg	97	PrusaSlicer/resources/icons/layers.svg
79	PrusaSlicer/resources/icons/layers_white.svg	98	PrusaSlicer/resources/icons/layers_white.svg
80	PrusaSlicer/resources/icons/left_half_circle.png	99	PrusaSlicer/resources/icons/left_half_circle.png
81	PrusaSlicer/resources/icons/lock_closed.svg	100	PrusaSlicer/resources/icons/lock_closed.svg
82	PrusaSlicer/resources/icons/lock_closed_f.svg	101	PrusaSlicer/resources/icons/lock_closed_f.svg
83	PrusaSlicer/resources/icons/lock_closed_white.svg
84	PrusaSlicer/resources/icons/lock_open.svg	102	PrusaSlicer/resources/icons/lock_open.svg
		103	PrusaSlicer/resources/icons/lock_closed_white.svg
85	PrusaSlicer/resources/icons/lock_open_f.svg	104	PrusaSlicer/resources/icons/lock_open_f.svg
86	PrusaSlicer/resources/icons/lock_open_sys.svg	105	PrusaSlicer/resources/icons/lock_open_sys.svg
87	PrusaSlicer/resources/icons/mark_X.svg	106	PrusaSlicer/resources/icons/mark_X.svg
Lines 101-106 Link Here
101	PrusaSlicer/resources/icons/mode_simple_sq.png	120	PrusaSlicer/resources/icons/mode_simple_sq.png
102	PrusaSlicer/resources/icons/move.svg	121	PrusaSlicer/resources/icons/move.svg
103	PrusaSlicer/resources/icons/note.svg	122	PrusaSlicer/resources/icons/note.svg
		123	PrusaSlicer/resources/icons/notification_close.svg
		124	PrusaSlicer/resources/icons/notification_close_hover.svg
		125	PrusaSlicer/resources/icons/notification_eject_sd.svg
		126	PrusaSlicer/resources/icons/notification_eject_sd_hover.svg
		127	PrusaSlicer/resources/icons/notification_error.svg
		128	PrusaSlicer/resources/icons/notification_minimalize.svg
		129	PrusaSlicer/resources/icons/notification_minimalize_hover.svg
		130	PrusaSlicer/resources/icons/notification_warning.svg
104	PrusaSlicer/resources/icons/number_of_copies.svg	131	PrusaSlicer/resources/icons/number_of_copies.svg
105	PrusaSlicer/resources/icons/one_layer_lock_off.png	132	PrusaSlicer/resources/icons/one_layer_lock_off.png
106	PrusaSlicer/resources/icons/one_layer_lock_on.png	133	PrusaSlicer/resources/icons/one_layer_lock_on.png
Lines 121-126 Link Here
121	PrusaSlicer/resources/icons/printer.svg	148	PrusaSlicer/resources/icons/printer.svg
122	PrusaSlicer/resources/icons/printer_placeholder.png	149	PrusaSlicer/resources/icons/printer_placeholder.png
123	PrusaSlicer/resources/icons/printer_white.svg	150	PrusaSlicer/resources/icons/printer_white.svg
		151	PrusaSlicer/resources/icons/prusa_slicer_logo.svg
124	PrusaSlicer/resources/icons/question.svg	152	PrusaSlicer/resources/icons/question.svg
125	PrusaSlicer/resources/icons/re_slice.svg	153	PrusaSlicer/resources/icons/re_slice.svg
126	PrusaSlicer/resources/icons/redo.svg	154	PrusaSlicer/resources/icons/redo.svg
Lines 136-146 Link Here
136	PrusaSlicer/resources/icons/row.png	164	PrusaSlicer/resources/icons/row.png
137	PrusaSlicer/resources/icons/save.svg	165	PrusaSlicer/resources/icons/save.svg
138	PrusaSlicer/resources/icons/scale.svg	166	PrusaSlicer/resources/icons/scale.svg
		167	PrusaSlicer/resources/icons/seam.svg
		168	PrusaSlicer/resources/icons/search.svg
		169	PrusaSlicer/resources/icons/search_.svg
		170	PrusaSlicer/resources/icons/search_blink.svg
		171	PrusaSlicer/resources/icons/search_gray.svg
139	PrusaSlicer/resources/icons/set_separate_obj.svg	172	PrusaSlicer/resources/icons/set_separate_obj.svg
		173	PrusaSlicer/resources/icons/settings.svg
140	PrusaSlicer/resources/icons/shape_ungroup.png	174	PrusaSlicer/resources/icons/shape_ungroup.png
141	PrusaSlicer/resources/icons/skirt+brim.svg	175	PrusaSlicer/resources/icons/skirt+brim.svg
142	PrusaSlicer/resources/icons/sla_printer.svg	176	PrusaSlicer/resources/icons/sla_printer.svg
143	PrusaSlicer/resources/icons/sla_supports.svg	177	PrusaSlicer/resources/icons/sla_supports.svg
		178	PrusaSlicer/resources/icons/splashscreen.jpg
		179	PrusaSlicer/resources/icons/splashscreen-gcodepreview.jpg
144	PrusaSlicer/resources/icons/split_object_SMALL.svg	180	PrusaSlicer/resources/icons/split_object_SMALL.svg
145	PrusaSlicer/resources/icons/split_objects.svg	181	PrusaSlicer/resources/icons/split_objects.svg
146	PrusaSlicer/resources/icons/split_parts.svg	182	PrusaSlicer/resources/icons/split_parts.svg
Lines 150-163 Link Here
150	PrusaSlicer/resources/icons/support.svg	186	PrusaSlicer/resources/icons/support.svg
151	PrusaSlicer/resources/icons/support_blocker.svg	187	PrusaSlicer/resources/icons/support_blocker.svg
152	PrusaSlicer/resources/icons/support_enforcer.svg	188	PrusaSlicer/resources/icons/support_enforcer.svg
		189	PrusaSlicer/resources/icons/switch_presets.svg
153	PrusaSlicer/resources/icons/table.png	190	PrusaSlicer/resources/icons/table.png
154	PrusaSlicer/resources/icons/test.svg	191	PrusaSlicer/resources/icons/test.svg
155	PrusaSlicer/resources/icons/thumb_down.svg	192	PrusaSlicer/resources/icons/thumb_down.svg
		193	PrusaSlicer/resources/icons/thumb_left.svg
		194	PrusaSlicer/resources/icons/thumb_right.svg
156	PrusaSlicer/resources/icons/thumb_up.svg	195	PrusaSlicer/resources/icons/thumb_up.svg
		196	PrusaSlicer/resources/icons/tick_mark.svg
157	PrusaSlicer/resources/icons/time.svg	197	PrusaSlicer/resources/icons/time.svg
		198	PrusaSlicer/resources/icons/timer_dot.svg
		199	PrusaSlicer/resources/icons/timer_dot_empty.svg
158	PrusaSlicer/resources/icons/toolbar_background.png	200	PrusaSlicer/resources/icons/toolbar_background.png
159	PrusaSlicer/resources/icons/undo.svg	201	PrusaSlicer/resources/icons/undo.svg
160	PrusaSlicer/resources/icons/undo_menu.svg	202	PrusaSlicer/resources/icons/undo_menu.svg
		203	PrusaSlicer/resources/icons/undo_toolbar.svg
		204	PrusaSlicer/resources/icons/up_half_circle.png
		205	PrusaSlicer/resources/icons/upload_queue.svg
		206	PrusaSlicer/resources/icons/variable_layer_height_reset.png
		207	PrusaSlicer/resources/icons/variable_layer_height_tooltip.png
161	PrusaSlicer/resources/icons/white/add_copies.svg	208	PrusaSlicer/resources/icons/white/add_copies.svg
162	PrusaSlicer/resources/icons/white/add_modifier.svg	209	PrusaSlicer/resources/icons/white/add_modifier.svg
163	PrusaSlicer/resources/icons/white/add_part.svg	210	PrusaSlicer/resources/icons/white/add_part.svg
Lines 168-184 Link Here
168	PrusaSlicer/resources/icons/white/copy_menu.svg	215	PrusaSlicer/resources/icons/white/copy_menu.svg
169	PrusaSlicer/resources/icons/white/delete.svg	216	PrusaSlicer/resources/icons/white/delete.svg
170	PrusaSlicer/resources/icons/white/delete_all_menu.svg	217	PrusaSlicer/resources/icons/white/delete_all_menu.svg
		218	PrusaSlicer/resources/icons/white/dot.svg
		219	PrusaSlicer/resources/icons/white/dot_small.svg
		220	PrusaSlicer/resources/icons/white/drop_to_bed.svg
171	PrusaSlicer/resources/icons/white/edit_layers_all.svg	221	PrusaSlicer/resources/icons/white/edit_layers_all.svg
172	PrusaSlicer/resources/icons/white/edit_layers_some.svg	222	PrusaSlicer/resources/icons/white/edit_layers_some.svg
		223	PrusaSlicer/resources/icons/white/edit_uni.svg
173	PrusaSlicer/resources/icons/white/editor_menu.svg	224	PrusaSlicer/resources/icons/white/editor_menu.svg
		225	PrusaSlicer/resources/icons/white/exit.svg
174	PrusaSlicer/resources/icons/white/export_config.svg	226	PrusaSlicer/resources/icons/white/export_config.svg
175	PrusaSlicer/resources/icons/white/export_config_bundle.svg
176	PrusaSlicer/resources/icons/white/export_gcode.svg	227	PrusaSlicer/resources/icons/white/export_gcode.svg
		228	PrusaSlicer/resources/icons/white/export_config_bundle.svg
177	PrusaSlicer/resources/icons/white/export_plate.svg	229	PrusaSlicer/resources/icons/white/export_plate.svg
178	PrusaSlicer/resources/icons/white/export_plater.svg	230	PrusaSlicer/resources/icons/white/export_plater.svg
179	PrusaSlicer/resources/icons/white/pad.svg
180	PrusaSlicer/resources/icons/white/export_to_sd.svg	231	PrusaSlicer/resources/icons/white/export_to_sd.svg
181	PrusaSlicer/resources/icons/white/extruder+funnel.svg	232	PrusaSlicer/resources/icons/white/extruder+funnel.svg
		233	PrusaSlicer/resources/icons/white/eye_closed.svg
		234	PrusaSlicer/resources/icons/white/eye_open.svg
182	PrusaSlicer/resources/icons/white/flag_green.svg	235	PrusaSlicer/resources/icons/white/flag_green.svg
183	PrusaSlicer/resources/icons/white/flag_red.svg	236	PrusaSlicer/resources/icons/white/flag_red.svg
184	PrusaSlicer/resources/icons/white/funnel.svg	237	PrusaSlicer/resources/icons/white/funnel.svg
Lines 191-196 Link Here
191	PrusaSlicer/resources/icons/white/layers.svg	244	PrusaSlicer/resources/icons/white/layers.svg
192	PrusaSlicer/resources/icons/white/lock2_closed.svg	245	PrusaSlicer/resources/icons/white/lock2_closed.svg
193	PrusaSlicer/resources/icons/white/lock_closed.svg	246	PrusaSlicer/resources/icons/white/lock_closed.svg
		247	PrusaSlicer/resources/icons/white/lock_closed_f.svg
194	PrusaSlicer/resources/icons/white/lock_open_sys.svg	248	PrusaSlicer/resources/icons/white/lock_open_sys.svg
195	PrusaSlicer/resources/icons/white/machine+cog.svg	249	PrusaSlicer/resources/icons/white/machine+cog.svg
196	PrusaSlicer/resources/icons/white/mirroring_off.svg	250	PrusaSlicer/resources/icons/white/mirroring_off.svg
Lines 200-205 Link Here
200	PrusaSlicer/resources/icons/white/number_of_copies.svg	254	PrusaSlicer/resources/icons/white/number_of_copies.svg
201	PrusaSlicer/resources/icons/white/open.svg	255	PrusaSlicer/resources/icons/white/open.svg
202	PrusaSlicer/resources/icons/white/output+page_white.svg	256	PrusaSlicer/resources/icons/white/output+page_white.svg
		257	PrusaSlicer/resources/icons/white/pad.svg
203	PrusaSlicer/resources/icons/white/paste_menu.svg	258	PrusaSlicer/resources/icons/white/paste_menu.svg
204	PrusaSlicer/resources/icons/white/plater.svg	259	PrusaSlicer/resources/icons/white/plater.svg
205	PrusaSlicer/resources/icons/white/preview_menu.svg	260	PrusaSlicer/resources/icons/white/preview_menu.svg
Lines 210-215 Link Here
210	PrusaSlicer/resources/icons/white/remove_menu.svg	265	PrusaSlicer/resources/icons/white/remove_menu.svg
211	PrusaSlicer/resources/icons/white/resin.svg	266	PrusaSlicer/resources/icons/white/resin.svg
212	PrusaSlicer/resources/icons/white/save.svg	267	PrusaSlicer/resources/icons/white/save.svg
		268	PrusaSlicer/resources/icons/white/search.svg
213	PrusaSlicer/resources/icons/white/set_separate_obj.svg	269	PrusaSlicer/resources/icons/white/set_separate_obj.svg
214	PrusaSlicer/resources/icons/white/skirt+brim.svg	270	PrusaSlicer/resources/icons/white/skirt+brim.svg
215	PrusaSlicer/resources/icons/white/sla_printer.svg	271	PrusaSlicer/resources/icons/white/sla_printer.svg
Lines 219-234 Link Here
219	PrusaSlicer/resources/icons/white/support.svg	275	PrusaSlicer/resources/icons/white/support.svg
220	PrusaSlicer/resources/icons/white/support_blocker.svg	276	PrusaSlicer/resources/icons/white/support_blocker.svg
221	PrusaSlicer/resources/icons/white/support_enforcer.svg	277	PrusaSlicer/resources/icons/white/support_enforcer.svg
		278	PrusaSlicer/resources/icons/white/switch_presets.svg
222	PrusaSlicer/resources/icons/white/test.svg	279	PrusaSlicer/resources/icons/white/test.svg
223	PrusaSlicer/resources/icons/white/time.svg	280	PrusaSlicer/resources/icons/white/time.svg
224	PrusaSlicer/resources/icons/white/undo_menu.svg	281	PrusaSlicer/resources/icons/white/undo_menu.svg
225	PrusaSlicer/resources/icons/white/upload_queue.svg	282	PrusaSlicer/resources/icons/white/upload_queue.svg
226	PrusaSlicer/resources/icons/white/wrench.svg	283	PrusaSlicer/resources/icons/white/wrench.svg
227	PrusaSlicer/resources/icons/undo_toolbar.svg
228	PrusaSlicer/resources/icons/up_half_circle.png
229	PrusaSlicer/resources/icons/upload_queue.svg
230	PrusaSlicer/resources/icons/variable_layer_height_reset.png
231	PrusaSlicer/resources/icons/variable_layer_height_tooltip.png
232	PrusaSlicer/resources/icons/wrench.svg	284	PrusaSlicer/resources/icons/wrench.svg
233	PrusaSlicer/resources/icons/wrench_white.svg	285	PrusaSlicer/resources/icons/wrench_white.svg
234	PrusaSlicer/resources/localization/PrusaSlicer.pot	286	PrusaSlicer/resources/localization/PrusaSlicer.pot
Lines 255-260 Link Here
255	PrusaSlicer/resources/localization/pl/PrusaSlicer_pl.po	307	PrusaSlicer/resources/localization/pl/PrusaSlicer_pl.po
256	PrusaSlicer/resources/localization/pt_br/PrusaSlicer.mo	308	PrusaSlicer/resources/localization/pt_br/PrusaSlicer.mo
257	PrusaSlicer/resources/localization/pt_br/PrusaSlicer_pt_br.po	309	PrusaSlicer/resources/localization/pt_br/PrusaSlicer_pt_br.po
		310	PrusaSlicer/resources/localization/ru/PrusaSlicer.mo
		311	PrusaSlicer/resources/localization/ru/PrusaSlicer_ru.po
258	PrusaSlicer/resources/localization/tr/PrusaSlicer.mo	312	PrusaSlicer/resources/localization/tr/PrusaSlicer.mo
259	PrusaSlicer/resources/localization/tr/PrusaSlicer_tr.po	313	PrusaSlicer/resources/localization/tr/PrusaSlicer_tr.po
260	PrusaSlicer/resources/localization/uk/PrusaSlicer.mo	314	PrusaSlicer/resources/localization/uk/PrusaSlicer.mo
Lines 263-268 Link Here
263	PrusaSlicer/resources/localization/zh_cn/PrusaSlicer_zh_CN.po	317	PrusaSlicer/resources/localization/zh_cn/PrusaSlicer_zh_CN.po
264	PrusaSlicer/resources/localization/zh_tw/PrusaSlicer.mo	318	PrusaSlicer/resources/localization/zh_tw/PrusaSlicer.mo
265	PrusaSlicer/resources/localization/zh_tw/PrusaSlicer_zh_TW.po	319	PrusaSlicer/resources/localization/zh_tw/PrusaSlicer_zh_TW.po
		320	PrusaSlicer/resources/profiles/Anycubic.idx
		321	PrusaSlicer/resources/profiles/Anycubic.ini
		322	PrusaSlicer/resources/profiles/Anycubic/AK.png
		323	PrusaSlicer/resources/profiles/Anycubic/AKLP_Bed.stl
		324	PrusaSlicer/resources/profiles/Anycubic/AKLP_thumbnail.png
		325	PrusaSlicer/resources/profiles/Anycubic/AK_Bed.stl
		326	PrusaSlicer/resources/profiles/Anycubic/AK_thumbnail.png
		327	PrusaSlicer/resources/profiles/Anycubic/I3MEGAS_thumbnail.png
		328	PrusaSlicer/resources/profiles/Anycubic/I3MEGA_thumbnail.png
		329	PrusaSlicer/resources/profiles/Anycubic/MEGA0_thumbnail.png
		330	PrusaSlicer/resources/profiles/Anycubic/PREDATOR_thumbnail.png
		331	PrusaSlicer/resources/profiles/Anycubic/mega0.svg
		332	PrusaSlicer/resources/profiles/Anycubic/mega0_bed.stl
266	PrusaSlicer/resources/profiles/BIBO.idx	333	PrusaSlicer/resources/profiles/BIBO.idx
267	PrusaSlicer/resources/profiles/BIBO.ini	334	PrusaSlicer/resources/profiles/BIBO.ini
268	PrusaSlicer/resources/profiles/BIBO/BIBO2.svg	335	PrusaSlicer/resources/profiles/BIBO/BIBO2.svg
Lines 270-278 Link Here
270	PrusaSlicer/resources/profiles/BIBO/BIBO2_thumbnail.png	337	PrusaSlicer/resources/profiles/BIBO/BIBO2_thumbnail.png
271	PrusaSlicer/resources/profiles/Creality.idx	338	PrusaSlicer/resources/profiles/Creality.idx
272	PrusaSlicer/resources/profiles/Creality.ini	339	PrusaSlicer/resources/profiles/Creality.ini
		340	PrusaSlicer/resources/profiles/Creality/CR10MINI_thumbnail.png
		341	PrusaSlicer/resources/profiles/Creality/CR10S4_thumbnail.png
		342	PrusaSlicer/resources/profiles/Creality/CR10S5_thumbnail.png
		343	PrusaSlicer/resources/profiles/Creality/CR10SPROV2_thumbnail.png
		344	PrusaSlicer/resources/profiles/Creality/CR10SPRO_thumbnail.png
		345	PrusaSlicer/resources/profiles/Creality/CR10S_thumbnail.png
		346	PrusaSlicer/resources/profiles/Creality/CR10V2_thumbnail.png
		347	PrusaSlicer/resources/profiles/Creality/CR10V3_thumbnail.png
		348	PrusaSlicer/resources/profiles/Creality/CR10_thumbnail.png
		349	PrusaSlicer/resources/profiles/Creality/CR20PRO_thumbnail.png
		350	PrusaSlicer/resources/profiles/Creality/CR20_thumbnail.png
		351	PrusaSlicer/resources/profiles/Creality/ENDER2_thumbnail.png
		352	PrusaSlicer/resources/profiles/Creality/ENDER3BLTOUCH_thumbnail.png
		353	PrusaSlicer/resources/profiles/Creality/ENDER3V2_thumbnail.png
273	PrusaSlicer/resources/profiles/Creality/ENDER3_thumbnail.png	354	PrusaSlicer/resources/profiles/Creality/ENDER3_thumbnail.png
		355	PrusaSlicer/resources/profiles/Creality/ENDER5PLUS_thumbnail.png
		356	PrusaSlicer/resources/profiles/Creality/ENDER5_thumbnail.png
		357	PrusaSlicer/resources/profiles/Creality/cr10.svg
		358	PrusaSlicer/resources/profiles/Creality/cr10_bed.stl
		359	PrusaSlicer/resources/profiles/Creality/cr10mini.svg
		360	PrusaSlicer/resources/profiles/Creality/cr10mini_bed.stl
		361	PrusaSlicer/resources/profiles/Creality/cr10s4.svg
		362	PrusaSlicer/resources/profiles/Creality/cr10s4_bed.stl
		363	PrusaSlicer/resources/profiles/Creality/cr10s5.svg
		364	PrusaSlicer/resources/profiles/Creality/cr10s5_bed.stl
		365	PrusaSlicer/resources/profiles/Creality/cr10v2_bed.stl
		366	PrusaSlicer/resources/profiles/Creality/cr20.svg
		367	PrusaSlicer/resources/profiles/Creality/ender2.svg
		368	PrusaSlicer/resources/profiles/Creality/ender2_bed.stl
274	PrusaSlicer/resources/profiles/Creality/ender3.svg	369	PrusaSlicer/resources/profiles/Creality/ender3.svg
275	PrusaSlicer/resources/profiles/Creality/ender3_bed.stl	370	PrusaSlicer/resources/profiles/Creality/ender3_bed.stl
		371	PrusaSlicer/resources/profiles/Creality/ender5plus.svg
		372	PrusaSlicer/resources/profiles/Creality/ender5plus_bed.stl
		373	PrusaSlicer/resources/profiles/FLSun.idx
		374	PrusaSlicer/resources/profiles/FLSun.ini
		375	PrusaSlicer/resources/profiles/FLSun/Q5.svg
		376	PrusaSlicer/resources/profiles/FLSun/Q5_bed.stl
		377	PrusaSlicer/resources/profiles/FLSun/Q5_thumbnail.png
		378	PrusaSlicer/resources/profiles/FLSun/QQSP.svg
		379	PrusaSlicer/resources/profiles/FLSun/QQSP_bed.stl
		380	PrusaSlicer/resources/profiles/FLSun/QQSP_thumbnail.png
276	PrusaSlicer/resources/profiles/LulzBot.idx	381	PrusaSlicer/resources/profiles/LulzBot.idx
277	PrusaSlicer/resources/profiles/LulzBot.ini	382	PrusaSlicer/resources/profiles/LulzBot.ini
278	PrusaSlicer/resources/profiles/LulzBot/MINI_AERO_thumbnail.png	383	PrusaSlicer/resources/profiles/LulzBot/MINI_AERO_thumbnail.png
Lines 299-309 Link Here
299	PrusaSlicer/resources/profiles/PrusaResearch/mk3_bed.stl	404	PrusaSlicer/resources/profiles/PrusaResearch/mk3_bed.stl
300	PrusaSlicer/resources/profiles/PrusaResearch/sl1.svg	405	PrusaSlicer/resources/profiles/PrusaResearch/sl1.svg
301	PrusaSlicer/resources/profiles/PrusaResearch/sl1_bed.stl	406	PrusaSlicer/resources/profiles/PrusaResearch/sl1_bed.stl
		407	PrusaSlicer/resources/profiles/TriLAB.idx
		408	PrusaSlicer/resources/profiles/TriLAB.ini
		409	PrusaSlicer/resources/profiles/TriLAB/DQ2+FP2_thumbnail.png
		410	PrusaSlicer/resources/profiles/TriLAB/DQ2+FP_thumbnail.png
		411	PrusaSlicer/resources/profiles/TriLAB/DQ2P+FP2_thumbnail.png
		412	PrusaSlicer/resources/profiles/TriLAB/DQ2P+FP_thumbnail.png
		413	PrusaSlicer/resources/profiles/TriLAB/DQ2P_thumbnail.png
		414	PrusaSlicer/resources/profiles/TriLAB/DQ2_thumbnail.png
		415	PrusaSlicer/resources/profiles/TriLAB/DQL_thumbnail.png
		416	PrusaSlicer/resources/profiles/TriLAB/DQM_thumbnail.png
		417	PrusaSlicer/resources/profiles/TriLAB/DQXL_thumbnail.png
		418	PrusaSlicer/resources/profiles/TriLAB/dq2_bed.stl
302	PrusaSlicer/resources/shaders/gouraud.fs	419	PrusaSlicer/resources/shaders/gouraud.fs
303	PrusaSlicer/resources/shaders/gouraud.vs	420	PrusaSlicer/resources/shaders/gouraud.vs
		421	PrusaSlicer/resources/shaders/gouraud_light.fs
		422	PrusaSlicer/resources/shaders/gouraud_light.vs
		423	PrusaSlicer/resources/shaders/options_110.fs
		424	PrusaSlicer/resources/shaders/options_110.vs
		425	PrusaSlicer/resources/shaders/options_120.fs
		426	PrusaSlicer/resources/shaders/options_120.vs
304	PrusaSlicer/resources/shaders/printbed.fs	427	PrusaSlicer/resources/shaders/printbed.fs
305	PrusaSlicer/resources/shaders/printbed.vs	428	PrusaSlicer/resources/shaders/printbed.vs
		429	PrusaSlicer/resources/shaders/toolpaths_lines.fs
		430	PrusaSlicer/resources/shaders/toolpaths_lines.vs
306	PrusaSlicer/resources/shaders/variable_layer_height.fs	431	PrusaSlicer/resources/shaders/variable_layer_height.fs
307	PrusaSlicer/resources/shaders/variable_layer_height.vs	432	PrusaSlicer/resources/shaders/variable_layer_height.vs
308	PrusaSlicer/resources/udev/90-3dconnexion.rules	433	PrusaSlicer/resources/udev/90-3dconnexion.rules
309	PrusaSlicer/bin/prusa-slicer	434	PrusaSlicer/bin/prusa-slicer
		435	PrusaSlicer/bin/prusa-gcodeviewer

Return to bug 252611

Lines 1-11 Link Here

(-)PrusaSlicer/files/patch-CMakeLists.txt (-3 / +11 lines)
1	--- CMakeLists.txt.orig 2020-03-21 10:55:51 UTC	1	--- CMakeLists.txt.orig 2021-01-11 13:01:51 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -3,6 +3,8 @@ project(PrusaSlicer)	3	@@ -3,6 +3,7 @@ project(PrusaSlicer)
4		4
5	include("version.inc")	5	include("version.inc")
6	include(GNUInstallDirs)	6	include(GNUInstallDirs)
7	+include_directories(BEFORE SYSTEM "%%WRKSRC%%/CGAL/include")
8	+add_compile_options(-DNDEBUG)	7	+add_compile_options(-DNDEBUG)
9		8
10	set(SLIC3R_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")	9	set(SLIC3R_RESOURCES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
11	file(TO_NATIVE_PATH "${SLIC3R_RESOURCES_DIR}" SLIC3R_RESOURCES_DIR_WIN)	10	file(TO_NATIVE_PATH "${SLIC3R_RESOURCES_DIR}" SLIC3R_RESOURCES_DIR_WIN)
		11	@@ -154,7 +155,7 @@ if (APPLE)
		12	endif ()
		13	endif ()
		14
		15	-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
		16	+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
		17	find_package(PkgConfig REQUIRED)
		18
		19	if (CMAKE_VERSION VERSION_LESS "3.1")

Line 0 Link Here

(-)PrusaSlicer/files/patch-src_slic3r_GUI_InstanceCheck.cpp (+20 lines)
	1	--- src/slic3r/GUI/InstanceCheck.cpp.orig 2021-01-11 13:01:51 UTC
	2	+++ src/slic3r/GUI/InstanceCheck.cpp
	3	@@ -23,7 +23,7 @@
	4	#include <strsafe.h>
	5	#endif //WIN32
	6
	7	-#if __linux__
	8	+#if defined(__linux__) \|\| defined (__FreeBSD__)
	9	#include <dbus/dbus.h> /* Pull in all of D-Bus headers. */
	10	#endif //__linux__
	11
	12	@@ -169,7 +169,7 @@ namespace instance_check_internal
	13	return false;
	14	}
	15
	16	-#elif defined(__linux__)
	17	+#elif defined(__linux__) \|\| defined (__FreeBSD__)
	18
	19	static bool send_message(const std::string &message_text, const std::string &version)
	20	{