pool/FreeCAD
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.17

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=22
This commit is contained in:
Adrian Schröter 2018-04-10 11:51:36 +00:00 committed by Git OBS Bridge
parent 7316844945
commit 5731cd6770
10 changed files with 184 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
0001-find-openmpi2-include-files.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ecfe23a6..1db9bf33e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -717,7 +717,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_compile_options(${OPENMPI_CFLAGS})
link_directories(${OPENMPI_LIBRARY_DIRS})
link_libraries(${OPENMPI_LIBRARIES})
- find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} NO_DEFAULT_PATH)
+ find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} /usr/lib64/mpi/gcc/openmpi2/include NO_DEFAULT_PATH)
if(NOT MpidotH)
message( WARNING "mpi.h was not found. Check for error above.")
endif()

3
FreeCAD-0.16.6712.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66891dd8a208daa48024216e1dca6627b8ec90c6105cce7d33eaffc066b307ef
size 241548815

3
FreeCAD-0.17.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15bf621edb984b0914fd7e5c1ce2e2469b3f031fbb4d2bd1f86c90f634e0829b
size 385050127

8
FreeCAD.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 10 11:33:35 UTC 2018 - adrian@suse.de
- update to version 0.17
2 years of work: https://www.freecadweb.org/wiki/Release_notes_0.17
- switching to Qt5
- enabled netgen FEM support
-------------------------------------------------------------------
Thu Jan 4 15:36:57 UTC 2018 - wbauer@tmo.at

6
FreeCAD.obsinfo
View File

@ -1,5 +1,5 @@
name: FreeCAD
version: 0.16.6712
mtime: 1500312467
commit: da2d364457257a7a8c6fb2137cea12c45becd71a
version: 0.17
mtime: 1523004517
commit: 0258808ccb6ba3bd5ea9312f79cd023f1a8671b7

5
FreeCAD.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
# let Python pick up /usr/lib64/FreeCAD/bin/PySide
cd /usr/lib64/FreeCAD/bin
# temporary workaround for a bug somewhere around python3 in Factory leading to memory corruption
LC_ALL=C ./FreeCAD $@

163
FreeCAD.spec
View File

@ -19,20 +19,29 @@
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
Version: 0.16.6712
Version: 0.17
Release: 0
Summary: General Purpose 3D CAD Modeler
License: LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD
Url: http://www.freecadweb.org/
Source0: %{name}-%{version}.tar.xz
Source2: FreeCAD_shared_mimeinfo
# PATCH-FIX-OPENSUSE remove-qtwebkit.patch -- fix build without QtWebKit
Patch0: remove-qtwebkit.patch
# PATCH-FIX-OPENSUSE remove-webgui.patch -- remove browser view that would need QtWebKit
Patch1: remove-webgui.patch
Source0: %{name}-%version.tar.xz
Source1: FreeCAD.sh
Source2: FreeCADCmd.sh
Source3: FreeCAD_shared_mimeinfo
Patch1: fix-build.diff
Patch2: 0001-find-openmpi2-include-files.patch
BuildRequires: Coin-devel
BuildRequires: SoQt-devel
#BuildRequires: SoQt-devel
BuildRequires: libmed-devel
BuildRequires: netgen-devel
# we use upstream OpenCASCADE instead of oce atm
BuildRequires: occt-devel
BuildRequires: vtk-devel
BuildRequires: vtk-java
BuildRequires: vtk-tcl
#BuildRequires: smesh-devel
%if 0%{?suse_version} >= 1330
BuildRequires: libboost_filesystem-devel >= 1.55
BuildRequires: libboost_graph-devel >= 1.55
@ -45,6 +54,7 @@ BuildRequires: libboost_thread-devel >= 1.55
%else
BuildRequires: boost-devel >= 1.55
%endif
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: doxygen
@ -53,36 +63,67 @@ BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
BuildRequires: git
BuildRequires: hdf5-devel
BuildRequires: hdf5-1_8-devel
BuildRequires: libXerces-c-devel
BuildRequires: libeigen3-devel
BuildRequires: libqt4-devel
BuildRequires: pkg-config
%if 0%{?suse_version} >= 1330
# Qt5 & python3
BuildRequires: openmpi2-devel
#BuildRequires: python3-devel
BuildRequires: python3-matplotlib
BuildRequires: python3-pyside2-devel
BuildRequires: python3-vtk
BuildRequires: python3-xml
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5ScriptTools)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
Requires: python3-pyside2
# core dump if PySide is installed
Conflicts: python3-pyside
Conflicts: python-pyside
Recommends: python-pivy
%else
BuildRequires: libshiboken-devel
BuildRequires: libspnav-devel
BuildRequires: oce-devel
BuildRequires: opencv-devel
BuildRequires: pkgconfig
BuildRequires: python-CXX-devel
BuildRequires: python-devel
BuildRequires: python-matplotlib
BuildRequires: python-pyside
BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools
BuildRequires: pkgconfig(QtWebKit)
%if 0%{?suse_version} > 0
# Qt4 & python2
BuildRequires: libqt4-devel
BuildRequires: python-xml
%endif
%endif
%if 0%{?fedora} > 18
BuildRequires: eigen3-devel
BuildRequires: qt5-qtbase-devel
%endif
BuildRequires: libspnav-devel
BuildRequires: opencv-devel
BuildRequires: swig
%if 0%{?suse_version}
BuildRequires: libeigen3-devel
BuildRequires: update-desktop-files
%endif
BuildRequires: dos2unix
BuildRequires: make
BuildRequires: python3-qt5-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
%if 0%{?suse_version} < 1500
BuildRequires: pkgconfig(QtWebKit)
%endif
Requires: python-CXX
Requires: python-pyside
%if 0%{?suse_version} <= 1320
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
%endif
Recommends: python-pivy
Recommends: ccx
%description
FreeCAD is a parametric 3D modeler made primarily to design real-life objects of any size. Parametric modeling allows you to easily modify your design by going back into your model history and changing its parameters. FreeCAD is open-source and highly customizable, scriptable and extensible.
@ -98,15 +139,16 @@ This package contains the files needed for development with FreeCAD.
%prep
%setup -q
%if 0%{?suse_version} >= 1500
%patch0 -p1
%patch1 -p1
%endif
%patch2 -p1
# fix env-script-interpreter
sed -i '1c#!%{__python2}' \
src/Mod/Test/testmakeWireString.py \
src/Mod/Test/unittestgui.py
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' ChangeLog.txt
sed -i 's/\r$//' copying.lib
# Fix "wrong-script-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' src/Mod/PartDesign/Scripts/Spring.py
@ -116,36 +158,46 @@ sed -i 's/\r$//' src/Mod/Robot/MovieTool.py
rm src/3rdparty/Pivy -fr
rm src/3rdparty/Pivy-0.5 -fr
# fix env-script-interpreter
sed -i '1c#!%{__python2}' \
src/Mod/Test/testmakeWireString.py \
src/Mod/Test/unittestgui.py
%build
mkdir build && cd build
# cmake macro would set standard libdir
# it needs an older specific zipios version -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE
# it needs an older specific zipios version -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE
# -fpermissive should become $RPM_OPT_FLAGS , but bugs ...
printenv
cmake \
-DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DOCC_INCLUDE_DIR=%{_includedir}/oce \
-DOCC_INCLUDE_DIR=%{_includedir}/opencascade \
-DRESOURCEDIR=%{_datadir}/%{name} \
-DCMAKE_BUILD_TYPE=Release \
%if %{with netgen}
-DBUILD_FEM_NETGEN=ON \
-DCMAKE_CXX_FLAGS="-fpermissive -fno-strict-aliasing" \
%if 0%{?suse_version} >= 1330
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \
-DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \
-DBUILD_QT5=ON \
%else
-DBUILD_FEM_NETGEN=OFF \
-DPYCXX_INCLUDE_DIR:PATH=%{_includedir}/python2.7 \
-DPYCXX_SOURCE_DIR:PATH=%{_datadir}/python2.7/CXX \
%endif
%if 0%{?suse_version} >= 1500
-DBUILD_START=OFF \
-DBUILD_WEB=OFF \
%endif
../
-DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
-DBUILD_MESH_PART:BOOL=ON \
-DBUILD_OPENSCAD:BOOL=ON \
-DBUILD_FEM:BOOL=ON \
-DNGLIB_INCLUDE_DIR=/usr/include/netgen/include/ \
-DNGLIB_LIBNGLIB=%_libdir/netgen/libnglib.so \
-DNGLIB_LIBINTERFACE=%_libdir/netgen/libinterface.so \
-DNGLIB_LIBMESH=%_libdir/netgen/libmesh.so \
-DNGLIB_LIBOCC=%_libdir/netgen/libocc.so \
-DBUILD_FEM_NETGEN:BOOL=ON \
-DFREECAD_USE_EXTERNAL_SMESH=OFF \
..
make VERBOSE=1 %{?_smp_mflags} all
make VERBOSE=1 %{?_smp_mflags} all || make VERBOSE=1 all
# # Build documentation last, somehow
# # this triggers a rebuild
@ -176,9 +228,6 @@ popd
# nice make VERBOSE=1 %%{?_smp_mflags} install DESTDIR=%%{buildroot}
# popd
# Install the Qt plugin
#install -Dpm 0755 src/Tools/plugins/widget/libFreeCAD_widgets.so %%{buildroot}/usr/%%{_lib}/qt4/plugins/designer/libFreeCAD_widgets.so
# Fix "non-executable-script" rpmlint warning
chmod 755 %{buildroot}%{x_prefix}/Mod/Robot/MovieTool.py \
%{buildroot}%{x_prefix}/Mod/Test/testmakeWireString.py \
@ -189,12 +238,12 @@ mkdir -p %{buildroot}%{_datadir}/pixmaps
mv %{buildroot}%{_datadir}/%{name}/freecad.xpm %{buildroot}%{_datadir}/pixmaps/freecad.xpm
# Install additional documentation files
install -pm 0644 ChangeLog.txt copying.lib %{buildroot}%{_docdir}/%{name}/
#install -pm 0644 ChangeLog.txt copying.lib %{buildroot}%{_docdir}/%{name}/
%suse_update_desktop_file -c %{name} "%{name}" "3D CAD Modeler" %{name} "freecad" Education Engineering
# Install mime type
install -Dpm 0644 %{SOURCE2} %{buildroot}/%{_datadir}/mime/packages/%{name}.xml
install -Dpm 0644 %{SOURCE3} %{buildroot}/usr/share/mime/packages/%{name}.xml
# Remove unneeded files
find %{buildroot} -type f -name "*.la" -delete -print
@ -213,9 +262,17 @@ dos2unix %{buildroot}%{x_prefix}/Mod/Test/unittestgui.py
dos2unix %{buildroot}%{x_prefix}/Mod/Part/MakeBottle.py
# Link binaries
mkdir -p %{buildroot}%{_bindir}
ln -s -t %{buildroot}%{_bindir} %{x_prefix}/bin/FreeCAD
ln -s -t %{buildroot}%{_bindir} %{x_prefix}/bin/FreeCADCmd
mkdir -p %{buildroot}/usr/bin
%if 0%{?suse_version} >= 91330
# disabled, hopefully not anymore needed
cp %{S:1} %{buildroot}/usr/bin/FreeCAD
chmod +x %{buildroot}/usr/bin/FreeCAD
cp %{S:2} %{buildroot}/usr/bin/FreeCADCmd
chmod +x %{buildroot}/usr/bin/FreeCADCmd
%else
ln -s -t %{buildroot}/usr/bin %{x_prefix}/bin/FreeCAD
ln -s -t %{buildroot}/usr/bin %{x_prefix}/bin/FreeCADCmd
%endif
%fdupes -s %{buildroot}

4
FreeCADCmd.sh Normal file
View File

@ -0,0 +1,4 @@
#!/bin/sh
# let Python pick up /usr/lib64/FreeCAD/bin/PySide
cd /usr/lib64/FreeCAD/bin
./FreeCADCmd

4
_service
View File

@ -2,8 +2,8 @@
<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-16</param>
<param name="version">0.16.6712</param>
<param name="revision">0.17</param>
<param name="version">0.17</param>
</service>
<service name="set_version" mode="disabled"/>

36
fix-build.diff Normal file
View File

@ -0,0 +1,36 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ecfe23a6..246bb15a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -445,7 +445,6 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677598
# Acceptable versions of Python
-set(Python_ADDITIONAL_VERSIONS "2.7")
# For building on OS X
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
diff --git a/src/3rdParty/salomesmesh/CMakeLists.txt b/src/3rdParty/salomesmesh/CMakeLists.txt
index 303ae6e0a..9c10046e6 100644
--- a/src/3rdParty/salomesmesh/CMakeLists.txt
+++ b/src/3rdParty/salomesmesh/CMakeLists.txt
@@ -379,6 +379,7 @@ if (BUILD_FEM_NETGEN)
FILE(GLOB NETGENPlugin_source_files src/NETGENPlugin/*.cpp inc/NETGENPlugin_*.h* )
ADD_LIBRARY(NETGENPlugin SHARED ${NETGENPlugin_source_files})
TARGET_LINK_LIBRARIES(NETGENPlugin SMDS SMESHDS SMESH StdMeshers ${SMESH_LIBS} )
+set_property(TARGET NETGENPlugin PROPERTY CXX_STANDARD 14)
SET_BIN_DIR(NETGENPlugin NETGENPlugin)
if(WIN32)
diff --git a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
index 3b66ec663..3d4bc8afd 100644
--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
+++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshAlgos.cpp
@@ -38,6 +38,7 @@
#include <GC_MakeSegment.hxx>
#include <GeomAPI_ExtremaCurveCurve.hxx>
#include <Geom_Line.hxx>
+#include <Quantity_Parameter.hxx>
#include <IntAna_IntConicQuad.hxx>
#include <IntAna_Quadric.hxx>
#include <gp_Lin.hxx>