From 588927f1991d9a59908868ccf0421b87abb1956a Mon Sep 17 00:00:00 2001
From: Gabriel Féron <feron.gabriel@gmail.com>
Date: Nov 05 2019 15:49:55 +0000
Subject: Update to 4.3.0


---

diff --git a/CuraEngine-gcc9.patch b/CuraEngine-gcc9.patch
deleted file mode 100644
index 9a7fb63..0000000
--- a/CuraEngine-gcc9.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 9fd93712220aa2754e077bf89f165c7a9b795abd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <feron.gabriel@gmail.com>
-Date: Tue, 18 Jun 2019 22:58:47 +0200
-Subject: [PATCH] [PATCH 3/3] GCC 9 patches
-
----
- src/layerPart.cpp | 2 +-
- src/support.cpp   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/layerPart.cpp b/src/layerPart.cpp
-index ba3e7157..6cf0919a 100644
---- a/src/layerPart.cpp
-+++ b/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 default(none) shared(mesh, slicer, total_layers) 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<int>(total_layers); layer_nr++)
-     {
-diff --git a/src/support.cpp b/src/support.cpp
-index 9bd531a6..bb7a741d 100644
---- a/src/support.cpp
-+++ b/src/support.cpp
-@@ -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 default(none) shared(xy_disallowed_per_layer, storage, mesh, layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) 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<int>(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<int>(storage.support.supportLayers.size()),
-                                                              static_cast<int>(layer_count - (layer_z_distance_top - 1))));
--#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic)
-+#pragma omp parallel for default(none) shared(support_areas, storage, max_checking_layer_idx, layer_z_distance_top) 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.21.0
-
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 6a6a327..01ebbf0 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -1,7 +1,7 @@
 Name:           CuraEngine
 Epoch:          1
-Version:        4.1.0
-Release:        2%{?dist}
+Version:        4.3.0
+Release:        1%{?dist}
 Summary:        Engine for processing 3D models into G-code instructions for 3D printers
 License:        AGPLv3+
 URL:            https://github.com/Ultimaker/%{name}
@@ -25,9 +25,6 @@ BuildRequires:  git-core
 Patch0:         %{name}-rpath.patch
 Patch1:         %{name}-static-libstdcpp.patch
 
-# https://github.com/Ultimaker/CuraEngine/issues/984
-Patch2:         %{name}-gcc9.patch
-
 %description
 %{name} is a C++ console application for 3D printing G-code generation. It
 has been made as a better and faster alternative to the old Skeinforge engine.
@@ -64,6 +61,9 @@ make install DESTDIR=%{buildroot}
 %{_bindir}/%{name}
 
 %changelog
+* Tue Nov 5 2019 Gabriel Féron <feron.gabriel@gmail.com> - 4.3.0-1
+- Update to 4.3.0
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 276c0d8..1ae06e6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (CuraEngine-4.1.0.tar.gz) = 49a3d3943c0767ceba2b94d061e11f43a428401941032cb1cbc578acf95495ba2db48307a9e28056f5a641be7ba581b53264a3d32abbbeeb00b978c8203ca79f
+SHA512 (CuraEngine-4.3.0.tar.gz) = 60ca0ce586c0cf5f1516f803b2a05a20299ef8193f065acd6e11a0054903189225f9c60be1b536ffe5a9a22652097acd3a4aae2833920a468071b78f213f7572
 SHA512 (e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz) = 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b