diff --git a/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch b/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch new file mode 100644 index 0000000000..ce7d6a2a41 --- /dev/null +++ b/srcpkgs/cura-engine/patches/0001-Remove-default-none-so-that-it-compiles-in-gcc9.patch @@ -0,0 +1,57 @@ +From 45cab061494467165ba515055a828cdd39567c0e Mon Sep 17 00:00:00 2001 +From: Jasper Chan +Date: Mon, 5 Aug 2019 23:37:35 -0700 +Subject: [PATCH] Remove default(none) so that it compiles in gcc9 + +--- + src/layerPart.cpp | 2 +- + src/support.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git src/layerPart.cpp src/layerPart.cpp +index ba3e7157..d36a31f6 100644 +--- src/layerPart.cpp ++++ src/layerPart.cpp +@@ -52,7 +52,7 @@ void createLayerParts(SliceMeshStorage& mesh, Slicer* slicer) + { + const auto total_layers = slicer->layers.size(); + assert(mesh.layers.size() == total_layers); +-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic) ++#pragma omp parallel for shared(mesh, slicer) schedule(dynamic) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_nr = 0; layer_nr < static_cast(total_layers); layer_nr++) + { +diff --git src/support.cpp src/support.cpp +index 9bd531a6..0a43de2f 100644 +--- src/support.cpp ++++ src/support.cpp +@@ -816,7 +816,7 @@ void AreaSupport::generateOverhangAreasForMesh(SliceDataStorage& storage, SliceM + } + + //Generate the actual areas and store them in the mesh. +- #pragma omp parallel for default(none) shared(storage, mesh) schedule(dynamic) ++ #pragma omp parallel for shared(storage, mesh) schedule(dynamic) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_idx = 1; layer_idx < static_cast(storage.print_layer_count); layer_idx++) + { +@@ -875,7 +875,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S + constexpr bool no_prime_tower = false; + xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, no_support, no_prime_tower).offset(xy_distance); + // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area +- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) ++ #pragma omp parallel for shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_idx = 1; layer_idx < static_cast(layer_count); layer_idx++) + { +@@ -1070,7 +1070,7 @@ void AreaSupport::generateSupportAreasForMesh(SliceDataStorage& storage, const S + const int max_checking_layer_idx = std::max(0, + std::min(static_cast(storage.support.supportLayers.size()), + static_cast(layer_count - (layer_z_distance_top - 1)))); +-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) ++#pragma omp parallel for shared(support_areas, storage) schedule(dynamic) + // Use a signed type for the loop counter so MSVC compiles (because it uses OpenMP 2.0, an old version). + for (int layer_idx = 0; layer_idx < max_checking_layer_idx; layer_idx++) + { +-- +2.22.0 + diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index a3d26dc949..63b00cda8e 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -1,6 +1,6 @@ # Template file for 'cura-engine' pkgname=cura-engine -version=4.0.0 +version=4.2.0 revision=1 wrksrc="CuraEngine-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Karl Nilsson " license="AGPL-3.0-or-later" homepage="https://github.com/Ultimaker/CuraEngine" distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz" -checksum=08c8cc6ca6ba44ce35cf66b06e399408dd5fc809a208afc1892f0f700728326e +checksum=9e66c2840c46ad5ba91da872d73cc8d8d03bf163fe8ce9a81ec5188a6d7b4593 post_install() { vlicense LICENSE