From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001 From: Piraty Date: Sat, 5 Oct 2019 01:19:47 +0200 Subject: [PATCH 1/2] WIP: occt: update to 7.4.0. [ci skip] TODO: * check what freecad says about it * test the musl patches --- common/shlibs | 113 +++++++++++---------- srcpkgs/occt/{patches => }/musl-fenv.patch | 0 srcpkgs/occt/template | 6 +- 3 files changed, 60 insertions(+), 59 deletions(-) rename srcpkgs/occt/{patches => }/musl-fenv.patch (100%) diff --git a/common/shlibs b/common/shlibs index 688275b7d9e..a443b9dd6b0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3183,62 +3183,63 @@ librand48_r.so.0 rand48_r-0.1_1 libxxhash.so.0 libxxHash-0.6.5_2 libfwup.so.1 libfwup-11_1 libcapnp_c.so.0 c-capnproto-0.3_1 -libTKBin.so.7 occt-7.2.0p1_1 -libTKDraw.so.7 occt-7.2.0p1_1 -libTKSTEP209.so.7 occt-7.2.0p1_1 -libTKOpenGl.so.7 occt-7.2.0p1_1 -libTKBinTObj.so.7 occt-7.2.0p1_1 -libTKSTL.so.7 occt-7.2.0p1_1 -libTKViewerTest.so.7 occt-7.2.0p1_1 -libTKCAF.so.7 occt-7.2.0p1_1 -libTKService.so.7 occt-7.2.0p1_1 -libTKV3d.so.7 occt-7.2.0p1_1 -libTKXCAF.so.7 occt-7.2.0p1_1 -libTKMesh.so.7 occt-7.2.0p1_1 -libTKSTEP.so.7 occt-7.2.0p1_1 -libTKMath.so.7 occt-7.2.0p1_1 -libTKLCAF.so.7 occt-7.2.0p1_1 -libTKShHealing.so.7 occt-7.2.0p1_1 -libTKGeomAlgo.so.7 occt-7.2.0p1_1 -libTKTObjDRAW.so.7 occt-7.2.0p1_1 -libTKTObj.so.7 occt-7.2.0p1_1 -libTKStd.so.7 occt-7.2.0p1_1 -libTKSTEPBase.so.7 occt-7.2.0p1_1 -libTKIGES.so.7 occt-7.2.0p1_1 -libTKGeomBase.so.7 occt-7.2.0p1_1 -libTKFillet.so.7 occt-7.2.0p1_1 -libTKFeat.so.7 occt-7.2.0p1_1 -libTKG2d.so.7 occt-7.2.0p1_1 -libTKXSBase.so.7 occt-7.2.0p1_1 -libTKDCAF.so.7 occt-7.2.0p1_1 -libTKXml.so.7 occt-7.2.0p1_1 -libTKTopTest.so.7 occt-7.2.0p1_1 -libTKG3d.so.7 occt-7.2.0p1_1 -libTKBRep.so.7 occt-7.2.0p1_1 -libTKVRML.so.7 occt-7.2.0p1_1 -libTKCDF.so.7 occt-7.2.0p1_1 -libTKXSDRAW.so.7 occt-7.2.0p1_1 -libTKXMesh.so.7 occt-7.2.0p1_1 -libTKernel.so.7 occt-7.2.0p1_1 -libTKTopAlgo.so.7 occt-7.2.0p1_1 -libTKHLR.so.7 occt-7.2.0p1_1 -libTKBinXCAF.so.7 occt-7.2.0p1_1 -libTKVCAF.so.7 occt-7.2.0p1_1 -libTKBinL.so.7 occt-7.2.0p1_1 -libTKXmlXCAF.so.7 occt-7.2.0p1_1 -libTKXDEIGES.so.7 occt-7.2.0p1_1 -libTKBO.so.7 occt-7.2.0p1_1 -libTKStdL.so.7 occt-7.2.0p1_1 -libTKXDEDRAW.so.7 occt-7.2.0p1_1 -libTKXmlTObj.so.7 occt-7.2.0p1_1 -libTKPrim.so.7 occt-7.2.0p1_1 -libTKMeshVS.so.7 occt-7.2.0p1_1 -libTKSTEPAttr.so.7 occt-7.2.0p1_1 -libTKBool.so.7 occt-7.2.0p1_1 -libTKOffset.so.7 occt-7.2.0p1_1 -libTKXDESTEP.so.7 occt-7.2.0p1_1 -libTKQADraw.so.7 occt-7.2.0p1_1 -libTKXmlL.so.7 occt-7.2.0p1_1 +libTKBO.so.7 occt-7.4.0_1 +libTKBRep.so.7 occt-7.4.0_1 +libTKBin.so.7 occt-7.4.0_1 +libTKBinL.so.7 occt-7.4.0_1 +libTKBinTObj.so.7 occt-7.4.0_1 +libTKBinXCAF.so.7 occt-7.4.0_1 +libTKBool.so.7 occt-7.4.0_1 +libTKCAF.so.7 occt-7.4.0_1 +libTKCDF.so.7 occt-7.4.0_1 +libTKDCAF.so.7 occt-7.4.0_1 +libTKDraw.so.7 occt-7.4.0_1 +libTKFeat.so.7 occt-7.4.0_1 +libTKFillet.so.7 occt-7.4.0_1 +libTKG2d.so.7 occt-7.4.0_1 +libTKG3d.so.7 occt-7.4.0_1 +libTKGeomAlgo.so.7 occt-7.4.0_1 +libTKGeomBase.so.7 occt-7.4.0_1 +libTKHLR.so.7 occt-7.4.0_1 +libTKIGES.so.7 occt-7.4.0_1 +libTKLCAF.so.7 occt-7.4.0_1 +libTKMath.so.7 occt-7.4.0_1 +libTKMesh.so.7 occt-7.4.0_1 +libTKMeshVS.so.7 occt-7.4.0_1 +libTKOffset.so.7 occt-7.4.0_1 +libTKOpenGl.so.7 occt-7.4.0_1 +libTKPrim.so.7 occt-7.4.0_1 +libTKQADraw.so.7 occt-7.4.0_1 +libTKRWMesh.so.7 occt-7.4.0_1 +libTKSTEP.so.7 occt-7.4.0_1 +libTKSTEP209.so.7 occt-7.4.0_1 +libTKSTEPAttr.so.7 occt-7.4.0_1 +libTKSTEPBase.so.7 occt-7.4.0_1 +libTKSTL.so.7 occt-7.4.0_1 +libTKService.so.7 occt-7.4.0_1 +libTKShHealing.so.7 occt-7.4.0_1 +libTKStd.so.7 occt-7.4.0_1 +libTKStdL.so.7 occt-7.4.0_1 +libTKTObj.so.7 occt-7.4.0_1 +libTKTObjDRAW.so.7 occt-7.4.0_1 +libTKTopAlgo.so.7 occt-7.4.0_1 +libTKTopTest.so.7 occt-7.4.0_1 +libTKV3d.so.7 occt-7.4.0_1 +libTKVCAF.so.7 occt-7.4.0_1 +libTKVRML.so.7 occt-7.4.0_1 +libTKViewerTest.so.7 occt-7.4.0_1 +libTKXCAF.so.7 occt-7.4.0_1 +libTKXDEDRAW.so.7 occt-7.4.0_1 +libTKXDEIGES.so.7 occt-7.4.0_1 +libTKXDESTEP.so.7 occt-7.4.0_1 +libTKXMesh.so.7 occt-7.4.0_1 +libTKXSBase.so.7 occt-7.4.0_1 +libTKXSDRAW.so.7 occt-7.4.0_1 +libTKXml.so.7 occt-7.4.0_1 +libTKXmlL.so.7 occt-7.4.0_1 +libTKXmlTObj.so.7 occt-7.4.0_1 +libTKXmlXCAF.so.7 occt-7.4.0_1 +libTKernel.so.7 occt-7.4.0_1 libargon2.so.1 libargon2-20171227_1 libdazzle-1.0.so.0 libdazzle-3.28.0_1 libjsonrpc-glib-1.0.so.1 jsonrpc-glib-3.28.0_1 diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/musl-fenv.patch similarity index 100% rename from srcpkgs/occt/patches/musl-fenv.patch rename to srcpkgs/occt/musl-fenv.patch diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template index 70647369464..c4e985f7761 100644 --- a/srcpkgs/occt/template +++ b/srcpkgs/occt/template @@ -1,6 +1,6 @@ # Template file for 'occt' pkgname=occt -version=7.3.0p3 +version=7.4.0 revision=1 _gittag="V${version//./_}" wrksrc=occt-${_gittag} @@ -13,10 +13,10 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications" maintainer="Piraty " license="LGPL-2.1-only" homepage="https://www.opencascade.com" -# distifile: use git instead of official tarball that requires registration +# distfile: use git instead of official tarball, which requires registration # see https://www.opencascade.com/content/packaging-again-debian distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz" -checksum=fbd46db3e75313131b88a606024ea4d4496c3c7f6e68c23988e9d3e673d4f21b +checksum=655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676 conflicts="oce>=0" post_install() { From f8bbc4b13b94a63470019dea8d443a9056fb4496 Mon Sep 17 00:00:00 2001 From: Piraty Date: Thu, 10 Oct 2019 16:07:55 +0200 Subject: [PATCH 2/2] freecad: fix build with gcc9 --- .../patches/020-namespace-missing-std.patch | 127 ++++++++++++++++++ srcpkgs/freecad/template | 2 +- 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/freecad/patches/020-namespace-missing-std.patch diff --git a/srcpkgs/freecad/patches/020-namespace-missing-std.patch b/srcpkgs/freecad/patches/020-namespace-missing-std.patch new file mode 100644 index 00000000000..82033cd5afb --- /dev/null +++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch @@ -0,0 +1,127 @@ +# reason: fix build with gcc9 +# upstream: yes + +diff --git src/3rdParty/salomesmesh/inc/Rn.h src/3rdParty/salomesmesh/inc/Rn.h +index 6ec871d93..e92d2275a 100644 +--- src/3rdParty/salomesmesh/inc/Rn.h ++++ src/3rdParty/salomesmesh/inc/Rn.h +@@ -180,12 +180,12 @@ class R4: public R3 + { + friend std::ostream& operator <<(std::ostream& f, const R4 & P ) + { f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; } +- friend istream& operator >>(istream& f, R4 & P) ++ friend std::istream& operator >>(std::istream& f, R4 & P) + { f >> P.x >> P.y >> P.z >> P.omega ; return f; } + + friend std::ostream& operator <<(std::ostream& f, const R4 * P ) + { f << P->x << ' ' << P->y << ' ' << P->z << ' ' << P->omega; return f; } +- friend istream& operator >>(istream& f, R4 * P) ++ friend std::istream& operator >>(std::istream& f, R4 * P) + { f >> P->x >> P->y >> P->z >> P->omega ; return f; } + + public: + + +diff --git src/Mod/Drawing/App/DrawingExport.cpp src/Mod/Drawing/App/DrawingExport.cpp +index 0c3c23231..550b12c25 100644 +--- src/Mod/Drawing/App/DrawingExport.cpp ++++ src/Mod/Drawing/App/DrawingExport.cpp +@@ -81,6 +81,7 @@ + #include + + using namespace Drawing; ++using namespace std; + + TopoDS_Edge DrawingOutput::asCircle(const BRepAdaptor_Curve& c) const + { +diff --git src/Mod/Part/App/Geometry2d.cpp src/Mod/Part/App/Geometry2d.cpp +index fb1de909c..979465533 100644 +--- src/Mod/Part/App/Geometry2d.cpp ++++ src/Mod/Part/App/Geometry2d.cpp +@@ -83,6 +83,7 @@ + #include + + using namespace Part; ++using namespace std; + + extern const char* gce_ErrorStatusText(gce_ErrorType et); + +diff --git src/Mod/Raytracing/App/AppRaytracingPy.cpp src/Mod/Raytracing/App/AppRaytracingPy.cpp +index d48c51c97..1bb2b1b01 100644 +--- src/Mod/Raytracing/App/AppRaytracingPy.cpp ++++ src/Mod/Raytracing/App/AppRaytracingPy.cpp +@@ -40,6 +40,8 @@ + #include + #include + ++using namespace std; ++ + + namespace Raytracing { + class Module : public Py::ExtensionModule +diff --git src/Mod/Raytracing/App/LuxFeature.cpp src/Mod/Raytracing/App/LuxFeature.cpp +index 930fe12b7..d1e0a0089 100644 +--- src/Mod/Raytracing/App/LuxFeature.cpp ++++ src/Mod/Raytracing/App/LuxFeature.cpp +@@ -38,6 +38,7 @@ + + + using namespace Raytracing; ++using namespace std; + + PROPERTY_SOURCE(Raytracing::LuxFeature, Raytracing::RaySegment) + +diff --git src/Mod/Raytracing/App/RayFeature.cpp src/Mod/Raytracing/App/RayFeature.cpp +index cdd2cb6dc..235a98685 100644 +--- src/Mod/Raytracing/App/RayFeature.cpp ++++ src/Mod/Raytracing/App/RayFeature.cpp +@@ -36,6 +36,7 @@ + + + using namespace Raytracing; ++using namespace std; + + PROPERTY_SOURCE(Raytracing::RayFeature, Raytracing::RaySegment) + +diff --git src/Mod/TechDraw/App/Geometry.cpp src/Mod/TechDraw/App/Geometry.cpp +index c10b63177..d34eeb9bb 100644 +--- src/Mod/TechDraw/App/Geometry.cpp ++++ src/Mod/TechDraw/App/Geometry.cpp +@@ -80,6 +80,7 @@ + #include "Geometry.h" + + using namespace TechDraw; ++using namespace std; + + // Collection of Geometric Features + Wire::Wire() + + +--- src/Mod/Part/App/PropertyTopoShape.cpp ++++ src/Mod/Part/App/PropertyTopoShape.cpp +@@ -281,11 +281,11 @@ + static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh, + const Standard_CString File) + { +- ofstream os; ++ std::ofstream os; + #if OCC_VERSION_HEX >= 0x060800 +- OSD_OpenStream(os, File, ios::out); ++ OSD_OpenStream(os, File, std::ios::out); + #else +- os.open(File, ios::out); ++ os.open(File, std::ios::out); + #endif + if (!os.rdbuf()->is_open()) return Standard_False; + + +--- src/Mod/Part/App/Geometry.cpp ++++ src/Mod/Part/App/Geometry.cpp +@@ -141,6 +141,7 @@ + #include "Geometry.h" + + using namespace Part; ++using namespace std; + + + const char* gce_ErrorStatusText(gce_ErrorType et) diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template index e641ed2a603..9e9375c4444 100644 --- a/srcpkgs/freecad/template +++ b/srcpkgs/freecad/template @@ -1,7 +1,7 @@ # Template file for 'freecad' pkgname=freecad version=0.18.3 -revision=1 +revision=2 wrksrc="FreeCAD-${version}" build_style=cmake