diff --git a/FreeCAD.changes b/FreeCAD.changes index 59e5f0e..d279001 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 8 06:33:56 UTC 2018 - adrian@suse.de + +- temporary disable FEM module + * it works fine, but requires hdf5 version 1.8 via med-tools, + which currently conflicts in openSUSE distro. + ------------------------------------------------------------------- Fri Apr 27 12:55:30 UTC 2018 - adrian@suse.de diff --git a/FreeCAD.spec b/FreeCAD.spec index 91a916c..579d57f 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -38,7 +38,7 @@ Patch2: 0001-find-openmpi2-include-files.patch Patch3: fix-draft-module-with-python3.patch BuildRequires: Coin-devel #BuildRequires: SoQt-devel -BuildRequires: libmed-devel +#BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5 lib # we use upstream OpenCASCADE instead of oce atm BuildRequires: occt-devel BuildRequires: vtk-devel @@ -67,7 +67,6 @@ BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-fortran BuildRequires: git -BuildRequires: hdf5-1_8-devel BuildRequires: libXerces-c-devel BuildRequires: pkg-config @@ -197,7 +196,7 @@ cmake \ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_MESH_PART:BOOL=ON \ -DBUILD_OPENSCAD:BOOL=ON \ - -DBUILD_FEM:BOOL=ON \ + -DBUILD_FEM:BOOL=OFF \ -DBUILD_FEM_NETGEN:BOOL=OFF \ -DFREECAD_USE_EXTERNAL_SMESH=OFF \ .. diff --git a/branch_update.patch b/branch_update.patch index 7763336..49487fb 100644 --- a/branch_update.patch +++ b/branch_update.patch @@ -221,6 +221,19 @@ index 19dfdbeb4..e00cf6434 100644 }; } //namespace PartDesign +diff --git a/src/Mod/Path/PathScripts/post/grbl_post.py b/src/Mod/Path/PathScripts/post/grbl_post.py +index 536c2cf54..9ad099243 100644 +--- a/src/Mod/Path/PathScripts/post/grbl_post.py ++++ b/src/Mod/Path/PathScripts/post/grbl_post.py +@@ -261,7 +261,7 @@ def parse(pathobj): + if param in c.Parameters: + if param == 'F': + if command not in RAPID_MOVES: +- outstring.append(param + format(c.Parameters['F'], '.2f')) ++ outstring.append(param + format(c.Parameters['F'] * 60, '.2f')) + elif param == 'T': + outstring.append(param + str(c.Parameters['T'])) + else: diff --git a/src/Mod/Path/libarea/CMakeLists.txt b/src/Mod/Path/libarea/CMakeLists.txt index ef95c29d3..087c911dd 100644 --- a/src/Mod/Path/libarea/CMakeLists.txt