From f90673661eb87e467047cc469679ad0b91471c006f4b527086cc871a750783e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 17 Oct 2018 07:15:05 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=24 --- cura-engine.changes | 1 + cura-engine.spec | 3 --- fix-build.patch | 24 ------------------------ 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 fix-build.patch diff --git a/cura-engine.changes b/cura-engine.changes index 806e4e1..5e4cd59 100644 --- a/cura-engine.changes +++ b/cura-engine.changes @@ -3,6 +3,7 @@ Wed Oct 17 07:07:33 UTC 2018 - Adrian Schröter - update to version 3.5.1 https://ultimaker.com/en/products/ultimaker-cura-software/release-notes +- drop merged fix-build.patch ------------------------------------------------------------------- Thu Jul 26 14:38:35 UTC 2018 - jengelh@inai.de diff --git a/cura-engine.spec b/cura-engine.spec index dbe8891..737bda6 100644 --- a/cura-engine.spec +++ b/cura-engine.spec @@ -25,8 +25,6 @@ Group: Hardware/Printing Url: http://github.com/Ultimaker/CuraEngine Source0: CuraEngine-%{version}.tar.xz Source1: CuraEngine.1 -# PATCH-FIX-UPSTREAM -Patch1: fix-build.patch # On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise %if 0%{?suse_version} >= 1500 BuildRequires: gcc-c++ >= 5 @@ -44,7 +42,6 @@ It is part of the larger project called "Cura". %prep %setup -q -n CuraEngine-%version -%patch1 -p1 %build %if 0%{?suse_version} < 1500 diff --git a/fix-build.patch b/fix-build.patch deleted file mode 100644 index c0b431d..0000000 --- a/fix-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -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})