Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2023-08-09 17:34:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.11712 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Wed Aug 9 17:34:11 2023 rev:44 rq:1103158 version:0.21.0 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2023-03-27 18:17:32.683506943 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.11712/FreeCAD.changes 2023-08-09 17:34:35.944871390 +0200 @@ -1,0 +2,22 @@ +Tue Aug 8 15:49:02 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to version 0.21.0: + * Lots of bugfixes and new features, for details see + https://wiki.freecad.org/Release_notes_0.21 and + https://github.com/FreeCAD/FreeCAD/releases/tag/0.21 +- Drop upstream patches: + * 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch + * 0001-Part-OCCError.h-remove-unneeded-includes.patch + * 0001-Drawing-add-missing-include.patch + * 0001-FEM-add-missing-include.patch + * 0001-Revert-unused-parameter-warning-change.patch + * 0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch + * 0001-Fix-build-with-gcc13.patch + +------------------------------------------------------------------- +Tue Aug 8 12:01:48 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix build on aarch64, correctly link OpenGL, add + 0001-Fix-variable-name-for-OpenGL-library.patch + +------------------------------------------------------------------- Old: ---- 0001-Drawing-add-missing-include.patch 0001-FEM-add-missing-include.patch 0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch 0001-Fix-build-with-gcc13.patch 0001-Part-OCCError.h-remove-unneeded-includes.patch 0001-Revert-unused-parameter-warning-change.patch FreeCAD-0.20.2.tar.gz New: ---- 0001-Fix-variable-name-for-OpenGL-library.patch FreeCAD-0.21.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD-test.spec ++++++ --- /var/tmp/diff_new_pack.9p2P7H/_old 2023-08-09 17:34:38.008884240 +0200 +++ /var/tmp/diff_new_pack.9p2P7H/_new 2023-08-09 17:34:38.020884315 +0200 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.20.2 +Version: 0.21.0 Release: 0 Summary: Meta source package that runs the FreeCAD testsuite when built License: GPL-2.0-or-later AND LGPL-2.0-or-later ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.9p2P7H/_old 2023-08-09 17:34:38.040884439 +0200 +++ /var/tmp/diff_new_pack.9p2P7H/_new 2023-08-09 17:34:38.044884464 +0200 @@ -27,7 +27,7 @@ %bcond_without smesh Name: FreeCAD -Version: 0.20.2 +Version: 0.21.0 Release: 0 Summary: General Purpose 3D CAD Modeler License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -39,19 +39,7 @@ # PATCH-FIX-OPENSUSE Patch1: 0001-Avoid-catching-SIGSEGV-defer-to-system-services.patch # PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch -# PATCH-FIX-UPSTREAM -Patch3: 0001-Part-OCCError.h-remove-unneeded-includes.patch -# PATCH-FIX-UPSTREAM -Patch4: 0001-Drawing-add-missing-include.patch -# PATCH-FIX-UPSTREAM -Patch5: 0001-FEM-add-missing-include.patch -# PATCH-FIX-UPSTREAM -Patch6: 0001-Revert-unused-parameter-warning-change.patch -# PATCH-FIX-UPSTREAM -Patch7: 0001-FEM-femmesh-fix-AttributeError-module-numpy-has-no-a.patch -# PATCH-FIX-OPENSUSE submitted upstream here: https://github.com/FreeCAD/FreeCAD/pull/9077 -Patch8: 0001-Fix-build-with-gcc13.patch +Patch9: 0001-Fix-variable-name-for-OpenGL-library.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -71,6 +59,7 @@ BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: fdupes +BuildRequires: fmt-devel BuildRequires: glew-devel BuildRequires: hdf5-devel BuildRequires: hicolor-icon-theme @@ -92,13 +81,14 @@ # Qt5 & python3 BuildRequires: python3-devel >= 3.6.9 BuildRequires: python3-matplotlib -BuildRequires: python3-pivy +BuildRequires: python3-pivy >= 0.6.8 BuildRequires: python3-ply BuildRequires: python3-pybind11-devel BuildRequires: python3-pycxx-devel BuildRequires: python3-pyside2-devel BuildRequires: python3-vtk BuildRequires: python3-xml +BuildRequires: cmake(GTest) BuildRequires: cmake(coin) BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5OpenGL) @@ -109,6 +99,7 @@ BuildRequires: pkgconfig(Qt5WebEngineWidgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5XmlPatterns) +BuildRequires: pkgconfig(liblzma) Requires: python3-numpy Requires: python3-pyside2 Requires: python3-vtk @@ -146,9 +137,20 @@ %prep %setup -q %autopatch -p1 +# Use system gtest - https://github.com/FreeCAD/FreeCAD/issues/10126 +sed -i -e 's/add_subdirectory(lib)/find_package(GTest)/' \ + -e 's/ gtest_main / GTest::gtest_main /' \ + tests/CMakeLists.txt +# Lower Python minimum version for Leap +sed -i -e 's/3.8/3.6/' cMake/FreeCAD_Helpers/SetupPython.cmake +# Use boost::filesystem - https://github.com/FreeCAD/FreeCAD/issues/10127 +sed -i -e 's/std::filesystem/boost::filesystem/' \ + -e '/include/ s@<filesystem>@<boost/filesystem.hpp>@' \ + -e '/std::.fstream/ s@_tempFile@_tempFile.string()@' \ + tests/src/Base/Reader.cpp # fix env-script-interpreter -sed -i '1c#!%{__python3}' \ +sed -i '1 s@#!.*@#!%{__python3}@' \ src/Mod/AddonManager/AddonManager.py \ src/Mod/Mesh/App/MeshTestsApp.py \ src/Mod/Robot/KukaExporter.py \ @@ -171,6 +173,9 @@ rm src/3rdparty/Pivy -fr rm src/3rdparty/Pivy-0.5 -fr +# Remove bundled gtest +rm tests/lib -fr + # Resources are looked up relative to the binaries location, # so all these need the same prefix, see src/App/Application.cpp %build @@ -194,8 +199,9 @@ -DPYBIND11_FINDPYTHON:BOOL=ON \ -DFREECAD_USE_PYBIND11:BOOL=ON \ -DBUILD_ENABLE_CXX_STD:STRING="C++17" \ - -DBUILD_QT5=ON \ + -DFREECAD_QT_MAJOR_VERSION=5 \ -DFREECAD_USE_QT_DIALOG:BOOL=OFF \ + -DFREECAD_USE_EXTERNAL_FMT:BOOL=TRUE \ -DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \ -DBUILD_OPENSCAD:BOOL=ON \ -DBUILD_FLAT_MESH:BOOL=ON \ @@ -238,6 +244,11 @@ %fdupes %{buildroot}/%{_libdir} %fdupes %{buildroot}/%{_datadir} +%check +%ctest --test-dir tests/src/Qt +./build/tests/Tests_run +./build/tests/Sketcher_tests_run + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig ++++++ 0001-Fix-variable-name-for-OpenGL-library.patch ++++++ >From a350852845a4427ec09813b8b9e9242a1d30976f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Wed, 1 Mar 2023 02:42:56 +0100 Subject: [PATCH] Fix variable name for OpenGL library In case Qt is build with GLES libraries, it does not implicitly add the OpenGL library, and Quarter is not linked to the GL library. --- src/Gui/Quarter/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Gui/Quarter/CMakeLists.txt b/src/Gui/Quarter/CMakeLists.txt index 45ee147fdd..e840e151d0 100644 --- a/src/Gui/Quarter/CMakeLists.txt +++ b/src/Gui/Quarter/CMakeLists.txt @@ -30,7 +30,7 @@ IF (Spacenav_FOUND) ENDIF(Spacenav_FOUND) -SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARY} ${Extra_libraries}) +SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${Extra_libraries}) -- 2.39.1 ++++++ FreeCAD-0.20.2.tar.gz -> FreeCAD-0.21.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.20.2.tar.gz /work/SRC/openSUSE:Factory/.FreeCAD.new.11712/FreeCAD-0.21.0.tar.gz differ: char 12, line 1
