Attachment 246463 Details for Bug 275082 – Update to 2.6.1: Fix build

[patch] Update to 2.6.1: Fix build

PrusaSlicer-2.6.1.diff (text/plain), 3.20 KB, created by Nuno Teixeira on 2023-11-21 12:58:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nuno Teixeira

Created: 2023-11-21 12:58:36 UTC

Size: 3.20 KB

patch

obsolete

>diff --git a/cad/PrusaSlicer/Makefile b/cad/PrusaSlicer/Makefile
>index ad12233bd153..e573e7f27bef 100644
>--- a/cad/PrusaSlicer/Makefile
>+++ b/cad/PrusaSlicer/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	PrusaSlicer
> DISTVERSIONPREFIX=version_
>-DISTVERSION=	2.6.0
>-PORTREVISION=	4
>+DISTVERSION=	2.6.1
> CATEGORIES=	cad
> DIST_SUBDIR=	PrusaSlicer
> 
>@@ -15,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> BUILD_DEPENDS=	cereal>=1.3.0.10:devel/cereal \
> 		cgal>=5.0.2:math/cgal \
> 		opencascade>=7.7.0:cad/opencascade
>-
> LIB_DEPENDS=	libtbb.so:devel/onetbb \
> 		libboost_log.so:devel/boost-libs \
> 		libImath.so:math/Imath \
>@@ -50,7 +48,7 @@ USE_XORG=	x11
> CMAKE_ARGS+=	-DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \
> 		-DSLIC3R_GTK=3 \
> 		-DSLIC3R_FHS=1 \
>-                -DSLIC3R_PCH=OFF
>+		-DSLIC3R_PCH=OFF
> 
> PORTDATA=	*
> 
>diff --git a/cad/PrusaSlicer/distinfo b/cad/PrusaSlicer/distinfo
>index 209b6b9fb7c8..0ae72f735f5d 100644
>--- a/cad/PrusaSlicer/distinfo
>+++ b/cad/PrusaSlicer/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1690319127
>-SHA256 (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.0_GH0.tar.gz) = a15f68e3b18a047c8c9a18a9d91629d2c777be1932087684cf6d2332d0888e77
>-SIZE (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.0_GH0.tar.gz) = 56430180
>+TIMESTAMP = 1700042542
>+SHA256 (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.1_GH0.tar.gz) = 516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
>+SIZE (PrusaSlicer/prusa3d-PrusaSlicer-version_2.6.1_GH0.tar.gz) = 58479800
>diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp.OPENBSD b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp.OPENBSD
>new file mode 100644
>index 000000000000..92c3b0b4c134
>--- /dev/null
>+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_PhysicalPrinterDialog_cpp.OPENBSD
>@@ -0,0 +1,12 @@
>+Index: src/slic3r/GUI/PhysicalPrinterDialog.cpp
>+--- src/slic3r/GUI/PhysicalPrinterDialog.cpp.orig
>++++ src/slic3r/GUI/PhysicalPrinterDialog.cpp
>+@@ -462,7 +462,7 @@ void PhysicalPrinterDialog::build_printhost_settings(C
>+     // Always fill in the "printhost_port" combo box from the config and select it.
>+     {
>+         Choice* choice = dynamic_cast<Choice*>(m_optgroup->get_field("printhost_port"));
>+-        choice->set_values({ m_config->opt_string("printhost_port") });
>++        choice->set_values((const std::vector<std::string>){ m_config->opt_string("printhost_port") });
>+         choice->set_selection();
>+     }
>+ 
>diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp.OPENBSD b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp.OPENBSD
>new file mode 100644
>index 000000000000..442086b447d1
>--- /dev/null
>+++ b/cad/PrusaSlicer/files/patch-src_slic3r_GUI_Plater.cpp.OPENBSD
>@@ -0,0 +1,12 @@
>+Index: src/slic3r/GUI/Plater.cpp
>+--- src/slic3r/GUI/Plater.cpp.orig
>++++ src/slic3r/GUI/Plater.cpp
>+@@ -5310,7 +5310,7 @@ void Plater::load_project(const wxString& filename)
>+ 
>+     p->reset();
>+ 
>+-    if (! load_files({ into_path(filename) }).empty()) {
>++    if (! load_files((const std::vector<boost::filesystem::path>){ into_path(filename) }).empty()) {
>+         // At least one file was loaded.
>+         p->set_project_filename(filename);
>+         // Save the names of active presets and project specific config into ProjectDirtyStateManager.

Actions: View | Diff

Attachments on bug 275082: 246328 | 246463