From 0c3fc0a9458e0605f830148617fffa102f39fb3e523fed1a60e0c59fb407375b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 13 Jul 2018 05:01:14 +0000 Subject: [PATCH 1/6] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=28 --- CuraEngine-3.2.22.obscpio | 3 --- CuraEngine-3.2.23.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.2.22.obscpio create mode 100644 CuraEngine-3.2.23.obscpio diff --git a/CuraEngine-3.2.22.obscpio b/CuraEngine-3.2.22.obscpio deleted file mode 100644 index 3949992..0000000 --- a/CuraEngine-3.2.22.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22ab55e214aa332a3f28955ff3fb07b9cdebd47981611b20f6a337274f06a708 -size 2882573 diff --git a/CuraEngine-3.2.23.obscpio b/CuraEngine-3.2.23.obscpio new file mode 100644 index 0000000..9b710f4 --- /dev/null +++ b/CuraEngine-3.2.23.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12d9aca2763663abbe079d315a433679f8f099c74aa2e1d0f33c7c5ccb9a628e +size 2882573 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index be89da5..bd593ea 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.2.22 +version: 3.2.23 mtime: 1529473848 commit: 25aec5bb6a766779409a283379ead395c80a0a9a diff --git a/_service b/_service index 68a7734..e3d9927 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.2.22 - 3.2.22 + v3.2.23 + 3.2.23 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index f2f43d1..8a8f31f 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 13 05:00:52 UTC 2018 - adrian@suse.de + +- update to version 3.2.23 + * version update only + ------------------------------------------------------------------- Tue Jul 3 13:03:52 UTC 2018 - adrian@suse.de diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index c146076..bd149da 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.2.22 +Version: 3.2.23 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From 1e12bbdd7a267462c343d9db36380eb73d57db5291320751dd6bc398234cee07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 25 Jul 2018 10:59:32 +0000 Subject: [PATCH 2/6] libArcus OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=29 --- cura-engine-lulzbot.changes | 5 +++++ cura-engine-lulzbot.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 8a8f31f..7590ba4 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 10:59:01 UTC 2018 - adrian@suse.de + +- use upstream libArcus + ------------------------------------------------------------------- Fri Jul 13 05:00:52 UTC 2018 - adrian@suse.de diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index bd149da..dba5a83 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -34,7 +34,7 @@ BuildRequires: gcc6-c++ BuildRequires: gcc-c++ %endif BuildRequires: cmake -BuildRequires: libArcus-lulzbot-devel +BuildRequires: libArcus-devel %description CuraEngine is an engine for processing 3D models From f1f4df3675494ff1599f8089623b69413c511f5f68ac0db32ed405969461d034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 30 Jul 2018 12:00:59 +0000 Subject: [PATCH 3/6] fix OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=30 --- fix-build.patch | 65 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/fix-build.patch b/fix-build.patch index ab9c503..ce2deb4 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,3 +1,68 @@ +commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 +Author: Ghostkeeper +Date: Mon Jun 18 15:39:01 2018 +0200 + + Remove outdated copy of command_line_settings.json + + This entire directory doesn't exist. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c579388..4c55e6f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -251,11 +251,6 @@ if (BUILD_TESTS) + endforeach() + endif() + +- +-add_custom_command(TARGET CuraEngine POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_directory +- ${CMAKE_SOURCE_DIR}/resources $) +- + # Installing CuraEngine. + include(GNUInstallDirs) + install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) +commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 +Author: Ghostkeeper +Date: Mon Jun 18 15:39:01 2018 +0200 + + Remove outdated copy of command_line_settings.json + + This entire directory doesn't exist. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c579388..4c55e6f3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -251,11 +251,6 @@ if (BUILD_TESTS) + endforeach() + endif() + +- +-add_custom_command(TARGET CuraEngine POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_directory +- ${CMAKE_SOURCE_DIR}/resources $) +- + # Installing CuraEngine. + include(GNUInstallDirs) + install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp +index 7c4be40d..cff696a6 100644 +--- a/src/settings/SettingRegistry.cpp ++++ b/src/settings/SettingRegistry.cpp +@@ -35,12 +35,6 @@ std::string SettingRegistry::toString(rapidjson::Type type) + } + + +-SettingConfig::SettingConfig(std::string key, std::string label) +-: SettingContainer(key, label) +-{ +-// std::cerr << key << std::endl; // debug output to show all frontend registered settings... +-} +- + bool SettingRegistry::settingExists(std::string key) const + { + return setting_key_to_config.find(key) != setting_key_to_config.end(); diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp index 7c4be40d..cff696a6 100644 --- a/src/settings/SettingRegistry.cpp From a029c3d7846f5621952958810fbbaa8556e796c5d92b17d1bd7dd390a8d4ba97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 30 Jul 2018 12:09:03 +0000 Subject: [PATCH 4/6] fix OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=31 --- fix-build.patch | 53 ++----------------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/fix-build.patch b/fix-build.patch index ce2deb4..d1038fe 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,40 +1,8 @@ -commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 -Author: Ghostkeeper -Date: Mon Jun 18 15:39:01 2018 +0200 - - Remove outdated copy of command_line_settings.json - - This entire directory doesn't exist. - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c579388..4c55e6f3 100644 +index a015fa2b..b4c66d33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -251,11 +251,6 @@ if (BUILD_TESTS) - endforeach() - endif() - -- --add_custom_command(TARGET CuraEngine POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory -- ${CMAKE_SOURCE_DIR}/resources $) -- - # Installing CuraEngine. - include(GNUInstallDirs) - install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) -commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38 -Author: Ghostkeeper -Date: Mon Jun 18 15:39:01 2018 +0200 - - Remove outdated copy of command_line_settings.json - - This entire directory doesn't exist. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c579388..4c55e6f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -251,11 +251,6 @@ if (BUILD_TESTS) +@@ -202,11 +202,6 @@ if (BUILD_TESTS) endforeach() endif() @@ -54,23 +22,6 @@ index 7c4be40d..cff696a6 100644 } --SettingConfig::SettingConfig(std::string key, std::string label) --: SettingContainer(key, label) --{ --// std::cerr << key << std::endl; // debug output to show all frontend registered settings... --} -- - bool SettingRegistry::settingExists(std::string key) const - { - return setting_key_to_config.find(key) != setting_key_to_config.end(); -diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp -index 7c4be40d..cff696a6 100644 ---- a/src/settings/SettingRegistry.cpp -+++ b/src/settings/SettingRegistry.cpp -@@ -35,12 +35,6 @@ std::string SettingRegistry::toString(rapidjson::Type type) - } - - -SettingConfig::SettingConfig(std::string key, std::string label) -: SettingContainer(key, label) -{ From d9a7d028aabeeee858ab6fc06999674233be696154f2eafb3ce510991b5a3e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 6 Aug 2018 07:04:57 +0000 Subject: [PATCH 5/6] update OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=32 --- CuraEngine-3.2.23.obscpio | 3 --- CuraEngine-3.2.24.obscpio | 3 +++ CuraEngine.obsinfo | 6 +++--- _service | 4 ++-- cura-engine-lulzbot.changes | 8 +++++++- cura-engine-lulzbot.spec | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 CuraEngine-3.2.23.obscpio create mode 100644 CuraEngine-3.2.24.obscpio diff --git a/CuraEngine-3.2.23.obscpio b/CuraEngine-3.2.23.obscpio deleted file mode 100644 index 9b710f4..0000000 --- a/CuraEngine-3.2.23.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12d9aca2763663abbe079d315a433679f8f099c74aa2e1d0f33c7c5ccb9a628e -size 2882573 diff --git a/CuraEngine-3.2.24.obscpio b/CuraEngine-3.2.24.obscpio new file mode 100644 index 0000000..b150f8d --- /dev/null +++ b/CuraEngine-3.2.24.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e5d16dd99d3b9be520721d8f2cebaf9a2cbcb626c86fc9a60d310a4a934ba4f +size 2882573 diff --git a/CuraEngine.obsinfo b/CuraEngine.obsinfo index bd593ea..05597a7 100644 --- a/CuraEngine.obsinfo +++ b/CuraEngine.obsinfo @@ -1,5 +1,5 @@ name: CuraEngine -version: 3.2.23 -mtime: 1529473848 -commit: 25aec5bb6a766779409a283379ead395c80a0a9a +version: 3.2.24 +mtime: 1532278266 +commit: f00c2ca766046222d8ae92a09000410a4bbdb61e diff --git a/_service b/_service index e3d9927..be8c327 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://code.alephobjects.com/diffusion/CTE/cura-engine.git git - v3.2.23 - 3.2.23 + v3.2.24 + 3.2.24 disable CuraEngine diff --git a/cura-engine-lulzbot.changes b/cura-engine-lulzbot.changes index 7590ba4..eaec201 100644 --- a/cura-engine-lulzbot.changes +++ b/cura-engine-lulzbot.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 6 07:04:14 UTC 2018 - adrian@suse.de + +- update to version 3.2.24 + * version update only + ------------------------------------------------------------------- Wed Jul 25 10:59:01 UTC 2018 - adrian@suse.de -- use upstream libArcus +- use upstream libArcus instead of lulzbot flavor ------------------------------------------------------------------- Fri Jul 13 05:00:52 UTC 2018 - adrian@suse.de diff --git a/cura-engine-lulzbot.spec b/cura-engine-lulzbot.spec index dba5a83..1de6d0f 100644 --- a/cura-engine-lulzbot.spec +++ b/cura-engine-lulzbot.spec @@ -17,7 +17,7 @@ Name: cura-engine-lulzbot -Version: 3.2.23 +Version: 3.2.24 Release: 0 Summary: 3D printer control software License: AGPL-3.0-only From a3884858fb7a7c408922440a3034551dc3f098e67dd273835b5b1a6cc4945bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 6 Aug 2018 07:07:11 +0000 Subject: [PATCH 6/6] fix OBS-URL: https://build.opensuse.org/package/show/science/cura-engine-lulzbot?expand=0&rev=33 --- fix-build.patch | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/fix-build.patch b/fix-build.patch index d1038fe..ab9c503 100644 --- a/fix-build.patch +++ b/fix-build.patch @@ -1,19 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a015fa2b..b4c66d33 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -202,11 +202,6 @@ if (BUILD_TESTS) - endforeach() - endif() - -- --add_custom_command(TARGET CuraEngine POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory -- ${CMAKE_SOURCE_DIR}/resources $) -- - # Installing CuraEngine. - include(GNUInstallDirs) - install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp index 7c4be40d..cff696a6 100644 --- a/src/settings/SettingRegistry.cpp