Accepting request 835691 from science

OBS-URL: https://build.opensuse.org/request/show/835691
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeCAD?expand=0&rev=26

FreeCAD-0.18.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:702e78a04df4681226cd71eba8afc53487c2c43c1aaf218450939ef33851b5dd
+size 200393700

FreeCAD.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 19 01:37:12 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix build with boost 1.73 and later, add
+  0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
+- Cleanup some build dependencies.
+
 -------------------------------------------------------------------
 Thu Jul 23 11:43:21 UTC 2020 - Adrian Schröter <adrian@suse.de>
 

FreeCAD.spec

@@ -25,6 +25,8 @@
 %else
 %bcond_with    boost_signals2
 %endif
+# Bundled SALOME-MESH (smesh) fails to build with VTK 9.0
+%bcond_with smesh
 
 Name:           FreeCAD
 Version:        0.18.4
@@ -46,6 +48,8 @@ Patch5:         0001-fem-use-time.process_time-instead-of-removed-time.cl.patch
 Patch6:         fix_unittestgui_tkinter_py3.patch
 # PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/pull/3558
 Patch7:         fix_qt_5.15_build.patch
+# PATCH-FIX-UPSTREAM -- Rebased https://github.com/FreeCAD/FreeCAD/commit/4ec45b545ebf
+Patch8:         0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
 
 # Test suite fails on 32bit and I don't want to debug that anymore
 ExcludeArch:    %ix86 %arm ppc s390 s390x
@@ -71,12 +75,10 @@ BuildRequires:  f2c
 BuildRequires:  fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  gcc-fortran
-BuildRequires:  git
 BuildRequires:  glew-devel
 BuildRequires:  graphviz
 BuildRequires:  hdf5-devel
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  java-devel
 # We use the internal smesh version with fixes atm
 #BuildRequires:  smesh-devel
 BuildRequires:  libXerces-c-devel
@@ -205,11 +207,13 @@ rm src/3rdparty/Pivy-0.5 -fr
   -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \
   -DBUILD_QT5=ON \
   -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
-  -DBUILD_MESH_PART:BOOL=OFF \
   -DBUILD_OPENSCAD:BOOL=ON \
-  -DBUILD_FEM:BOOL=OFF \
   -DBUILD_FEM_NETGEN:BOOL=OFF \
   -DFREECAD_USE_EXTERNAL_SMESH=OFF \
+  -DBUILD_SMESH:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+  -DBUILD_MESH_PART:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+  -DBUILD_FEM:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+  -Wno-dev \
   ..
 
 %cmake_build

_service

@@ -1,15 +0,0 @@
-<services>
-  <service name="obs_scm" mode="disabled">
-    <param name="url">https://github.com/FreeCAD/FreeCAD.git</param>
-    <param name="scm">git</param>
-    <param name="revision">releases/FreeCAD-0-18</param>
-    <param name="version">0.18.4</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-
-  <service name="tar" mode="buildtime"/>
-  <service name="recompress" mode="buildtime">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-</services>