freecad: update to 1.0.0.
This commit is contained in:
classabbyamp
classabbyamp
parent
474b50ba16
commit
122c003806
3 changed files with 48 additions and 322 deletions
|
|
@ -1,81 +1,6 @@
|
||||||
--- a/src/Mod/Arch/ArchAxis.py
|
--- a/src/Mod/BIM/importers/importIFClegacy.py
|
||||||
+++ b/src/Mod/Arch/ArchAxis.py
|
+++ b/src/Mod/BIM/importers/importIFClegacy.py
|
||||||
@@ -451,7 +451,7 @@ class _ViewProviderAxis:
|
@@ -1433,9 +1433,9 @@
|
||||||
except Exception:
|
|
||||||
# workaround for pivy SoInput.setBuffer() bug
|
|
||||||
buf = buf.replace("\n","")
|
|
||||||
- pts = re.findall("point \[(.*?)\]",buf)[0]
|
|
||||||
+ pts = re.findall(r"point \[(.*?)\]",buf)[0]
|
|
||||||
pts = pts.split(",")
|
|
||||||
pc = []
|
|
||||||
for point in pts:
|
|
||||||
--- a/src/Mod/Arch/ArchRebar.py
|
|
||||||
+++ b/src/Mod/Arch/ArchRebar.py
|
|
||||||
@@ -556,7 +556,7 @@ class _ViewProviderRebar(ArchComponent.ViewProviderComponent):
|
|
||||||
import re
|
|
||||||
self.centerline = coin.SoSeparator()
|
|
||||||
comp = Part.makeCompound(obj.Proxy.wires)
|
|
||||||
- pts = re.findall("point \[(.*?)\]",comp.writeInventor().replace("\n",""))
|
|
||||||
+ pts = re.findall(r"point \[(.*?)\]",comp.writeInventor().replace("\n",""))
|
|
||||||
pts = [p.split(",") for p in pts]
|
|
||||||
for pt in pts:
|
|
||||||
ps = coin.SoSeparator()
|
|
||||||
--- a/src/Mod/Arch/ArchSectionPlane.py
|
|
||||||
+++ b/src/Mod/Arch/ArchSectionPlane.py
|
|
||||||
@@ -748,7 +748,7 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face
|
|
||||||
wp.alignToPointAndAxis_SVG(Vector(0,0,0),cutplane.normalAt(0,0),0)
|
|
||||||
p = wp.getLocalCoords(markervec)
|
|
||||||
orlength = FreeCAD.Vector(p.x,p.y,0).Length
|
|
||||||
- marker = re.findall("<line x1=.*?stroke=\"\#ffffff\".*?\/>",svg)
|
|
||||||
+ marker = re.findall(r'<line x1=.*?stroke="#ffffff".*?/>',svg)
|
|
||||||
if marker:
|
|
||||||
marker = marker[0].split("\"")
|
|
||||||
x1 = float(marker[1])
|
|
||||||
@@ -764,7 +764,7 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face
|
|
||||||
scaledp1 = FreeCAD.Vector(p1.x*factor,p1.y*factor,0)
|
|
||||||
trans = orig.sub(scaledp1)
|
|
||||||
# remove marker
|
|
||||||
- svg = re.sub("<line x1=.*?stroke=\"\#ffffff\".*?\/>","",svg,count=1)
|
|
||||||
+ svg = re.sub(r'<line x1=.*?stroke="#ffffff".*?/>',"",svg,count=1)
|
|
||||||
|
|
||||||
# remove background rectangle
|
|
||||||
svg = re.sub("<path.*?>","",svg,count=1,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
@@ -792,9 +792,9 @@ def getCoinSVG(cutplane,objs,cameradata=None,linewidth=0.2,singleface=False,face
|
|
||||||
QtCore.QTimer.singleShot(1,lambda: closeViewer(view_window_name))
|
|
||||||
|
|
||||||
# strip svg tags (needed for TD Arch view)
|
|
||||||
- svg = re.sub("<\?xml.*?>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
- svg = re.sub("<svg.*?>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
- svg = re.sub("<\/svg>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
+ svg = re.sub(r"<\?xml.*?>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
+ svg = re.sub(r"<svg.*?>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
+ svg = re.sub(r"<\/svg>","",svg,flags=re.MULTILINE|re.DOTALL)
|
|
||||||
|
|
||||||
ISRENDERING = False
|
|
||||||
|
|
||||||
--- a/src/Mod/Arch/ArchSite.py
|
|
||||||
+++ b/src/Mod/Arch/ArchSite.py
|
|
||||||
@@ -92,7 +92,7 @@ def toNode(shape):
|
|
||||||
from pivy import coin
|
|
||||||
buf = shape.writeInventor(2,0.01)
|
|
||||||
buf = buf.replace("\n","")
|
|
||||||
- buf = re.findall("point \[(.*?)\]",buf)
|
|
||||||
+ buf = re.findall(r"point \[(.*?)\]",buf)
|
|
||||||
pts = []
|
|
||||||
for c in buf:
|
|
||||||
pts.extend(c.split(","))
|
|
||||||
--- a/src/Mod/Arch/importIFClegacy.py
|
|
||||||
+++ b/src/Mod/Arch/importIFClegacy.py
|
|
||||||
@@ -39,7 +39,7 @@ SCHEMA = "http://www.steptools.com/support/stdev_docs/ifcbim/ifc4.exp" # only fo
|
|
||||||
MAKETEMPFILES = False # if True, shapes are passed from ifcopenshell to freecad through temp files
|
|
||||||
DEBUG = True # this is only for the python console, this value is overridden when importing through the GUI
|
|
||||||
SKIP = ["IfcBuildingElementProxy","IfcFlowTerminal","IfcFurnishingElement"] # default. overwritten by the GUI options
|
|
||||||
-IFCLINE_RE = re.compile("#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\\r]?$")
|
|
||||||
+IFCLINE_RE = re.compile(r"#(\d+)[ ]?=[ ]?(.*?)\((.*)\);[\r]?$")
|
|
||||||
PRECISION = 4 # rounding value, in number of digits
|
|
||||||
APPLYFIX = True # if true, the ifcopenshell bug-fixing function is applied when saving files
|
|
||||||
# end config
|
|
||||||
@@ -1440,9 +1440,9 @@ class IfcSchema:
|
|
||||||
entity = {}
|
entity = {}
|
||||||
raw_entity_str = m.groups()[0]
|
raw_entity_str = m.groups()[0]
|
||||||
|
|
||||||
|
|
@ -87,172 +12,21 @@
|
||||||
entity["supertype"] = subtypeofmatch.groups()[0].upper() if subtypeofmatch else None
|
entity["supertype"] = subtypeofmatch.groups()[0].upper() if subtypeofmatch else None
|
||||||
|
|
||||||
# find the shortest string matched from the end of the entity type header to the
|
# find the shortest string matched from the end of the entity type header to the
|
||||||
--- a/src/Mod/Draft/draftguitools/gui_trackers.py
|
--- a/src/Mod/CAM/CAMTests/TestPathPost.py
|
||||||
+++ b/src/Mod/Draft/draftguitools/gui_trackers.py
|
+++ b/src/Mod/CAM/CAMTests/TestPathPost.py
|
||||||
@@ -423,7 +423,7 @@ class bsplineTracker(Tracker):
|
@@ -40,7 +40,7 @@
|
||||||
except Exception:
|
|
||||||
# workaround for pivy SoInput.setBuffer() bug
|
|
||||||
buf = buf.replace("\n", "")
|
|
||||||
- pts = re.findall("point \[(.*?)\]", buf)[0]
|
|
||||||
+ pts = re.findall(r"point \[(.*?)\]", buf)[0]
|
|
||||||
pts = pts.split(",")
|
|
||||||
pc = []
|
|
||||||
for p in pts:
|
|
||||||
@@ -501,7 +501,7 @@ class bezcurveTracker(Tracker):
|
|
||||||
except Exception:
|
|
||||||
# workaround for pivy SoInput.setBuffer() bug
|
|
||||||
buf = buf.replace("\n","")
|
|
||||||
- pts = re.findall("point \[(.*?)\]", buf)[0]
|
|
||||||
+ pts = re.findall(r"point \[(.*?)\]", buf)[0]
|
|
||||||
pts = pts.split(",")
|
|
||||||
pc = []
|
|
||||||
for p in pts:
|
|
||||||
@@ -636,7 +636,7 @@ class arcTracker(Tracker):
|
|
||||||
except Exception:
|
|
||||||
# workaround for pivy SoInput.setBuffer() bug
|
|
||||||
buf = buf.replace("\n", "")
|
|
||||||
- pts = re.findall("point \[(.*?)\]", buf)[0]
|
|
||||||
+ pts = re.findall(r"point \[(.*?)\]", buf)[0]
|
|
||||||
pts = pts.split(",")
|
|
||||||
pc = []
|
|
||||||
for p in pts:
|
|
||||||
--- a/src/Mod/Draft/importAirfoilDAT.py
|
|
||||||
+++ b/src/Mod/Draft/importAirfoilDAT.py
|
|
||||||
@@ -4,12 +4,6 @@
|
|
||||||
# \brief Airfoil (.dat) file importer
|
|
||||||
#
|
|
||||||
# This module provides support for importing airfoil .dat files
|
|
||||||
-'''@package importAirfoilDAT
|
|
||||||
-\ingroup DRAFT
|
|
||||||
-\brief Airfoil (.dat) file importer
|
|
||||||
-
|
|
||||||
-This module provides support for importing airfoil .dat files.
|
|
||||||
-'''
|
|
||||||
# Check code with
|
|
||||||
# flake8 --ignore=E226,E266,E401,W503
|
|
||||||
|
|
||||||
--- a/src/Mod/Draft/importDXF.py
|
|
||||||
+++ b/src/Mod/Draft/importDXF.py
|
|
||||||
@@ -233,9 +233,9 @@ def deformat(text):
|
|
||||||
# t = re.sub('{([^!}]([^}]|\n)*)}', '', text)
|
|
||||||
# print("input text: ",text)
|
|
||||||
t = text.strip("{}")
|
|
||||||
- t = re.sub("\\\.*?;", "", t)
|
|
||||||
+ t = re.sub(r"\\.*?;", "", t)
|
|
||||||
# replace UTF codes by utf chars
|
|
||||||
- sts = re.split("\\\\(U\+....)", t)
|
|
||||||
+ sts = re.split(r"\\(U\+....)", t)
|
|
||||||
t = u"".join(sts)
|
|
||||||
# replace degrees, diameters chars
|
|
||||||
t = re.sub('%%d', u'°', t)
|
|
||||||
@@ -3863,7 +3863,7 @@ def exportPage(page, filename):
|
|
||||||
blocks = ""
|
|
||||||
entities = ""
|
|
||||||
r12 = False
|
|
||||||
- ver = re.findall("\$ACADVER\n.*?\n(.*?)\n", template)
|
|
||||||
+ ver = re.findall(r"\$ACADVER\n.*?\n(.*?)\n", template)
|
|
||||||
if ver:
|
|
||||||
# at the moment this is not used.
|
|
||||||
# TODO: if r12, do not print ellipses or splines
|
|
||||||
--- a/src/Mod/Draft/importOCA.py
|
|
||||||
+++ b/src/Mod/Draft/importOCA.py
|
|
||||||
@@ -2,17 +2,14 @@
|
|
||||||
## @package importOCA
|
|
||||||
# \ingroup DRAFT
|
|
||||||
# \brief OCA (Open CAD Format) file importer & exporter
|
|
||||||
-'''@package importOCA
|
|
||||||
-\ingroup DRAFT
|
|
||||||
-\brief OCA (Open CAD Format) file importer & exporter
|
|
||||||
+#
|
|
||||||
+# This module provides support for importing from and exporting to
|
|
||||||
+# the OCA format or GCAD format from GCAD3D (http://www.gcad3d.org/).
|
|
||||||
+# See: https://groups.google.com/forum/#!forum/open_cad_format
|
|
||||||
+#
|
|
||||||
+# As of 2019 this file format is practically obsolete, and this module is not
|
|
||||||
+# maintained.
|
|
||||||
|
|
||||||
-This module provides support for importing from and exporting to
|
class TestFileNameGenerator(unittest.TestCase):
|
||||||
-the OCA format or GCAD format from GCAD3D (http://www.gcad3d.org/).
|
- """
|
||||||
-See: https://groups.google.com/forum/#!forum/open_cad_format
|
+ r"""
|
||||||
-
|
String substitution allows the following:
|
||||||
-As of 2019 this file format is practically obsolete, and this module is not
|
%D ... directory of the active document
|
||||||
-maintained.
|
%d ... name of the active document (with extension)
|
||||||
-'''
|
--- a/src/Mod/CAM/Path/Post/scripts/gcode_pre.py
|
||||||
# Check code with
|
+++ b/src/Mod/CAM/Path/Post/scripts/gcode_pre.py
|
||||||
# flake8 --ignore=E226,E266,E401,W503
|
@@ -191,7 +191,7 @@
|
||||||
|
p = re.compile(r"[mM]+?\s?0?6\s?T\d*\s")
|
||||||
--- a/src/Mod/Draft/importSVG.py
|
|
||||||
+++ b/src/Mod/Draft/importSVG.py
|
|
||||||
@@ -73,8 +73,7 @@ else:
|
|
||||||
draftui = None
|
|
||||||
|
|
||||||
# Save the native open function to avoid collisions
|
|
||||||
-if open.__module__ in ['__builtin__', 'io']:
|
|
||||||
- pythonopen = open
|
|
||||||
+pythonopen = open
|
|
||||||
|
|
||||||
svgcolors = {
|
|
||||||
'Pink': (255, 192, 203),
|
|
||||||
@@ -413,8 +412,8 @@ def getsize(length, mode='discard', base=1):
|
|
||||||
}
|
|
||||||
|
|
||||||
# Extract a number from a string like '+56215.14565E+6mm'
|
|
||||||
- _num = '([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)'
|
|
||||||
- _unit = '(px|pt|pc|mm|cm|in|em|ex|%)?'
|
|
||||||
+ _num = r"([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)"
|
|
||||||
+ _unit = r"(px|pt|pc|mm|cm|in|em|ex|%)?"
|
|
||||||
_full_num = _num + _unit
|
|
||||||
number, exponent, unit = re.findall(_full_num, length)[0]
|
|
||||||
if mode == 'discard':
|
|
||||||
@@ -729,7 +728,7 @@ class svgHandler(xml.sax.ContentHandler):
|
|
||||||
if 'inkscape:version' in data:
|
|
||||||
inks_doc_name = attrs.getValue('sodipodi:docname')
|
|
||||||
inks_full_ver = attrs.getValue('inkscape:version')
|
|
||||||
- inks_ver_pars = re.search("\d+\.\d+", inks_full_ver)
|
|
||||||
+ inks_ver_pars = re.search(r"\d+\.\d+", inks_full_ver)
|
|
||||||
if inks_ver_pars is not None:
|
|
||||||
inks_ver_f = float(inks_ver_pars.group(0))
|
|
||||||
else:
|
|
||||||
@@ -930,13 +929,13 @@ class svgHandler(xml.sax.ContentHandler):
|
|
||||||
self.lastdim = obj
|
|
||||||
data['d'] = []
|
|
||||||
|
|
||||||
- _op = '([mMlLhHvVaAcCqQsStTzZ])'
|
|
||||||
- _op2 = '([^mMlLhHvVaAcCqQsStTzZ]*)'
|
|
||||||
- _command = '\s*?' + _op + '\s*?' + _op2 + '\s*?'
|
|
||||||
+ _op = r"([mMlLhHvVaAcCqQsStTzZ])"
|
|
||||||
+ _op2 = r"([^mMlLhHvVaAcCqQsStTzZ]*)"
|
|
||||||
+ _command = r"\s*?" + _op + r"\s*?" + _op2 + r"\s*?"
|
|
||||||
pathcommandsre = re.compile(_command, re.DOTALL)
|
|
||||||
|
|
||||||
- _num = '[-+]?[0-9]*\.?[0-9]+'
|
|
||||||
- _exp = '([eE][-+]?[0-9]+)?'
|
|
||||||
+ _num = r"[-+]?[0-9]*\.?[0-9]+"
|
|
||||||
+ _exp = r"([eE][-+]?[0-9]+)?"
|
|
||||||
_point = '(' + _num + _exp + ')'
|
|
||||||
pointsre = re.compile(_point, re.DOTALL)
|
|
||||||
_commands = pathcommandsre.findall(' '.join(data['d']))
|
|
||||||
@@ -1616,9 +1615,9 @@ class svgHandler(xml.sax.ContentHandler):
|
|
||||||
Base::Matrix4D
|
|
||||||
The translated matrix.
|
|
||||||
"""
|
|
||||||
- _op = '(matrix|translate|scale|rotate|skewX|skewY)'
|
|
||||||
- _val = '\((.*?)\)'
|
|
||||||
- _transf = _op + '\s*?' + _val
|
|
||||||
+ _op = r"(matrix|translate|scale|rotate|skewX|skewY)"
|
|
||||||
+ _val = r"\((.*?)\)"
|
|
||||||
+ _transf = _op + r"\s*?" + _val
|
|
||||||
transformre = re.compile(_transf, re.DOTALL)
|
|
||||||
m = FreeCAD.Matrix()
|
|
||||||
for transformation, arguments in transformre.findall(tr):
|
|
||||||
--- a/src/Mod/Path/Path/Post/scripts/gcode_pre.py
|
|
||||||
+++ b/src/Mod/Path/Path/Post/scripts/gcode_pre.py
|
|
||||||
@@ -191,10 +191,10 @@ def _identifygcodeByToolNumberList(filename):
|
|
||||||
gfile.close()
|
|
||||||
|
|
||||||
# Regular expression to match tool changes in the format 'M6 Tn'
|
|
||||||
- p = re.compile("[mM]+?\s?0?6\s?T\d*\s")
|
|
||||||
+ p = re.compile(r"[mM]+?\s?0?6\s?T\d*\s")
|
|
||||||
|
|
||||||
# split the gcode on tool changes
|
# split the gcode on tool changes
|
||||||
- paths = re.split("([mM]+?\s?0?6\s?T\d*\s)", gcode)
|
- paths = re.split("([mM]+?\s?0?6\s?T\d*\s)", gcode)
|
||||||
|
|
@ -260,20 +34,9 @@
|
||||||
|
|
||||||
# iterate the gcode sections and add customs for each
|
# iterate the gcode sections and add customs for each
|
||||||
toolnumber = 0
|
toolnumber = 0
|
||||||
--- a/src/Mod/Path/PathTests/TestPathPost.py
|
|
||||||
+++ b/src/Mod/Path/PathTests/TestPathPost.py
|
|
||||||
@@ -352,7 +352,7 @@ class TestBuildPostList(unittest.TestCase):
|
|
||||||
|
|
||||||
class TestOutputNameSubstitution(unittest.TestCase):
|
|
||||||
|
|
||||||
- """
|
|
||||||
+ r"""
|
|
||||||
String substitution allows the following:
|
|
||||||
%D ... directory of the active document
|
|
||||||
%d ... name of the active document (with extension)
|
|
||||||
--- a/src/Mod/Robot/KukaExporter.py
|
--- a/src/Mod/Robot/KukaExporter.py
|
||||||
+++ b/src/Mod/Robot/KukaExporter.py
|
+++ b/src/Mod/Robot/KukaExporter.py
|
||||||
@@ -21,7 +21,7 @@ DECL FDAT FP4={TOOL_NO 1,BASE_NO 0,IPO_FRAME #BASE,POINT2[] " "}
|
@@ -21,7 +21,7 @@
|
||||||
DECL LDAT LCPDAT1={VEL 2.0,ACC 100.0,APO_DIST 100.0,APO_FAC 50.0,ORI_TYP #VAR}
|
DECL LDAT LCPDAT1={VEL 2.0,ACC 100.0,APO_DIST 100.0,APO_FAC 50.0,ORI_TYP #VAR}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
diff --git a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
|
|
||||||
index 7f89573efd..47a52fe585 100644
|
|
||||||
--- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
|
|
||||||
+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
|
|
||||||
@@ -39,10 +39,6 @@
|
|
||||||
#define SMDS_EXPORT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#ifdef VTK_HAS_MTIME_TYPE
|
|
||||||
#define VTK_MTIME_TYPE vtkMTimeType
|
|
||||||
-#else
|
|
||||||
-#define VTK_MTIME_TYPE unsigned long
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
|
|
||||||
index 7e3de0070a..e9895d6157 100644
|
|
||||||
--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
|
|
||||||
+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
|
|
||||||
@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
|
|
||||||
GetLinks()->Allocate(this->GetNumberOfPoints());
|
|
||||||
GetLinks()->Register(this);
|
|
||||||
//FIXME: vtk9
|
|
||||||
+ #if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
|
|
||||||
GetLinks()->BuildLinks(this);
|
|
||||||
+ #else
|
|
||||||
+ GetLinks()->SetDataSet(this);
|
|
||||||
+ GetLinks()->BuildLinks();
|
|
||||||
+ #endif
|
|
||||||
GetLinks()->Delete();
|
|
||||||
#else
|
|
||||||
this->Links = SMDS_CellLinks::New();
|
|
||||||
|
|
@ -1,47 +1,40 @@
|
||||||
# Template file for 'freecad'
|
# Template file for 'freecad'
|
||||||
pkgname=freecad
|
pkgname=freecad
|
||||||
version=0.21.2
|
version=1.0.0
|
||||||
revision=2
|
revision=1
|
||||||
build_wrksrc="FreeCAD-${version}"
|
_pycxx_ver=7.1.8
|
||||||
|
_ondsel_ver=91f70382beeb58b32432b5a82da3802e4c19199c
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
pycompile_dirs="usr/lib/${pkgname}/Mod"
|
pycompile_dirs="usr/lib/${pkgname}/Mod"
|
||||||
_inst_prefix=/usr/lib/${pkgname}
|
_inst_prefix=/usr/lib/${pkgname}
|
||||||
configure_args="
|
configure_args="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_GUI=ON
|
||||||
-DPYTHON_EXECUTABLE=/usr/bin/python3
|
-DFREECAD_QT_VERSION=6 -DBUILD_FEM_NETGEN=OFF -DBUILD_FLAT_MESH=ON
|
||||||
-DBUILD_QT5=ON
|
-DENABLE_DEVELOPER_TESTS=OFF -DBUILD_TEST=OFF
|
||||||
-DBUILD_FEM_NETGEN=OFF
|
-DFREECAD_USE_EXTERNAL_PIVY=ON -DCMAKE_INSTALL_PREFIX=${_inst_prefix}
|
||||||
-DBUILD_FLAT_MESH=ON
|
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share -DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname}
|
||||||
-DCMAKE_INSTALL_PREFIX=${_inst_prefix}
|
-DMEDFILE_INCLUDE_DIRS=/usr/include/med -DCOIN3D_INCLUDE_DIRS=/usr/include/Coin3"
|
||||||
-DCMAKE_INSTALL_DATAROOTDIR=/usr/share
|
|
||||||
-DCMAKE_INSTALL_DATADIR=/usr/share/${pkgname}
|
|
||||||
-DMEDFILE_INCLUDE_DIRS=/usr/include/med
|
|
||||||
-DPYSIDE2RCCBINARY=/usr/bin/rcc-qt5
|
|
||||||
-DPYSIDE2UICBINARY=/usr/bin/uic-qt5
|
|
||||||
"
|
|
||||||
hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools
|
hostmakedepends="pkg-config swig doxygen graphviz python3-setuptools
|
||||||
python3-matplotlib"
|
python3-matplotlib"
|
||||||
makedepends="boost-devel libxerces-c-devel zlib-devel occt-devel vtk-devel
|
makedepends="boost-devel libxerces-c-devel zlib-devel occt-devel vtk-devel
|
||||||
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
|
hdf5-devel openmpi-devel libmed-devel eigen double-conversion-devel
|
||||||
coin3-devel libshiboken2-devel libspnav-devel liblz4-devel netcdf-devel
|
coin3-devel libspnav-devel liblz4-devel netcdf-devel jsoncpp-devel
|
||||||
jsoncpp-devel coin3-doc glew-devel python3-devel pyside2-tools
|
glew-devel python3-devel yaml-cpp-devel guidelines-support-library
|
||||||
libpyside2-python3-devel qt5-devel qt5-svg-devel qt5-tools-devel
|
qt6-base-devel qt6-svg-devel qt6-tools-devel libpyside6-devel"
|
||||||
qt5-declarative-devel qt5-webengine-devel qt5-webchannel-devel
|
depends="python3-matplotlib python3-pivy python3-GitPython python3-Markdown
|
||||||
qt5-location-devel qt5-xmlpatterns-devel"
|
python3-pyside6"
|
||||||
depends="python3-matplotlib python3-pyside2-webengine python3-pivy
|
|
||||||
python3-GitPython python3-Markdown"
|
|
||||||
short_desc="General purpose 3D CAD modeler"
|
short_desc="General purpose 3D CAD modeler"
|
||||||
maintainer="yopito <pierre.bourgin@free.fr>"
|
maintainer="yopito <pierre.bourgin@free.fr>"
|
||||||
license="LGPL-2.0-or-later"
|
license="LGPL-2.0-or-later"
|
||||||
homepage="https://freecadweb.org/"
|
homepage="https://freecadweb.org/"
|
||||||
_pycxxver=7.1.8
|
distfiles="https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
|
||||||
distfiles="
|
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxx_ver}.tar.gz
|
||||||
https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz
|
https://github.com/Ondsel-Development/OndselSolver/archive/${_ondsel_ver}.tar.gz>OndselSolver-${_ondsel_ver}.tar.gz"
|
||||||
${SOURCEFORGE_SITE}/cxx/pycxx-${_pycxxver}.tar.gz
|
checksum="51115afd8e3b89f4bac343b986b0800d8e1c68fc1e322c3cd179cfe1033ef937
|
||||||
"
|
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6
|
||||||
checksum="ceaf77cd12e8ad533d1535cc27ae4ca2a6e80778502dc9cdec906415d674b674
|
061f651f503f1ec5a9814e174cdb8a9ba84d511a3b8be3d94852e84976c6b158"
|
||||||
4b91e1e1141c23fbd5039df635c4bb6e75632168548f56b83ce177193c0c98c6"
|
|
||||||
python_version=3
|
python_version=3
|
||||||
patch_args="-Np1 -d ${build_wrksrc}"
|
skip_extraction="pycxx-${_pycxx_ver}.tar.gz
|
||||||
|
OndselSolver-${_ondsel_ver}.tar.gz"
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
if [ "$XBPS_TARGET_LIBC" = musl ]; then
|
||||||
makedepends+=" libexecinfo-devel"
|
makedepends+=" libexecinfo-devel"
|
||||||
|
|
@ -51,8 +44,10 @@ fi
|
||||||
CXXFLAGS="-DPYCXX_PYTHON_2TO3"
|
CXXFLAGS="-DPYCXX_PYTHON_2TO3"
|
||||||
|
|
||||||
post_extract() {
|
post_extract() {
|
||||||
rm -r "${build_wrksrc}/src/CXX"
|
vsrcextract -C src/3rdParty/OndselSolver "OndselSolver-${_ondsel_ver}.tar.gz"
|
||||||
ln -Tsr "./pycxx-${_pycxxver}/CXX" "${build_wrksrc}/src/CXX"
|
vsrcextract -C pycxx "pycxx-${_pycxx_ver}.tar.gz"
|
||||||
|
rm -r src/CXX
|
||||||
|
ln -Tsr ./pycxx/CXX src/CXX
|
||||||
}
|
}
|
||||||
|
|
||||||
post_patch() {
|
post_patch() {
|
||||||
|
|
@ -70,8 +65,8 @@ post_patch() {
|
||||||
}
|
}
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx-${_pycxxver}"
|
configure_args+=" -DPYCXX_INCLUDE_DIR=${wrksrc}/pycxx
|
||||||
configure_args+=" -DPYCXX_SOURCE_DIR=${wrksrc}/pycxx-${_pycxxver}/Src"
|
-DPYCXX_SOURCE_DIR=${wrksrc}/pycxx/Src"
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue