From 61086b9efd754a01280b80aaca619c9aead6a1694df236c39f8272cc5fb92ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 5 Apr 2019 13:06:45 +0000 Subject: [PATCH 1/3] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=51 --- CuraEngine-3.6.4.obscpio | 3 --- CuraEngine-3.6.5.obscpio | 3 +++ CuraEngine.obsinfo | 2 +- _service | 4 ++-- cura-engine-lulzbot.changes | 6 ++++++ cura-engine-lulzbot.spec | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 CuraEngine-3.6.4.obscpio create mode 100644 CuraEngine-3.6.5.obscpio diff --git a/CuraEngine-3.6.4.obscpio b/CuraEngine-3.6.4.obscpio deleted file mode 100644 index 103a37d..0000000 --- a/CuraEngine-3.6.4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9d782936373e94cf7fcbab8a707500fea7f454dc39fa603377c120a979c10c6 -size 4335629 diff --git a/CuraEngine-3.6.5.obscpio b/CuraEngine-3.6.5.obscpio new file mode 100644 index 0000000..d0ba369 --- /dev/null +++ b/CuraEngine-3.6.5.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e3f87d423486a6bf72cf57688126d1915a4b5aceae5ed80fe7a841243059f8f +size 4335628 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index 1401fc0..c84d49e 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.6.4 +version: 3.6.5 mtime: 1543917478 commit: 829ecb34609e34566405159554f5863d6940afd2 diff --git a/_service b/_service index 1b6feca..95cb608 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.6.4 - 3.6.4 + v3.6.5 + 3.6.5 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index eaa5d60..f8d3bdd 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 5 12:05:33 UTC 2019 - Adrian Schröter + +- update to version 3.6.5 + * no code changes + ------------------------------------------------------------------- Thu Feb 21 09:05:20 UTC 2019 - Adrian Schröter diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 4a4d5c8..42b994f 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.6.4 +Version: 3.6.5 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 7e75fe09dce6b4b98ffd31709cd4370ff27829b1f5de690605ac10a1b5a3c931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Apr 2019 13:58:16 +0000 Subject: [PATCH 2/3] try without 32bit patch OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=52 --- cura-engine-lulzbot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index 42b994f..6ec49cc 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -49,7 +49,7 @@ This is the LulzBot variation of the engine. %prep %setup -q -n CuraEngine-%version %patch1 -p1 -%patch2 -p1 +#%patch2 -p1 %build %if 0%{?suse_version} < 1500 From eae17ab489867ea0580a8afc2bc8b2f57b3a08786f259a42d52cb3a1b8e03e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 8 Apr 2019 14:08:42 +0000 Subject: [PATCH 3/3] 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 - 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 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