Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2021-04-01 14:16:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Thu Apr 1 14:16:43 2021 rev:30 rq:881026 version:0.19.1 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2021-02-25 18:29:15.246251283 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.2401/FreeCAD.changes 2021-04-01 14:17:55.772037757 +0200 @@ -1,0 +2,21 @@ +Mon Mar 22 11:57:09 UTC 2021 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Update to version 0.19.1: + * Lots of new features, bug fixes and improvements, see + https://wiki.freecadweb.org/Release_notes_0.19 +- Drop upstream patches: + * 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch + * 0003-qt-5.14.patch + * update-swigpyrunin-for-python-3.8.patch + * 0001-fem-use-time.process_time-instead-of-removed-time.cl.patch + * fix_qt_5.15_build.patch + * 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch + * 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch + * 0001-Gui-skip-ci-fix-Wodr.patch + * 0001-Part-Import-skip-ci-disable-use-of-Message_ProgressI.patch + * 0001-import-Hotfix-for-build-failure-from-bad-debug-code.patch + * 0001-partdesign-fix-failing-tapered-hole-test.patch + * 0001-add-missing-std-namespace-to-build-on-Debian-10.patch +- Rebase fix-smesh-vtk9.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch 0001-Gui-skip-ci-fix-Wodr.patch 0001-Part-Import-skip-ci-disable-use-of-Message_ProgressI.patch 0001-add-missing-std-namespace-to-build-on-Debian-10.patch 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch 0001-fem-use-time.process_time-instead-of-removed-time.cl.patch 0001-import-Hotfix-for-build-failure-from-bad-debug-code.patch 0001-partdesign-fix-failing-tapered-hole-test.patch 0003-qt-5.14.patch FreeCAD-0.18.5.obscpio FreeCAD-0.18.5.tar.xz FreeCAD.obsinfo fix_qt_5.15_build.patch update-swigpyrunin-for-python-3.8.patch New: ---- FreeCAD-0.19.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD-test.spec ++++++ --- /var/tmp/diff_new_pack.QpUWF3/_old 2021-04-01 14:18:00.792045567 +0200 +++ /var/tmp/diff_new_pack.QpUWF3/_new 2021-04-01 14:18:00.792045567 +0200 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.18.5 +Version: 0.19.0 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 ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.QpUWF3/_old 2021-04-01 14:18:00.812045598 +0200 +++ /var/tmp/diff_new_pack.QpUWF3/_new 2021-04-01 14:18:00.812045598 +0200 @@ -23,45 +23,20 @@ %else %bcond_with boost_signals2 %endif -# Bundled SALOME-MESH (smesh) fails to build with VTK 9.0 -%bcond_without smesh +%bcond_with smesh_external Name: FreeCAD -Version: 0.18.5 +Version: 0.19.1 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: https://www.freecadweb.org/ -Source0: %{name}-%version.tar.xz -# 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 -# PATCH-FIX-OPENSUSE qt-5.14.patch -Patch3: 0003-qt-5.14.patch -# PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/commit/6eacb17b3e03d200.patch -Patch4: update-swigpyrunin-for-python-3.8.patch -# PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/pull/2899 -Patch5: 0001-fem-use-time.process_time-instead-of-removed-time.cl.patch +Source0: https://github.com/FreeCAD/FreeCAD/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE Use correct import for Python 3 tkinter -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 +Patch1: fix_unittestgui_tkinter_py3.patch # PATCH-FIX-UPSTREAM Rebased https://github.com/wwmayer/FreeCAD/commit/bb9bcbd51df7 -Patch9: fix-smesh-vtk9.patch -# PATCH-FIX-UPSTREAM -Patch10: 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch -# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/6bd39e8a90e65d81 -Patch11: 0001-Gui-skip-ci-fix-Wodr.patch -# PATCH-FIX-UPSTREAM -- Rebased https://github.com/FreeCAD/FreeCAD/commit/fd9cdb9de9d06ebd -Patch12: 0001-Part-Import-skip-ci-disable-use-of-Message_ProgressI.patch -# PATCH-FIX-UPSTREAM -- Rebased https://github.com/FreeCAD/FreeCAD/commit/063515f65007c116 -Patch13: 0001-import-Hotfix-for-build-failure-from-bad-debug-code.patch -# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/50957037764de76b -Patch14: 0001-add-missing-std-namespace-to-build-on-Debian-10.patch -# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/8be2c08141f0275e -Patch15: 0001-partdesign-fix-failing-tapered-hole-test.patch +Patch2: fix-smesh-vtk9.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -74,6 +49,7 @@ %if %{without boost_signals2} BuildRequires: libboost_signals-devel >= 1.55 %endif +BuildRequires: libboost_serialization-devel >= 1.55 BuildRequires: libboost_system-devel >= 1.55 BuildRequires: libboost_thread-devel >= 1.55 @@ -84,8 +60,10 @@ BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: hicolor-icon-theme +%if %{with smesh_external} # We use the internal smesh version with fixes atm -#BuildRequires: smesh-devel +BuildRequires: smesh-devel +%endif BuildRequires: java-devel BuildRequires: libXerces-c-devel BuildRequires: libXi-devel @@ -93,13 +71,11 @@ BuildRequires: libspnav-devel BuildRequires: make BuildRequires: netgen-devel -# we use upstream OpenCASCADE instead of oce-devel atm BuildRequires: occt-devel BuildRequires: pkg-config BuildRequires: proj-devel BuildRequires: sqlite3-devel -%if 0%{?suse_version} # Qt5 & python3 BuildRequires: python3-devel BuildRequires: python3-matplotlib @@ -117,32 +93,16 @@ BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5XmlPatterns) Requires: python3-numpy Requires: python3-pyside2 Requires: python3-vtk # For Arch & Draft workbench Requires: python3-pivy # For FEM workbench +Requires: python3-PyYAML +Requires: python3-ply Requires: python3-six -# core dump if PySide (version 1) is installed -Conflicts: python3-pyside -Conflicts: python-pyside -# reported to break FreeCAD here -# https://forum.freecadweb.org/viewtopic.php?t=24610 -Conflicts: python-pivy -%endif -%if 0%{?fedora} > 18 -BuildRequires: libshiboken-devel -BuildRequires: python-CXX-devel -BuildRequires: python-devel -BuildRequires: python-matplotlib -BuildRequires: python-pyside-devel -BuildRequires: python-pyside-tools -BuildRequires: pkgconfig(QtWebKit) -Requires: python-numpy -Requires: python-pyside -BuildRequires: qt5-qtbase-devel -%endif BuildRequires: swig BuildRequires: update-desktop-files @@ -175,53 +135,66 @@ # fix env-script-interpreter sed -i '1c#!%{__python3}' \ + src/Mod/AddonManager/AddonManager.py \ + src/Mod/Mesh/App/MeshTestsApp.py \ + src/Mod/Robot/KukaExporter.py \ src/Mod/Robot/MovieTool.py \ + src/Mod/Spreadsheet/importXLSX.py \ + src/Mod/TechDraw/TDTest/D*Test.py \ src/Mod/Test/testmakeWireString.py # Fix "non-executable-script" rpmlint warning -chmod 755 src/Mod/Robot/MovieTool.py \ - src/Mod/Test/testmakeWireString.py \ - src/Mod/Test/unittestgui.py +chmod 755 src/Mod/AddonManager/AddonManager.py \ + src/Mod/Robot/KukaExporter.py \ + src/Mod/Robot/MovieTool.py \ + src/Mod/Spreadsheet/importXLSX.py \ + src/Mod/TechDraw/TDTest/D*Test.py \ + src/Mod/Test/testmakeWireString.py # Fix "wrong-script-end-of-line-encoding" rpmlint warning +sed -i 's/\r$//' src/Mod/Mesh/App/MeshTestsApp.py sed -i 's/\r$//' src/Mod/Part/MakeBottle.py sed -i 's/\r$//' src/Mod/PartDesign/Scripts/FilletArc.py sed -i 's/\r$//' src/Mod/PartDesign/Scripts/Parallelepiped.py sed -i 's/\r$//' src/Mod/PartDesign/Scripts/Spring.py sed -i 's/\r$//' src/Mod/Robot/MovieTool.py +sed -i 's/\r$//' src/Mod/Robot/KukaExporter.py sed -i 's/\r$//' src/Mod/Test/unittestgui.py # Remove 3rd party libs rm src/3rdparty/Pivy -fr rm src/3rdparty/Pivy-0.5 -fr +# Resources are looked up relative to the binaries location, +# so all these need the same prefix, see src/App/Application.cpp %build %cmake \ -DCMAKE_INSTALL_PREFIX=%{x_prefix} \ + -DCMAKE_INSTALL_LIBDIR=%{x_prefix}/lib \ + -DCMAKE_INSTALL_BINDIR=%{x_prefix}/bin \ + -DCMAKE_INSTALL_DATAROOTDIR=%{_datadir} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ - -DCMAKE_INSTALL_LIBDIR=%{x_prefix}/lib \ -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \ -DOCC_INCLUDE_DIR=%{_includedir}/opencascade \ -DRESOURCEDIR=%{_datadir}/%{name} \ - -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \ -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \ -DFREECAD_USE_PYBIND11:BOOL=ON \ -DBUILD_ENABLE_CXX_STD:STRING="C++17" \ -DBUILD_QT5=ON \ - -DFREECAD_USE_QT_DIALOG:BOOL=ON \ + -DFREECAD_USE_QT_DIALOG:BOOL=OFF \ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_OPENSCAD:BOOL=ON \ - -DFREECAD_USE_EXTERNAL_SMESH=OFF \ -DBUILD_FLAT_MESH:BOOL=ON \ - -DBUILD_SMESH:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \ - -DBUILD_MESH_PART:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \ + -DFREECAD_USE_EXTERNAL_SMESH=%{?with_smesh_external:ON}%{!?with_smesh_external:OFF} \ + -DBUILD_SMESH:BOOL=ON \ + -DBUILD_MESH_PART:BOOL=ON \ -DBUILD_FEM:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \ - -DBUILD_FEM_NETGEN:BOOL=OFF \ + -DBUILD_FEM_NETGEN:BOOL=ON \ -DBUILD_FEM_VTK:BOOL=ON \ -Wno-dev \ .. @@ -231,30 +204,13 @@ %install %cmake_install -# Move icons, mimeinfo, metainfo to the correct location -mv %{buildroot}%{x_prefix}/share/* %{buildroot}%{_datadir}/ -for size in 64 48 32 16; do - mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps - mv %{buildroot}%{_datadir}/%{name}/freecad-icon-${size}.png \ - %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/org.freecadweb.FreeCAD.png -done -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/ -# Install under the correct name according to FDO shared-mime-info-spec -mv %{buildroot}%{_datadir}/%{name}/freecad-doc.png %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-extension-fcstd.png -rm %{buildroot}%{_datadir}/%{name}/freecad.xpm -rm %{buildroot}%{_datadir}/%{name}/freecad.svg - %suse_update_desktop_file -r org.freecadweb.FreeCAD Education Engineering # Remove unneeded files find %{buildroot} -type f -name "*.la" -delete -print - -# Fix rpmlint warning "doc-file-dependency" -rm -f html/installdox - -# Install development documentation manually in order to fix rpmlint warning "files-duplicate" -mkdir -p %{buildroot}%{_docdir}/%{name}-devel -#cp -a html/ %%{buildroot}%%{_docdir}/%%{name}-devel/ +rm -Rf %{buildroot}%{_datadir}/pixmaps +# Broken +rm -Rf %{buildroot}%{_datadir}/thumbnailers # Link binaries mkdir -p %{buildroot}/usr/bin ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.QpUWF3/_old 2021-04-01 14:18:00.848045654 +0200 +++ /var/tmp/diff_new_pack.QpUWF3/_new 2021-04-01 14:18:00.852045660 +0200 @@ -5,7 +5,7 @@ <size unit="G">14</size> </disk> <memory> - <size unit="G">5</size> + <size unit="G">6</size> </memory> </hardware> </constraints> ++++++ fix-smesh-vtk9.patch ++++++ --- /var/tmp/diff_new_pack.QpUWF3/_old 2021-04-01 14:18:00.860045672 +0200 +++ /var/tmp/diff_new_pack.QpUWF3/_new 2021-04-01 14:18:00.860045672 +0200 @@ -813,28 +813,3 @@ grid->GetCellPoints(vtkId, npts, pts); for (int i=0; i<npts; i++) { -diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp -index dde2bd824..3acfead65 100644 ---- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp -+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp -@@ -56,6 +56,11 @@ - - using namespace FemGui; - -+#ifdef VTK_CELL_ARRAY_V2 -+typedef const vtkIdType* vtkIdTypePtr; -+#else -+typedef vtkIdType* vtkIdTypePtr; -+#endif - - PROPERTY_SOURCE(FemGui::ViewProviderFemPostObject, Gui::ViewProviderDocumentObject) - -@@ -316,7 +321,7 @@ void ViewProviderFemPostObject::update3D() { - vtkDataArray *tcoords = NULL; - vtkCellArray *cells; - vtkIdType npts = 0; -- vtkIdType *indx = 0; -+ vtkIdTypePtr indx = 0; - - points = pd->GetPoints(); - pntData = pd->GetPointData();
