Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2020-11-29 12:31:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Sun Nov 29 12:31:48 2020 rev:27 rq:851603 version:0.18.5 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-09-22 21:10:55.235915683 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.5913/FreeCAD.changes 2020-11-29 12:33:59.482339778 +0100 @@ -1,0 +2,10 @@ +Sat Nov 28 14:08:01 UTC 2020 - Stefan Brüns <[email protected]> + +- Update to version 0.18.5: + * Fix addon manager to adapt to GitHub infrastructure changes. + * Add 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch + * Rebase 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch +- Reenable workbenches dependent on Mesher (e.g. Path, FEM): + * Add fix-smesh-vtk9.patch + +------------------------------------------------------------------- Old: ---- FreeCAD-0.18.4.obscpio FreeCAD-0.18.4.tar.xz New: ---- 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch FreeCAD-0.18.5.obscpio FreeCAD-0.18.5.tar.xz fix-smesh-vtk9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD-test.spec ++++++ --- /var/tmp/diff_new_pack.sz1IPK/_old 2020-11-29 12:34:02.630342962 +0100 +++ /var/tmp/diff_new_pack.sz1IPK/_new 2020-11-29 12:34:02.634342966 +0100 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.18.4 +Version: 0.18.5 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.sz1IPK/_old 2020-11-29 12:34:02.654342987 +0100 +++ /var/tmp/diff_new_pack.sz1IPK/_new 2020-11-29 12:34:02.658342990 +0100 @@ -26,10 +26,10 @@ %bcond_with boost_signals2 %endif # Bundled SALOME-MESH (smesh) fails to build with VTK 9.0 -%bcond_with smesh +%bcond_without smesh Name: FreeCAD -Version: 0.18.4 +Version: 0.18.5 Release: 0 Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later @@ -50,6 +50,10 @@ 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 +# 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 # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -81,6 +85,7 @@ BuildRequires: hicolor-icon-theme # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel +BuildRequires: java-devel BuildRequires: libXerces-c-devel BuildRequires: libXi-devel BuildRequires: libmed-devel @@ -190,7 +195,6 @@ rm src/3rdparty/Pivy-0.5 -fr %build -# disabled until vtk 9 support arrives: -DBUILD_MESH_PART:BOOL=ON -DBUILD_FEM:BOOL=ON %cmake \ -DCMAKE_INSTALL_PREFIX=%{x_prefix} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ ++++++ 0001-Fix-ODR-violation-correct-Ui_TaskSketcherGeneral-nam.patch ++++++ From 47be1f5e46acd7f438672b238f1e8354a494decf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Sat, 28 Nov 2020 13:35:59 +0100 Subject: [PATCH] Fix ODR violation, correct Ui_TaskSketcherGeneral namespace The generated ui_TaskSketcherGeneral.h defines the class in the SketcherGui namespace. --- src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h index eb3276ec7..c08489eeb 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h @@ -28,8 +28,6 @@ #include <Gui/Selection.h> #include <boost/signals2.hpp> -class Ui_TaskSketcherGeneral; - namespace App { class Property; } @@ -40,6 +38,7 @@ class ViewProvider; namespace SketcherGui { +class Ui_TaskSketcherGeneral; class ViewProviderSketch; class SketcherGeneralWidget : public QWidget -- 2.29.2 ++++++ 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch ++++++ ++++ 1305 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/FreeCAD/0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch ++++ and /work/SRC/openSUSE:Factory/.FreeCAD.new.5913/0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch ++++++ FreeCAD-0.18.4.obscpio -> FreeCAD-0.18.5.obscpio ++++++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.4.obscpio /work/SRC/openSUSE:Factory/.FreeCAD.new.5913/FreeCAD-0.18.5.obscpio differ: char 48, line 1 ++++++ FreeCAD-0.18.4.tar.xz -> FreeCAD-0.18.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.4.tar.xz /work/SRC/openSUSE:Factory/.FreeCAD.new.5913/FreeCAD-0.18.5.tar.xz differ: char 13, line 1 ++++++ FreeCAD.obsinfo ++++++ --- /var/tmp/diff_new_pack.sz1IPK/_old 2020-11-29 12:34:02.750343084 +0100 +++ /var/tmp/diff_new_pack.sz1IPK/_new 2020-11-29 12:34:02.750343084 +0100 @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.4 -mtime: 1582676121 -commit: 783e1346c7a078f5265c3f0c6a927d09a8c1fe70 +version: 0.18.5 +mtime: 1603973581 +commit: 734202bc810bf61bd6f66bdc060e6951bd0d134d ++++++ fix-smesh-vtk9.patch ++++++ ++++ 840 lines (skipped) _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
