Skip to content

Commit 3e09439

Browse files
al20oval20ov
committed
freecad: update to 1.1.0.
1 parent 02aa565 commit 3e09439

6 files changed

Lines changed: 29 additions & 88 deletions

File tree

‎common/shlibs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3397,6 +3397,7 @@ libvtkFiltersHyperTree-9.5.so.1 vtk-9.5.0_1
33973397
libvtkIOExportPDF-9.5.so.1 vtk-9.5.0_1
33983398
libvtkImagingGeneral-9.5.so.1 vtk-9.5.0_1
33993399
libvtkIOXML-9.5.so.1 vtk-9.5.0_1
3400+
libvtkWrappingPythonCore3.14-9.5.so.1 vtk-python3-9.5.0_1
34003401
libvtkIOChemistry-9.5.so.1 vtk-9.5.0_1
34013402
libvtkInteractionStyle-9.5.so.1 vtk-9.5.0_1
34023403
libvtkFiltersAMR-9.5.so.1 vtk-9.5.0_1

‎srcpkgs/freecad/patches/boost-1.89.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
set(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})
66

7-
- set (BOOST_COMPONENTS filesystem program_options regex system thread date_time)
8-
+ set (BOOST_COMPONENTS filesystem program_options thread)
7+
- set (BOOST_COMPONENTS program_options regex thread date_time)
8+
+ set (BOOST_COMPONENTS program_options thread)
99
find_package(Boost ${BOOST_MIN_VERSION}
1010
COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
1111

‎srcpkgs/freecad/patches/includes.patch‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
--- a/src/Base/Builder3D.h
2-
+++ b/src/Base/Builder3D.h
3-
@@ -26,6 +26,7 @@
1+
--- a/src/Base/UnlimitedUnsigned.h
2+
+++ b/src/Base/UnlimitedUnsigned.h
3+
@@ -31,6 +31,7 @@
4+
#include <vector>
5+
#include <string>
6+
#include <stdexcept>
7+
+#include <cstdint>
48

5-
// Std. configurations
9+
// ----------------------------------------------------------------------------
610

7-
+#include <cstdint>
8-
#include <sstream>
9-
#include <vector>
10-
#include <Base/Tools3D.h>
11-
--- a/src/Base/FileInfo.cpp
12-
+++ b/src/Base/FileInfo.cpp
13-
@@ -22,6 +22,7 @@
14-
***************************************************************************/
15-
16-
17-
+#include <limits.h>
18-
#include "PreCompiled.h"
19-
20-
#ifndef _PreComp_

‎srcpkgs/freecad/patches/occ790.patch‎

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

‎srcpkgs/freecad/patches/pyregex.patch‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,6 @@
1-
--- a/src/Mod/BIM/importers/importIFClegacy.py
2-
+++ b/src/Mod/BIM/importers/importIFClegacy.py
3-
@@ -1433,9 +1433,9 @@
4-
entity = {}
5-
raw_entity_str = m.groups()[0]
6-
7-
- entity["name"] = re.search("(.*?)[;|\s]", raw_entity_str).groups()[0].upper()
8-
+ entity["name"] = re.search(r"(.*?)[;|\s]", raw_entity_str).groups()[0].upper()
9-
10-
- subtypeofmatch = re.search(".*SUBTYPE OF \((.*?)\);", raw_entity_str)
11-
+ subtypeofmatch = re.search(r".*SUBTYPE OF \((.*?)\);", raw_entity_str)
12-
entity["supertype"] = subtypeofmatch.groups()[0].upper() if subtypeofmatch else None
13-
14-
# find the shortest string matched from the end of the entity type header to the
15-
--- a/src/Mod/CAM/CAMTests/TestPathPost.py
16-
+++ b/src/Mod/CAM/CAMTests/TestPathPost.py
17-
@@ -40,7 +40,7 @@
18-
19-
20-
class TestFileNameGenerator(unittest.TestCase):
21-
- """
22-
+ r"""
23-
String substitution allows the following:
24-
%D ... directory of the active document
25-
%d ... name of the active document (with extension)
26-
--- a/src/Mod/CAM/Path/Post/scripts/gcode_pre.py
27-
+++ b/src/Mod/CAM/Path/Post/scripts/gcode_pre.py
28-
@@ -191,7 +191,7 @@
29-
p = re.compile(r"[mM]+?\s?0?6\s?T\d*\s")
30-
31-
# split the gcode on tool changes
32-
- paths = re.split("([mM]+?\s?0?6\s?T\d*\s)", gcode)
33-
+ paths = re.split(r"([mM]+?\s?0?6\s?T\d*\s)", gcode)
34-
35-
# iterate the gcode sections and add customs for each
36-
toolnumber = 0
371
--- a/src/Mod/Robot/KukaExporter.py
382
+++ b/src/Mod/Robot/KukaExporter.py
39-
@@ -21,7 +21,7 @@
3+
@@ -20,7 +20,7 @@
404
DECL LDAT LCPDAT1={VEL 2.0,ACC 100.0,APO_DIST 100.0,APO_FAC 50.0,ORI_TYP #VAR}
415
"""
426

‎srcpkgs/freecad/template‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Template file for 'freecad'
22
pkgname=freecad
3-
version=1.0.2
4-
revision=9
5-
_pycxx_ver=7.1.8
6-
_ondsel_ver=09d6175a2ba69e7016fcecc4f384946a2f84f92d
3+
version=1.1.0
4+
revision=1
5+
_ondsel_ver=30e9b64e8bf881d438d4b88834f9ba3674865418
6+
_addonmgr_ver=937b6877239dc78ef59eeefe8099e5f14243eda1
77
build_style=cmake
88
pycompile_dirs="usr/lib/${pkgname}/Mod"
99
_inst_prefix=/usr/lib/${pkgname}
@@ -14,7 +14,7 @@ configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON
1414
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname}
1515
-DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3"
1616
hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools
17-
python3-matplotlib python3-pivy"
17+
python3-matplotlib python3-pivy python3-pybind11"
1818
makedepends="boost-devel-minimal boost-python3 libboost_filesystem
1919
libboost_thread libboost_program_options
2020
libxerces-c-devel zlib-devel occt-devel vtk-devel
@@ -24,20 +24,21 @@ makedepends="boost-devel-minimal boost-python3 libboost_filesystem
2424
qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
2525
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
2626
python3-pyside6-gui python3-pyside6-network python3-pyside6-printsupport
27-
python3-pyside6-ui-tools python3-pyside6-widgets"
27+
python3-pyside6-ui-tools python3-pyside6-widgets vtk-python3
28+
python3-pyside6-svg"
2829
short_desc="General purpose 3D CAD modeler"
2930
maintainer="Orphaned <orphan@voidlinux.org>"
3031
license="LGPL-2.0-or-later"
3132
homepage="https://freecadweb.org/"
3233
distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
33-
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxx_ver}.tar.gz
34-
https://github.com/FreeCAD/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz"
35-
checksum="228ee52f00627c7d8fa61998179deb01865ece69390829feb1300228d24f7e9e
36-
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6
37-
890fb6ddeb1b42face95854689ff7b96c926c368b7d616d9e31e4b35f79ddde8"
34+
https://github.com/FreeCAD/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz
35+
https://github.com/FreeCAD/AddonManager/archive/${_addonmgr_ver}.tar.gz>AddonManager-${_addonmgr_ver}.tar.gz"
36+
checksum="b99b932037eb801a66b5f66ac46968a0da3654a1774ee12f28781b43de34daf6
37+
77646ca7d8cbc6dc4e8304439be2ff2b9aecf397e6349e63b3b06e65dfed79c3
38+
70b2fa7f3c58c0ea5be830de90d33369670ee6658f13aeb7684f1ea478528178"
3839
python_version=3
39-
skip_extraction="pycxx-${_pycxx_ver}.tar.gz
40-
OndselSolver-${_ondsel_ver}.tar.gz"
40+
skip_extraction="OndselSolver-${_ondsel_ver}.tar.gz
41+
AddonManager-${_addonmgr_ver}.tar.gz"
4142

4243
if [ "$XBPS_TARGET_LIBC" = musl ]; then
4344
makedepends+=" libexecinfo-devel"
@@ -48,9 +49,7 @@ CXXFLAGS="-DPYCXX_PYTHON_2TO3"
4849

4950
post_extract() {
5051
vsrcextract -C src/3rdParty/OndselSolver "OndselSolver-${_ondsel_ver}.tar.gz"
51-
vsrcextract -C pycxx "pycxx-${_pycxx_ver}.tar.gz"
52-
rm -r src/CXX
53-
ln -Tsr ./pycxx/CXX src/CXX
52+
vsrcextract -C src/Mod/AddonManager "AddonManager-${_addonmgr_ver}.tar.gz"
5453
}
5554

5655
post_patch() {
@@ -68,8 +67,8 @@ post_patch() {
6867
}
6968

7069
pre_configure() {
71-
configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx
72-
-DPYCXX_SOURCE_DIR=${wrksrc}/pycxx/Src"
70+
configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/src/3rdParty/PyCXX
71+
-DPYCXX_SOURCE_DIR=${wrksrc}/src/3rdParty/PyCXX/CXX"
7372
}
7473

7574
post_install() {

0 commit comments

Comments
 (0)