Skip to content

Commit d07bb5f

Browse files
chenneschennes
authored
Update libraries to the latest available versions (#32)
Remove boost-python and replace with pybind11, and fix compilation with MSVC 143.
1 parent 27df0c7 commit d07bb5f

7 files changed

Lines changed: 166 additions & 95 deletions

‎compile_all.py‎

Lines changed: 87 additions & 50 deletions
Large diffs are not rendered by default.

‎config.json‎

Lines changed: 52 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,40 @@
11
{
2-
"FreeCAD-version":"1.0.0",
3-
"LibPack-version":"3.0.0",
2+
"FreeCAD-version":"1.1.0",
3+
"LibPack-version":"3.1.0",
44
"content": [
55
{
66
"name":"python",
77
"git-repo":"https://github.com/python/cpython.git",
8-
"git-ref":"v3.12.4",
8+
"git-ref":"v3.12.7",
9+
"note1": "As of 19 November 2024, IfcOpenShell did not support Python 3.13",
10+
"note2": "pynastran 1.4.1 depends on numpy<2",
911
"requirements": [
1012
"area==1.1.1",
11-
"cmake==3.29.3",
12-
"cog==0.6.1",
13-
"configparser==7.0.0",
14-
"debugpy==1.8.2",
13+
"cmake==3.31.0.1",
14+
"cog==0.13.2",
15+
"configparser==7.1.0",
16+
"debugpy==1.8.8",
1517
"defusedxml==0.7.1",
16-
"ifcopenshell==0.7.0.240627",
17-
"ladybug-core==0.43.0",
18-
"matplotlib==3.9.1",
18+
"ifcopenshell==0.8.0",
19+
"ladybug-core==0.43.18",
20+
"matplotlib==3.9.2",
1921
"numpy==1.26.4",
2022
"opencv-python==4.10.0.84",
21-
"packaging==24.1",
22-
"pillow==10.3.0",
23+
"packaging==24.2",
24+
"pillow==11.0.0",
2325
"ply==3.11",
2426
"pycollada==0.8",
2527
"pyNastran==1.4.1",
2628
"pyshp==2.3.1",
2729
"pysolar==0.11",
28-
"PyYAML==6.0.1",
30+
"PyYAML==6.0.2",
2931
"requests==2.32.3",
3032
"rpdb2==2.0.0.1.2",
31-
"scipy==1.13.1",
33+
"scipy==1.14.1",
3234
"sets==0.3.2",
33-
"setuptools==70.0.0",
35+
"setuptools==75.5.0",
3436
"vermin==1.6.0",
35-
"wheel==0.43.0"
37+
"wheel==0.45.0"
3638
]
3739
},
3840
{
@@ -42,7 +44,7 @@
4244
},
4345
{
4446
"name":"qt",
45-
"install-directory":"C:\\Qt\\6.7.2\\msvc2019_64"
47+
"install-directory":"C:\\Qt\\6.8.1\\msvc2022_64"
4648
},
4749
{
4850
"name":"bzip2",
@@ -55,10 +57,14 @@
5557
"git-ref":"v1.6.40"
5658
},
5759
{
58-
"name":"boost",
59-
"git-repo":"https://github.com/boostorg/boost",
60-
"git-ref":"boost-1.85.0",
61-
"patches": ["patches/boost-01-msvc_14_4_support.patch"]
60+
"name":"pybind11",
61+
"git-repo":"https://github.com/pybind/pybind11",
62+
"git-ref":"v2.13.6"
63+
},
64+
{
65+
"name": "boost",
66+
"git-repo": "https://github.com/boostorg/boost",
67+
"git-ref": "boost-1.86.0"
6268
},
6369
{
6470
"name":"coin",
@@ -74,52 +80,53 @@
7480
{
7581
"name":"pcre2",
7682
"git-repo":"https://github.com/PCRE2Project/pcre2",
77-
"git-ref":"pcre2-10.42"
83+
"git-ref":"pcre2-10.44"
7884
},
7985
{
8086
"name":"swig",
8187
"git-repo":"https://github.com/swig/swig.git",
82-
"git-tag":"v4.1.1"
88+
"git-tag":"v4.3.0"
8389
},
8490
{
8591
"name":"pivy",
8692
"git-repo":"https://github.com/coin3d/pivy",
87-
"git-ref":"master"
93+
"git-ref":"0.6.9",
94+
"patches": ["patches/pivy-01-add-python-libraries.patch"]
8895
},
8996
{
9097
"name":"libclang",
91-
"url":"https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_140-based-windows-vs2019_64.7z"
98+
"url":"https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_19.1.0-based-windows-vs2019_64.7z"
9299
},
93100
{
94101
"name":"pyside",
95102
"git-repo": "http://code.qt.io/pyside/pyside-setup",
96-
"git-ref": "v6.7.2"
103+
"git-ref": "6.8.1"
97104
},
98105
{
99106
"name":"vtk",
100107
"git-repo":"https://gitlab.kitware.com/vtk/vtk.git",
101-
"git-ref":"v9.3.0",
102-
"patches": ["patches/vtk-01-add-missing-typename.patch", "patches/vtk-02-add_cast_to_specific_type.patch"]
108+
"git-ref":"v9.3.1",
109+
"patches": ["patches/vtk-02-add_cast_to_specific_type.patch"]
103110
},
104111
{
105112
"name":"harfbuzz",
106113
"git-repo":"https://github.com/harfbuzz/harfbuzz",
107-
"git-ref":"8.5.0"
114+
"git-ref":"10.1.0"
108115
},
109116
{
110117
"name":"freetype",
111118
"git-repo":"https://gitlab.freedesktop.org/freetype/freetype/",
112-
"git-ref":"VER-2-13-1"
119+
"git-ref":"VER-2-13-3"
113120
},
114121
{
115122
"name":"tcl",
116123
"git-repo":"https://github.com/tcltk/tcl",
117-
"git-ref":"core-8-6-13"
124+
"git-ref":"core-8-6-15"
118125
},
119126
{
120127
"name":"tk",
121128
"git-repo":"https://github.com/tcltk/tk",
122-
"git-ref":"core-8-6-13"
129+
"git-ref":"core-8-6-15"
123130
},
124131
{
125132
"name": "rapidjson",
@@ -133,23 +140,26 @@
133140
},
134141
{
135142
"name":"opencascade",
136-
"git-repo":"https://gitlab.com/blobfish/occt",
137-
"git-ref":"V7_8_0_BF"
143+
"git-repo":"https://github.com/FreeCAD/OCCT",
144+
"git-ref":"patched",
145+
"patches": ["patches/opencascade-01-StdPrs_BRepFont.patch"]
138146
},
139147
{
140148
"name":"netgen",
141149
"git-repo":"https://github.com/NGSolve/netgen",
142-
"git-ref":"v6.2.2403"
150+
"git-ref":"v6.2.2404",
151+
"patches": ["patches/netgen-01-python-file-include-order.patch"]
143152
},
144153
{
145154
"name":"hdf5",
146155
"git-repo":"https://github.com/HDFGroup/hdf5",
147-
"git-ref":"hdf5-1_10_8"
156+
"git-ref":"hdf5-1_12_3",
157+
"note":"Salome medfile 5.0.0 requires HDF5 1.12.x, no later version may be used"
148158
},
149159
{
150160
"name":"medfile",
151161
"git-repo":"https://github.com/chennes/med",
152-
"git-ref":"v4.1.1",
162+
"git-ref":"v5.0.0",
153163
"patches": ["patches/medfile-01-const_cast_argv.patch"]
154164
},
155165
{
@@ -166,17 +176,19 @@
166176
"name":"icu",
167177
"git-repo":"https://github.com/unicode-org/icu",
168178
"git-ref":"release-74-2",
169-
"note":"Cannot yet use the 75.x series, compilation of Xerces 3.2.5 fails against them"
179+
"note":"Cannot yet use the 75.x series, compilation of Xerces 3.2.5 fails against them",
180+
"patches": ["patches/icu-01-remove_makedata_target.patch"]
170181
},
171182
{
172183
"name":"xercesc",
173184
"git-repo":"https://github.com/apache/xerces-c",
174-
"git-ref":"v3.2.5"
185+
"git-ref":"v3.2.5",
186+
"note": "Compilation of v3.3.0 is failing under MSVC 143 as of this writing"
175187
},
176188
{
177189
"name":"libfmt",
178190
"git-repo":"https://github.com/fmtlib/fmt",
179-
"git-ref":"10.2.1"
191+
"git-ref":"11.0.2"
180192
},
181193
{
182194
"name": "yamlcpp",

‎patches/boost-01-msvc_14_4_support.patch‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎patches/icu-01-remove_makedata_target.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@@@ icu4c/source/allinone/allinone.sln @@@
2+
@@ -6375,152 +6375,8 @@
3+
ect%0A
4+
-Project(%22%7B8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942%7D%22) = %22makedata%22, %22..%5Cdata%5Cmakedata.vcxproj%22, %22%7BD9DF7F2F-93B7-4810-B5CD-96F4F33C079B%7D%22%0AEndProject%0A
5+
Proj
6+
@@ -12094,160 +12094,8 @@
7+
ect%0A
8+
-Project(%22%7B8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942%7D%22) = %22makedata_uwp%22, %22..%5Cdata%5Cmakedata_uwp.vcxproj%22, %22%7BB1D53358-37BD-48BC-B27C-68BAF1E78508%7D%22%0AEndProject%0A
9+
Proj

‎patches/netgen-01-python-file-include-order.patch‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
@@@ libsrc/meshing/python_mesh.cpp @@@
2+
@@ -1,20 +1,37 @@
3+
+#ifdef NG_PYTHON%0A
4+
#include %22pybind11/p
5+
@@ -43,25 +43,8 @@
6+
s.h%22
7+
-%0A#ifdef NG_PYTHON
8+
%0A%0A#i

‎patches/opencascade-01-StdPrs_BRepFont.patch‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@@@ src/StdPrs/StdPrs_BRepFont.cxx @@@
2+
@@ -15359,16 +15359,25 @@
3+
const
4+
+unsigned
5+
char* aT

‎patches/pivy-01-add-python-libraries.patch‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@@@ interfaces/CMakeLists.txt @@@
2+
@@ -1224,16 +1224,70 @@
3+
igobj%22)%0A
4+
+ target_link_libraries(coin PUBLIC Python::Python)%0A
5+
elseif(W

0 commit comments

Comments
 (0)