Accepting request 1110358 from science
OBS-URL: https://build.opensuse.org/request/show/1110358 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeCAD?expand=0&rev=45
This commit is contained in:
Git OBS Bridge
31
0001-Implement-math.comb-fallback-for-Python-3.6.patch
Normal file
31
0001-Implement-math.comb-fallback-for-Python-3.6.patch
Normal file
@@ -0,0 +1,31 @@
|
||||
From 2e6041b656fbd3db87109ea0c116e568c7c984e8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
||||
Date: Thu, 10 Aug 2023 15:48:55 +0200
|
||||
Subject: [PATCH] Implement math.comb fallback for Python 3.6
|
||||
|
||||
---
|
||||
src/Mod/PartDesign/fcgear/involute.py | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Mod/PartDesign/fcgear/involute.py b/src/Mod/PartDesign/fcgear/involute.py
|
||||
index 15df79f..307ff6b 100644
|
||||
--- a/src/Mod/PartDesign/fcgear/involute.py
|
||||
+++ b/src/Mod/PartDesign/fcgear/involute.py
|
||||
@@ -24,7 +24,13 @@
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
|
||||
from math import cos, sin, tan, pi, acos, asin, atan, sqrt, radians
|
||||
-from math import comb as binom
|
||||
+try:
|
||||
+ from math import comb as binom
|
||||
+except ImportError:
|
||||
+ from math import factorial
|
||||
+ def binom(n, k):
|
||||
+ return 0 if k > n else \
|
||||
+ factorial(n) / (factorial(k) * factorial(n - k))
|
||||
|
||||
|
||||
def CreateExternalGear(w, m, Z, phi,
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:31a7f9aef99763904d7ffa9fd2d06e2e318e10e5306dac04710234a564fa778b
|
||||
size 66086371
|
||||
3
FreeCAD-0.21.1.tar.gz
Normal file
3
FreeCAD-0.21.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e9b1fd0323f101268c7f3be52db42e4a29222f2e306ae6c4a6fc309cb418d35a
|
||||
size 66119273
|
||||
@@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 10:55:03 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Update to version 0.21.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 4 11:39:34 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: FreeCAD-test
|
||||
Version: 0.21.0
|
||||
Version: 0.21.1
|
||||
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
|
||||
|
||||
@@ -1,10 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 10:52:51 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Update to version 0.21.1:
|
||||
* Bugfix release, for details see
|
||||
https://github.com/FreeCAD/FreeCAD/releases/tag/0.21.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 10 15:42:59 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Disable AddonManager extension on Leap 15.x, as it requires
|
||||
Python >= 3.8
|
||||
- Add 0001-Implement-math.comb-fallback-for-Python-3.6.patch
|
||||
- Minor packaging cleanups
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 8 15:49:02 UTC 2023 - Stefan Brüns <stefan.bruens@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
|
||||
https://github.com/FreeCAD/FreeCAD/releases/tag/0.21.0
|
||||
- Drop upstream patches:
|
||||
* 0001-Fix-build-with-NG-6.2.2201-include-BRepMesh_Incremen.patch
|
||||
* 0001-Part-OCCError.h-remove-unneeded-includes.patch
|
||||
|
||||
29
FreeCAD.spec
29
FreeCAD.spec
@@ -20,14 +20,17 @@
|
||||
|
||||
%if 0%{?suse_version} > 1500
|
||||
%bcond_without boost_signals2
|
||||
# The AddonManager requires Python >= 3.8
|
||||
%bcond_without fc_addonmanager
|
||||
%else
|
||||
%bcond_with boost_signals2
|
||||
%bcond_with fc_addonmanager
|
||||
%endif
|
||||
%bcond_with smesh_external
|
||||
%bcond_without smesh
|
||||
|
||||
Name: FreeCAD
|
||||
Version: 0.21.0
|
||||
Version: 0.21.1
|
||||
Release: 0
|
||||
Summary: General Purpose 3D CAD Modeler
|
||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||
@@ -38,6 +41,8 @@ Source0: https://github.com/FreeCAD/FreeCAD/archive/refs/tags/%{version}.
|
||||
Patch0: 0001-Gui-Quarter-Add-missing-OpenGL-includes.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch1: 0001-Avoid-catching-SIGSEGV-defer-to-system-services.patch
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch2: 0001-Implement-math.comb-fallback-for-Python-3.6.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch9: 0001-Fix-variable-name-for-OpenGL-library.patch
|
||||
|
||||
@@ -139,7 +144,8 @@ This package contains the files needed for development with FreeCAD.
|
||||
%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 /' \
|
||||
-e 's/ gtest_main/ GTest::gtest_main/' \
|
||||
-e 's/ gmock_main/ GTest::gmock_main/' \
|
||||
tests/CMakeLists.txt
|
||||
# Lower Python minimum version for Leap
|
||||
sed -i -e 's/3.8/3.6/' cMake/FreeCAD_Helpers/SetupPython.cmake
|
||||
@@ -153,11 +159,14 @@ sed -i -e 's/std::filesystem/boost::filesystem/' \
|
||||
sed -i '1 s@#!.*@#!%{__python3}@' \
|
||||
src/Mod/AddonManager/AddonManager.py \
|
||||
src/Mod/Mesh/App/MeshTestsApp.py \
|
||||
src/Mod/Part/parttests/ColorPerFaceTest.py \
|
||||
src/Mod/Part/parttests/TopoShapeListTest.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
|
||||
src/Mod/Test/testmakeWireString.py \
|
||||
src/Mod/Test/unittestgui.py
|
||||
|
||||
# Fix "wrong-script-end-of-line-encoding" rpmlint warning
|
||||
sed -i 's/\r$//' src/Mod/Mesh/App/MeshTestsApp.py
|
||||
@@ -211,6 +220,7 @@ rm tests/lib -fr
|
||||
-DBUILD_FEM:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
|
||||
-DBUILD_FEM_NETGEN:BOOL=ON \
|
||||
-DBUILD_FEM_VTK:BOOL=ON \
|
||||
-DBUILD_ADDONMGR:BOOL=%{?with_fc_addonmanager:ON}%{!?with_fc_addonmanager:OFF} \
|
||||
-Wno-dev \
|
||||
..
|
||||
|
||||
@@ -221,18 +231,25 @@ rm tests/lib -fr
|
||||
|
||||
# Fix "non-executable-script" rpmlint warning
|
||||
# Run after install, as CMake "install(FILES...) sets rw- permissions
|
||||
chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/AddonManager/AddonManager.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Robot/KukaExporter.py \
|
||||
%if %{with fc_addonmanager}
|
||||
chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/AddonManager/AddonManager.py
|
||||
%endif
|
||||
chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/Robot/KukaExporter.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Robot/MovieTool.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Spreadsheet/importXLSX.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/TechDraw/TDTest/D*Test.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Test/testmakeWireString.py
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Test/testmakeWireString.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Mesh/MeshTestsApp.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Part/parttests/ColorPerFaceTest.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Part/parttests/TopoShapeListTest.py \
|
||||
%{buildroot}%{_libdir}/FreeCAD/Mod/Test/unittestgui.py
|
||||
|
||||
%suse_update_desktop_file -r org.freecadweb.FreeCAD Education Engineering
|
||||
|
||||
# Remove unneeded files
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
rm -Rf %{buildroot}%{_datadir}/pixmaps
|
||||
rm %{buildroot}%{x_prefix}/include/E57Format/E57Export.h
|
||||
# Broken
|
||||
rm -Rf %{buildroot}%{_datadir}/thumbnailers
|
||||
|
||||
|
||||
Reference in New Issue
Block a user