From eae17ab489867ea0580a8afc2bc8b2f57b3a08786f259a42d52cb3a1b8e03e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Mon, 8 Apr 2019 14:08:42 +0000
Subject: [PATCH] diff between 3.6.4 and 3.6.5 git tags did not show a change,
 but there was ....

OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=53
---
 cura-engine-lulzbot.changes |  2 +-
 cura-engine-lulzbot.spec    |  2 --
 fix-32bit-build.patch       | 28 ----------------------------
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 fix-32bit-build.patch

diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes
index f8d3bdd..39fa323 100644
--- a/cura-engine-lulzbot.changes
+++ b/cura-engine-lulzbot.changes
@@ -2,7 +2,7 @@
 Fri Apr  5 12:05:33 UTC 2019 - Adrian Schröter <adrian@suse.de>
 
 - update to version 3.6.5
-  * no code changes
+  * merged 32bit fixes, obsoletes fix-32bit-build.patch
 
 -------------------------------------------------------------------
 Thu Feb 21 09:05:20 UTC 2019 - Adrian Schröter <adrian@suse.de>
diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec
index 6ec49cc..146d2c1 100644
--- a/cura-engine-lulzbot.spec
+++ b/cura-engine-lulzbot.spec
@@ -27,7 +27,6 @@ Url:            https://code.alephobjects.com/diffusion/CTE/cura-engine.git
 Source0:        CuraEngine-%{version}.tar.xz
 Source1:        CuraEngine.1
 Patch1:         fix-build.patch
-Patch2:         fix-32bit-build.patch
 %if 0%{?suse_version} < 1500
 BuildRequires:  gcc6-c++
 #!BuildIgnore:  libgcc_s1
@@ -49,7 +48,6 @@ This is the LulzBot variation of the engine.
 %prep
 %setup -q -n CuraEngine-%version
 %patch1 -p1
-#%patch2 -p1
 
 %build
 %if 0%{?suse_version} < 1500
diff --git a/fix-32bit-build.patch b/fix-32bit-build.patch
deleted file mode 100644
index 4a50cff..0000000
--- a/fix-32bit-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/tests/arcus/ArcusCommunicationPrivateTest.cpp b/tests/arcus/ArcusCommunicationPrivateTest.cpp
-index e802d3e2..eae67511 100644
---- a/tests/arcus/ArcusCommunicationPrivateTest.cpp
-+++ b/tests/arcus/ArcusCommunicationPrivateTest.cpp
-@@ -202,8 +202,6 @@ void ArcusCommunicationPrivateTest::readMeshGroupMessageTest()
- 
-     auto& vertices = meshes[0].vertices;
-     CPPUNIT_ASSERT(! vertices.empty());
--    CPPUNIT_ASSERT_EQUAL(vertices.size(), 8ul); //A cube should have 8 unique vertices.
--    CPPUNIT_ASSERT_EQUAL(meshes[0].faces.size(), 12ul); // A cube should have 12 tri-s (2 for each 6 sides of the dice).
- 
-     // Distances should be the same:
- 
-@@ -231,10 +229,12 @@ void ArcusCommunicationPrivateTest::readMeshGroupMessageTest()
-     }
- 
-     // - Then, just compare:
-+// it seems to be a problem with the test and not the code
-+return;
-     for (int i = 0; i < 3; ++i)
-     {
-         CPPUNIT_ASSERT_EQUAL(max_coords[i] - min_coords[i], raw_max_coords[i] - raw_min_coords[i]);
-     }
- }
- 
--} //namespace cura
-\ No newline at end of file
-+} //namespace cura