Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2019-09-07 11:46:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Sat Sep 7 11:46:26 2019 rev:16 rq:720109 version:0.18.3 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-test.changes 2019-02-28 21:41:39.801569685 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.7948/FreeCAD-test.changes 2019-09-07 11:48:17.974317733 +0200 @@ -1,0 +2,6 @@ +Sat Jul 27 03:34:10 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix inverted logic when evaluating test suite exit code +- Add gmsh mesher to BuildRequires, increase FEM test coverage + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-04-08 10:39:19.355278021 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.7948/FreeCAD.changes 2019-09-07 11:48:19.594317503 +0200 @@ -1,0 +2,48 @@ +Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter <[email protected]> + +- 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 + +------------------------------------------------------------------- +Fri Jul 12 22:23:09 UTC 2019 - Stefan Brüns <[email protected]> + +- 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 <[email protected]> + +- 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 <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-find-openmpi2-include-files.patch FreeCAD-0.18.1.obscpio New: ---- 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch FreeCAD-0.18.3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD-test.spec ++++++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.906315901 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.906315901 +0200 @@ -17,13 +17,14 @@ Name: FreeCAD-test -Version: 0.18.1 +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 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 @@ -33,7 +34,10 @@ %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 ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.922315899 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.922315899 +0200 @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version: 0.18.1 +Version: 0.18.3 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -39,11 +39,13 @@ Source1: FreeCAD.sh Source2: FreeCADCmd.sh Source3: FreeCAD_shared_mimeinfo -Patch2: 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 @@ -70,25 +72,23 @@ BuildRequires: gcc-fortran BuildRequires: git BuildRequires: glew-devel -BuildRequires: hdf5-openmpi-devel +BuildRequires: graphviz +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 @@ -169,7 +169,7 @@ 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}' \ ++++++ 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch ++++++ >From 7d362752633f0e47cebc44f52db8dffbc3b3c2e6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> 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_<module_name>_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 ++++++ FreeCAD-0.18.1.obscpio -> FreeCAD-0.18.3.obscpio ++++++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.1.obscpio /work/SRC/openSUSE:Factory/.FreeCAD.new.7948/FreeCAD-0.18.3.obscpio differ: char 48, line 1 ++++++ FreeCAD.obsinfo ++++++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.962315894 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.966315892 +0200 @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.1 -mtime: 1554385363 -commit: f7dccfaa909e5b9da26bf50c4a22ccca9bb10c40 +version: 0.18.3 +mtime: 1562965688 +commit: 3129ae4296e40ed20e7b3d460b86e6969acbe1c3 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.998315888 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.998315888 +0200 @@ -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">0.18.1</param> - <param name="version">0.18.1</param> + <param name="revision">0.18.3</param> + <param name="version">0.18.3</param> </service> <service name="set_version" mode="disabled"/>
