From 640121ef34dbcc65a4cd46848b04253847c0b5a47fc8ca8425b7f9f1f40f5608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 12 May 2019 07:12:28 +0000 Subject: [PATCH 1/8] update OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=84 --- FreeCAD-0.18.1.obscpio | 3 --- FreeCAD-0.18.2.obscpio | 3 +++ FreeCAD-test.spec | 9 ++++++--- FreeCAD.obsinfo | 6 +++--- FreeCAD.spec | 9 +++++---- _service | 4 ++-- 6 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 FreeCAD-0.18.1.obscpio create mode 100644 FreeCAD-0.18.2.obscpio diff --git a/FreeCAD-0.18.1.obscpio b/FreeCAD-0.18.1.obscpio deleted file mode 100644 index 1d87619..0000000 --- a/FreeCAD-0.18.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ddbbce2dc1f06a7239e343e1478ab44d6c45d49d47cff7587457e66f69c84ec2 -size 427612686 diff --git a/FreeCAD-0.18.2.obscpio b/FreeCAD-0.18.2.obscpio new file mode 100644 index 0000000..b2b1666 --- /dev/null +++ b/FreeCAD-0.18.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f18c34b14280957cd8d10b85f81c552aa8fed975eb67ddc916a2c613052a8b05 +size 427612174 diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index c336d46..0eb76cf 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.18.1 +Version: 0.18.2 Release: 0 Summary: Meta source package that runs the FreeCAD testsuite when built License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -33,7 +33,10 @@ This is just executing the test suite at build time. %build export LC_ALL="C.utf-8" -#FreeCAD --console --write-log --log-file=/tmp/FreeCAD.log --run-test 0 || exit 1 -FreeCAD --console --run-test 0 || exit 1 +file=`mktemp` +if FreeCAD --console --write-log --log-file="$file" --run-test 0; then + cat "$file" + exit 1 +fi %changelog diff --git a/FreeCAD.obsinfo b/FreeCAD.obsinfo index 6f74828..f161c11 100644 --- a/FreeCAD.obsinfo +++ b/FreeCAD.obsinfo @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.1 -mtime: 1554385363 -commit: f7dccfaa909e5b9da26bf50c4a22ccca9bb10c40 +version: 0.18.2 +mtime: 1557572575 +commit: dbb4cc6415bac848a294f03b80f65e888d531742 diff --git a/FreeCAD.spec b/FreeCAD.spec index 8bbfe5b..e237f9f 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version: 0.18.1 +Version: 0.18.2 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -70,6 +70,7 @@ BuildRequires: freeglut-devel BuildRequires: gcc-fortran BuildRequires: git BuildRequires: glew-devel +BuildRequires: graphviz BuildRequires: hdf5-openmpi-devel # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel @@ -100,8 +101,7 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5ScriptTools) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 @@ -208,12 +208,13 @@ cmake \ -DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \ -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \ -DBUILD_QT5=ON \ + -DFREECAD_USE_QTWEBMODULE="Qt WebEngine" \ %endif -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_MESH_PART:BOOL=ON \ -DBUILD_OPENSCAD:BOOL=ON \ -DBUILD_FEM:BOOL=ON \ - -DBUILD_FEM_NETGEN:BOOL=OFF \ + -DBUILD_FEM_NETGEN:BOOL=ON \ -DFREECAD_USE_EXTERNAL_SMESH=OFF \ .. diff --git a/_service b/_service index 5821fe7..c0e5929 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://github.com/FreeCAD/FreeCAD.git git - 0.18.1 - 0.18.1 + 0.18.2 + 0.18.2 From 9812fb44b15b577dc91fe732441bba5ce14d576bd7f4ac1ef79386fc7b60326d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 12 May 2019 07:21:44 +0000 Subject: [PATCH 2/8] note OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=85 --- FreeCAD.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/FreeCAD.changes b/FreeCAD.changes index c129627..700a1ca 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 12 07:21:14 UTC 2019 - Adrian Schröter + +- Update to 0.18.2 + ------------------------------------------------------------------- Fri Apr 5 11:56:11 UTC 2019 - Adrian Schröter From 166e8107726e61f548957efa17c76c2750a62d75ac84d751034d5635d21c59d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 12 May 2019 09:01:43 +0000 Subject: [PATCH 3/8] changes OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=86 --- FreeCAD.changes | 7 +++++++ FreeCAD.spec | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/FreeCAD.changes b/FreeCAD.changes index 700a1ca..48a3900 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -2,6 +2,13 @@ Sun May 12 07:21:14 UTC 2019 - Adrian Schröter - Update to 0.18.2 + * replace insecure use of eval() with proper use of units + * py3/py2: use exec as function + * Arch: Fixed error in roof - Fixes #3864 + * Draft: Fixed 0.18.1 bug in DXF importer + * Py3 fix: correctly convert a Python str to const char* + * Py3 fix reading/writing from/to OBJ file + * fixes 0003913: libspnav crash on linux wayland during startup ------------------------------------------------------------------- Fri Apr 5 11:56:11 UTC 2019 - Adrian Schröter diff --git a/FreeCAD.spec b/FreeCAD.spec index e237f9f..ea3409f 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -208,13 +208,12 @@ cmake \ -DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \ -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \ -DBUILD_QT5=ON \ - -DFREECAD_USE_QTWEBMODULE="Qt WebEngine" \ %endif -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_MESH_PART:BOOL=ON \ -DBUILD_OPENSCAD:BOOL=ON \ -DBUILD_FEM:BOOL=ON \ - -DBUILD_FEM_NETGEN:BOOL=ON \ + -DBUILD_FEM_NETGEN:BOOL=OFF \ -DFREECAD_USE_EXTERNAL_SMESH=OFF \ .. From 4682ebafc3621bc3d4b4614db0931467ed137601722f5f95c59a8f73210a27a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 15 May 2019 07:38:41 +0000 Subject: [PATCH 4/8] revert from WebEngine for now, breaks test suite OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=87 --- FreeCAD.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/FreeCAD.spec b/FreeCAD.spec index ea3409f..7bea909 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -101,7 +101,8 @@ BuildRequires: pkgconfig(Qt5PrintSupport) BuildRequires: pkgconfig(Qt5ScriptTools) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) -BuildRequires: pkgconfig(Qt5WebEngine) +BuildRequires: pkgconfig(Qt5WebKit) +BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 From 0c36b899ed7c5aacf0713d269ca44c6a30370eb75a4bd1bdb26b43a796343a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 13 Jun 2019 17:44:27 +0000 Subject: [PATCH 5/8] Accepting request 709775 from home:cgiboudeaux:branches:science - Add 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch to fix build with recent shiboken2/pyside2 releases. OBS-URL: https://build.opensuse.org/request/show/709775 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=88 --- ...-build-with-pyside2-shiboken2-5.12.1.patch | 88 +++++++++++++++++++ FreeCAD.changes | 6 ++ FreeCAD.spec | 6 +- 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch diff --git a/0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch b/0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch new file mode 100644 index 0000000..6137c55 --- /dev/null +++ b/0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch @@ -0,0 +1,88 @@ +From 7d362752633f0e47cebc44f52db8dffbc3b3c2e6 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Thu, 13 Jun 2019 14:15:07 +0200 +Subject: [PATCH] Fix build with pyside2/shiboken2 >= 5.12.1 + +Starting with 5.12.2, pyside2 and shiboken2 now create CMake build targets. +The old variables were removed, leading to linker errors when building FreeCAD. +--- + src/Gui/CMakeLists.txt | 54 ++++++++++++++++++++++++------------------ + 1 file changed, 31 insertions(+), 23 deletions(-) + +diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt +index 3bd96e0..93babc5 100644 +--- a/src/Gui/CMakeLists.txt ++++ b/src/Gui/CMakeLists.txt +@@ -137,38 +137,46 @@ IF(OCULUS_FOUND) + ) + ENDIF(OCULUS_FOUND) + +-if(SHIBOKEN_INCLUDE_DIR) +- if (BUILD_QT5) ++if(BUILD_QT5) ++ if(Shiboken2_FOUND) + add_definitions(-DHAVE_SHIBOKEN2) +- else() ++ if("${Shiboken2_VERSION}" VERSION_GREATER 5.12.1) ++ list(APPEND FreeCADGui_LIBS Shiboken2::libshiboken) ++ else() ++ include_directories(${SHIBOKEN_INCLUDE_DIR}) ++ list(APPEND FreeCADGui_LIBS ${SHIBOKEN_LIBRARY}) ++ endif() ++ endif() ++ if(PySide2_FOUND) ++ add_definitions(-DHAVE_PYSIDE2) ++ if("${PySide2_VERSION}" VERSION_GREATER 5.12.1) ++ list(APPEND FreeCADGui_LIBS PySide2::pyside2) ++ # Needed to '#include pyside2__python.h' ++ get_target_property(PYSIDE_INCLUDE_DIR PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES) ++ else() ++ list(APPEND FreeCADGui_LIBS ${PYSIDE_LIBRARY}) ++ endif() ++ include_directories(${PYSIDE_INCLUDE_DIR}/QtWidgets) ++ endif() ++else() ++ if(SHIBOKEN_INCLUDE_DIR) + add_definitions(-DHAVE_SHIBOKEN) ++ include_directories(${SHIBOKEN_INCLUDE_DIR}) ++ list(APPEND FreeCADGui_LIBS ${SHIBOKEN_LIBRARY}) + endif() +- include_directories( +- ${SHIBOKEN_INCLUDE_DIR} +- ) +- list(APPEND FreeCADGui_LIBS +- ${SHIBOKEN_LIBRARY} +- ) +-endif(SHIBOKEN_INCLUDE_DIR) ++ if(PYSIDE_INCLUDE_DIR) ++ add_definitions(-DHAVE_PYSIDE) ++ list(APPEND FreeCADGui_LIBS ${PYSIDE_LIBRARY}) ++ endif() ++endif() + +-if(PYSIDE_INCLUDE_DIR) ++if(DEFINED PYSIDE_INCLUDE_DIR) + include_directories( + ${PYSIDE_INCLUDE_DIR} + ${PYSIDE_INCLUDE_DIR}/QtCore + ${PYSIDE_INCLUDE_DIR}/QtGui + ) +- list(APPEND FreeCADGui_LIBS +- ${PYSIDE_LIBRARY} +- ) +- if (BUILD_QT5) +- include_directories( +- ${PYSIDE_INCLUDE_DIR}/QtWidgets +- ) +- add_definitions(-DHAVE_PYSIDE2) +- else() +- add_definitions(-DHAVE_PYSIDE) +- endif() +-endif(PYSIDE_INCLUDE_DIR) ++endif() + + generate_from_xml(DocumentPy) + generate_from_xml(PythonWorkbenchPy) +-- +2.22.0 + diff --git a/FreeCAD.changes b/FreeCAD.changes index 48a3900..117a7c1 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux + +- Add 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch to fix + build with recent shiboken2/pyside2 releases. + ------------------------------------------------------------------- Sun May 12 07:21:14 UTC 2019 - Adrian Schröter diff --git a/FreeCAD.spec b/FreeCAD.spec index 7bea909..3a80b2a 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -39,7 +39,9 @@ Source0: %{name}-%version.tar.xz Source1: FreeCAD.sh Source2: FreeCADCmd.sh Source3: FreeCAD_shared_mimeinfo -Patch2: 0001-find-openmpi2-include-files.patch +Patch0: 0001-find-openmpi2-include-files.patch +# PATCH-FIX-UPSTREAM 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch -- Fix build with shiboken2/pyside2 >= 5.12.1 +Patch1: 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -170,7 +172,7 @@ This package contains the files needed for development with FreeCAD. mv %_sourcedir/%name-%version %_builddir/%name-%version %setup -q -D -T 0 %endif -%patch2 -p1 +%autopatch -p1 # fix env-script-interpreter sed -i '1c#!%{__python2}' \ From 3c0b7cd69c55b27d4f7ddd039bcf8c693f9a3feec0992d860151c3f4e84c0636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 18 Jul 2019 11:03:06 +0000 Subject: [PATCH 6/8] update OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=89 --- FreeCAD-0.18.2.obscpio | 3 --- FreeCAD-0.18.3.obscpio | 3 +++ FreeCAD-test.spec | 2 +- FreeCAD.changes | 5 +++++ FreeCAD.obsinfo | 6 +++--- FreeCAD.spec | 2 +- _service | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 FreeCAD-0.18.2.obscpio create mode 100644 FreeCAD-0.18.3.obscpio diff --git a/FreeCAD-0.18.2.obscpio b/FreeCAD-0.18.2.obscpio deleted file mode 100644 index b2b1666..0000000 --- a/FreeCAD-0.18.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f18c34b14280957cd8d10b85f81c552aa8fed975eb67ddc916a2c613052a8b05 -size 427612174 diff --git a/FreeCAD-0.18.3.obscpio b/FreeCAD-0.18.3.obscpio new file mode 100644 index 0000000..f30030c --- /dev/null +++ b/FreeCAD-0.18.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62ef89cca228b718f48e380d29b10f807724f649da169c45151a1df8fecde672 +size 427664910 diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index 0eb76cf..7045515 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.18.2 +Version: 0.18.3 Release: 0 Summary: Meta source package that runs the FreeCAD testsuite when built License: LGPL-2.0-or-later AND GPL-2.0-or-later diff --git a/FreeCAD.changes b/FreeCAD.changes index 117a7c1..10c4c32 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter + +- Update to 0.18.3 + ------------------------------------------------------------------- Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux diff --git a/FreeCAD.obsinfo b/FreeCAD.obsinfo index f161c11..7b975ef 100644 --- a/FreeCAD.obsinfo +++ b/FreeCAD.obsinfo @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.2 -mtime: 1557572575 -commit: dbb4cc6415bac848a294f03b80f65e888d531742 +version: 0.18.3 +mtime: 1562965688 +commit: 3129ae4296e40ed20e7b3d460b86e6969acbe1c3 diff --git a/FreeCAD.spec b/FreeCAD.spec index 3a80b2a..0cc6d51 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version: 0.18.2 +Version: 0.18.3 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later diff --git a/_service b/_service index c0e5929..4bccf07 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://github.com/FreeCAD/FreeCAD.git git - 0.18.2 - 0.18.2 + 0.18.3 + 0.18.3 From c2229e4a3b37ecdde79f8933e1c2de6137f6338b3b173edf2e8a907c17930125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 18 Jul 2019 14:03:29 +0000 Subject: [PATCH 7/8] add changelog OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=90 --- FreeCAD.changes | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/FreeCAD.changes b/FreeCAD.changes index 10c4c32..8de5540 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -2,6 +2,20 @@ Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter - Update to 0.18.3 + * AddonManager: Skip non-github addons + * Sketcher: Fix Carbon copy leads to unsolvable sketch + * Sketcher: Fix carbon copy construction points + * fixes #0003993: Memory leak with Python3 + * code simplification in PythonWrapper + * issue #0003984: Creating a Path Job object fails with 'PySide2.QtWidgets.QDialog' object has no attribute 'templateGroup' + * Fixes bug #4008: removes phantom path cause + * Fix crash in case encoding of Python paths fails + * [Material] Respect unicode filenames Fixes #4027 + * BrowserView: fix QWebEngine crash + * Py3: no __builtin__ module available + * fixes 0004010: Box Selection + Part -> MakeCompound will crash FreeCAD + * FEM: solver elmer tasks, Py3 decode fix + * make OpenSCAD utilities working again with Py2 ------------------------------------------------------------------- Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux From b0ac650f5f064b041c2b9b5af4125dee17156a24bd0412fcc08ee22cb012a111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Wed, 31 Jul 2019 20:18:15 +0000 Subject: [PATCH 8/8] Accepting request 719276 from home:StefanBruens:branches:science - Fix inverted logic when evaluating test suite exit code - Add gmsh mesher to BuildRequires, increase FEM test coverage - Remove MPI dependencies, as these are not used for the built package, but adversely affect build times and rebuilds. Proper MPI integration needs more work and has to ensure the base version of FreeCAD can be used without prior manual setup of an MPI environment. Remove 0001-find-openmpi2-include-files.patch, mpicc/mpicxx would pick up the correct include path by themselfs. - Sort BuildRequires: again OBS-URL: https://build.opensuse.org/request/show/719276 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=91 --- 0001-find-openmpi2-include-files.patch | 13 ------------- FreeCAD-test.changes | 6 ++++++ FreeCAD-test.spec | 3 ++- FreeCAD.changes | 11 +++++++++++ FreeCAD.spec | 11 ++++------- 5 files changed, 23 insertions(+), 21 deletions(-) delete mode 100644 0001-find-openmpi2-include-files.patch diff --git a/0001-find-openmpi2-include-files.patch b/0001-find-openmpi2-include-files.patch deleted file mode 100644 index 24d6e78..0000000 --- a/0001-find-openmpi2-include-files.patch +++ /dev/null @@ -1,13 +0,0 @@ -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() diff --git a/FreeCAD-test.changes b/FreeCAD-test.changes index e62a88a..05c1637 100644 --- a/FreeCAD-test.changes +++ b/FreeCAD-test.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 27 03:34:10 UTC 2019 - Stefan Brüns + +- Fix inverted logic when evaluating test suite exit code +- Add gmsh mesher to BuildRequires, increase FEM test coverage + ------------------------------------------------------------------- Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter diff --git a/FreeCAD-test.spec b/FreeCAD-test.spec index 7045515..3160965 100644 --- a/FreeCAD-test.spec +++ b/FreeCAD-test.spec @@ -24,6 +24,7 @@ License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Productivity/Graphics/CAD Url: http://www.freecadweb.org/ BuildRequires: FreeCAD +BuildRequires: gmsh # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -34,7 +35,7 @@ This is just executing the test suite at build time. %build export LC_ALL="C.utf-8" file=`mktemp` -if FreeCAD --console --write-log --log-file="$file" --run-test 0; then +if ! FreeCAD --console --write-log --log-file="$file" --run-test 0; then cat "$file" exit 1 fi diff --git a/FreeCAD.changes b/FreeCAD.changes index 8de5540..bbe7d83 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -17,6 +17,17 @@ Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter * FEM: solver elmer tasks, Py3 decode fix * make OpenSCAD utilities working again with Py2 +------------------------------------------------------------------- +Fri Jul 12 22:23:09 UTC 2019 - Stefan Brüns + +- Remove MPI dependencies, as these are not used for the built package, + but adversely affect build times and rebuilds. + Proper MPI integration needs more work and has to ensure the base version + of FreeCAD can be used without prior manual setup of an MPI environment. + Remove 0001-find-openmpi2-include-files.patch, mpicc/mpicxx would + pick up the correct include path by themselfs. +- Sort BuildRequires: again + ------------------------------------------------------------------- Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux diff --git a/FreeCAD.spec b/FreeCAD.spec index 0cc6d51..c5bbdc9 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -39,13 +39,13 @@ Source0: %{name}-%version.tar.xz Source1: FreeCAD.sh Source2: FreeCADCmd.sh Source3: FreeCAD_shared_mimeinfo -Patch0: 0001-find-openmpi2-include-files.patch # PATCH-FIX-UPSTREAM 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch -- Fix build with shiboken2/pyside2 >= 5.12.1 Patch1: 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x +BuildRequires: Coin-devel %if 0%{?suse_version} >= 1330 BuildRequires: libboost_filesystem-devel >= 1.55 BuildRequires: libboost_graph-devel >= 1.55 @@ -73,25 +73,22 @@ BuildRequires: gcc-fortran BuildRequires: git BuildRequires: glew-devel BuildRequires: graphviz -BuildRequires: hdf5-openmpi-devel +BuildRequires: hdf5-devel # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel BuildRequires: libXerces-c-devel +BuildRequires: libXi-devel BuildRequires: libmed-devel -BuildRequires: netgen-devel - BuildRequires: libspnav-devel BuildRequires: make +BuildRequires: netgen-devel # we use upstream OpenCASCADE instead of oce-devel atm -BuildRequires: Coin-devel -BuildRequires: libXi-devel BuildRequires: occt-devel BuildRequires: opencv-devel BuildRequires: pkg-config %if 0%{?suse_version} >= 1330 # Qt5 & python3 -BuildRequires: openmpi2-devel BuildRequires: python3-devel BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel