From 1dad74c6464374eabef0618fd0b2366df7ce3b24166d1a74dcc2027c2742b993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 21 Feb 2019 09:05:34 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=48 --- cura-engine-lulzbot.changes | 6 ++++++ cura-engine-lulzbot.spec | 2 ++ fix-32bit-build.patch | 13 +++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 fix-32bit-build.patch diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 24a92f3..eaa5d60 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 21 09:05:20 UTC 2019 - Adrian Schröter + +- fix 32bit build + * adding fix-32bit-build.patch + ------------------------------------------------------------------- Wed Feb 20 09:35:40 UTC 2019 - Adrian Schröter diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 3b8b8ff..4a4d5c8 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -27,6 +27,7 @@ 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 @@ -48,6 +49,7 @@ 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 new file mode 100644 index 0000000..f88ecae --- /dev/null +++ b/fix-32bit-build.patch @@ -0,0 +1,13 @@ +diff --git a/tests/arcus/ArcusCommunicationPrivateTest.cpp b/tests/arcus/ArcusCommunicationPrivateTest.cpp +index e802d3e2..c63e191f 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: +