* Re: [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
@ 2019-10-05 16:45 ` voidlinux-github
2019-10-10 15:56 ` [PR PATCH] [Updated] " voidlinux-github
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-05 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/15102#issuecomment-538666759
Comment:
@Piraty you may want to include this script and place it it /etc/profile.d/, it defines a number of environment variables necessary to run the Draw program: https://git.archlinux.org/svntogit/community.git/tree/trunk/opencascade.sh?h=packages/opencascade
Additionally, this update causes a segfault in freecad. when loading any file (or switching to any workbench). I'll see whether rebuilding freecad will fix this.
But, it does build and run on my box: x64, glibc.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
2019-10-05 16:45 ` voidlinux-github
@ 2019-10-10 15:56 ` voidlinux-github
2019-10-10 15:56 ` voidlinux-github
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 7557 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 4999f7399db4ffcb9768ea45501e2ebf983f676a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: rebuild for occt-7.4.0
along, add a patch that prevented the build
---
.../patches/011-salomesh-namespace.patch | 17 +++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/freecad/patches/011-salomesh-namespace.patch
diff --git a/srcpkgs/freecad/patches/011-salomesh-namespace.patch b/srcpkgs/freecad/patches/011-salomesh-namespace.patch
new file mode 100644
index 00000000000..f6ddef39bb6
--- /dev/null
+++ b/srcpkgs/freecad/patches/011-salomesh-namespace.patch
@@ -0,0 +1,17 @@
+--- src/3rdParty/salomesmesh/inc/Rn.h
++++ src/3rdParty/salomesmesh/inc/Rn.h
+@@ -180,12 +180,12 @@
+ {
+ 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 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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
2019-10-05 16:45 ` voidlinux-github
2019-10-10 15:56 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-10 15:56 ` voidlinux-github
2019-10-10 16:03 ` voidlinux-github
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 7557 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 4999f7399db4ffcb9768ea45501e2ebf983f676a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: rebuild for occt-7.4.0
along, add a patch that prevented the build
---
.../patches/011-salomesh-namespace.patch | 17 +++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/freecad/patches/011-salomesh-namespace.patch
diff --git a/srcpkgs/freecad/patches/011-salomesh-namespace.patch b/srcpkgs/freecad/patches/011-salomesh-namespace.patch
new file mode 100644
index 00000000000..f6ddef39bb6
--- /dev/null
+++ b/srcpkgs/freecad/patches/011-salomesh-namespace.patch
@@ -0,0 +1,17 @@
+--- src/3rdParty/salomesmesh/inc/Rn.h
++++ src/3rdParty/salomesmesh/inc/Rn.h
+@@ -180,12 +180,12 @@
+ {
+ 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 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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (2 preceding siblings ...)
2019-10-10 15:56 ` voidlinux-github
@ 2019-10-10 16:03 ` voidlinux-github
2019-10-10 16:03 ` voidlinux-github
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8806 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 5ee1ec5161e60cdd0e9f1a660ecd4d94ace3051f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 49 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 50 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..7b5b8103d53
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,49 @@
+# upstream: yes
+
+From 851e3d9847c5043a604a544b502c51e8c628e96c Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 21 Aug 2019 00:12:50 +0200
+Subject: [PATCH] add missing std:: namespace to build on Debian 10
+
+---
+ src/3rdParty/salomesmesh/inc/Rn.h | 4 ++--
+ src/Mod/Part/App/PropertyTopoShape.cpp | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 100644
+--- a/src/3rdParty/salomesmesh/inc/Rn.h
++++ b/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 a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
+index b986d82feb5..a6ecad1e25b 100644
+--- a/src/Mod/Part/App/PropertyTopoShape.cpp
++++ b/src/Mod/Part/App/PropertyTopoShape.cpp
+@@ -279,10 +279,10 @@ static void BRepTools_Write(const TopoDS_Shape& Sh, Standard_OStream& S) {
+ SS.Write(S);
+ SS.Write(Sh,S);
+ }
+-static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh,
+- const Standard_CString File)
++
++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);
+ #else
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (3 preceding siblings ...)
2019-10-10 16:03 ` voidlinux-github
@ 2019-10-10 16:03 ` voidlinux-github
2019-10-10 16:07 ` voidlinux-github
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8806 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 5ee1ec5161e60cdd0e9f1a660ecd4d94ace3051f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 49 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 50 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..7b5b8103d53
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,49 @@
+# upstream: yes
+
+From 851e3d9847c5043a604a544b502c51e8c628e96c Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 21 Aug 2019 00:12:50 +0200
+Subject: [PATCH] add missing std:: namespace to build on Debian 10
+
+---
+ src/3rdParty/salomesmesh/inc/Rn.h | 4 ++--
+ src/Mod/Part/App/PropertyTopoShape.cpp | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 100644
+--- a/src/3rdParty/salomesmesh/inc/Rn.h
++++ b/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 a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
+index b986d82feb5..a6ecad1e25b 100644
+--- a/src/Mod/Part/App/PropertyTopoShape.cpp
++++ b/src/Mod/Part/App/PropertyTopoShape.cpp
+@@ -279,10 +279,10 @@ static void BRepTools_Write(const TopoDS_Shape& Sh, Standard_OStream& S) {
+ SS.Write(S);
+ SS.Write(Sh,S);
+ }
+-static Standard_Boolean BRepTools_Write(const TopoDS_Shape& Sh,
+- const Standard_CString File)
++
++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);
+ #else
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (4 preceding siblings ...)
2019-10-10 16:03 ` voidlinux-github
@ 2019-10-10 16:07 ` voidlinux-github
2019-10-10 16:07 ` voidlinux-github
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8109 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 64185cfcac6cb1650423af218b6fea60f2689df7 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 32 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 33 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..cd0dd5837ed
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,32 @@
+# upstream: yes
+# adapted to match this version's state
+
+From 851e3d9847c5043a604a544b502c51e8c628e96c Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 21 Aug 2019 00:12:50 +0200
+Subject: [PATCH] add missing std:: namespace to build on Debian 10
+
+---
+ src/3rdParty/salomesmesh/inc/Rn.h | 4 ++--
+ src/Mod/Part/App/PropertyTopoShape.cpp | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 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 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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (5 preceding siblings ...)
2019-10-10 16:07 ` voidlinux-github
@ 2019-10-10 16:07 ` voidlinux-github
2019-10-10 16:42 ` voidlinux-github
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8109 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 64185cfcac6cb1650423af218b6fea60f2689df7 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 32 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 33 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..cd0dd5837ed
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,32 @@
+# upstream: yes
+# adapted to match this version's state
+
+From 851e3d9847c5043a604a544b502c51e8c628e96c Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 21 Aug 2019 00:12:50 +0200
+Subject: [PATCH] add missing std:: namespace to build on Debian 10
+
+---
+ src/3rdParty/salomesmesh/inc/Rn.h | 4 ++--
+ src/Mod/Part/App/PropertyTopoShape.cpp | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 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 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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (6 preceding siblings ...)
2019-10-10 16:07 ` voidlinux-github
@ 2019-10-10 16:42 ` voidlinux-github
2019-10-10 16:42 ` voidlinux-github
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8423 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 2eeb9d994b2f2cc7768c5f5cb77ab3acd04e96db Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 41 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 42 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..f5a214558f8
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,41 @@
+# based on upstream: 851e3d9847c5043a604a544b502c51e8c628e96c
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 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 a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
+index b986d82feb5..a6ecad1e25b 100644
+--- 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;
+
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (7 preceding siblings ...)
2019-10-10 16:42 ` voidlinux-github
@ 2019-10-10 16:42 ` voidlinux-github
2019-10-10 18:11 ` voidlinux-github
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 8423 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 2eeb9d994b2f2cc7768c5f5cb77ab3acd04e96db Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
---
.../patches/020-namespace-missing-std.patch | 41 +++++++++++++++++++
srcpkgs/freecad/template | 2 +-
2 files changed, 42 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..f5a214558f8
--- /dev/null
+++ b/srcpkgs/freecad/patches/020-namespace-missing-std.patch
@@ -0,0 +1,41 @@
+# based on upstream: 851e3d9847c5043a604a544b502c51e8c628e96c
+
+diff --git a/src/3rdParty/salomesmesh/inc/Rn.h b/src/3rdParty/salomesmesh/inc/Rn.h
+index 6ec871d932e..e92d2275a99 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 a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp
+index b986d82feb5..a6ecad1e25b 100644
+--- 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;
+
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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (8 preceding siblings ...)
2019-10-10 16:42 ` voidlinux-github
@ 2019-10-10 18:11 ` voidlinux-github
2019-10-10 18:11 ` voidlinux-github
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 10788 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 <piraty1@inbox.ru>
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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (9 preceding siblings ...)
2019-10-10 18:11 ` voidlinux-github
@ 2019-10-10 18:11 ` voidlinux-github
2019-10-10 18:50 ` voidlinux-github
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 10788 bytes --]
From bb6ccea9098d9ebc639e028b1910704fbba4f25e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <piraty1@inbox.ru>"
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 <piraty1@inbox.ru>
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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (10 preceding siblings ...)
2019-10-10 18:11 ` voidlinux-github
@ 2019-10-10 18:50 ` voidlinux-github
2019-10-10 18:50 ` voidlinux-github
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 12731 bytes --]
From bfb57ab5dcaf34f4a023e1ba58a657e6d87f6737 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
[ci skip]
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 6 +-
3 files changed, 78 insertions(+), 96 deletions(-)
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/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
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 <piraty1@inbox.ru>"
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 088359196be7e43248745588950bb8fdc3b61be4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (11 preceding siblings ...)
2019-10-10 18:50 ` voidlinux-github
@ 2019-10-10 18:50 ` voidlinux-github
2019-10-10 18:51 ` voidlinux-github
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 12731 bytes --]
From bfb57ab5dcaf34f4a023e1ba58a657e6d87f6737 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
[ci skip]
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 6 +-
3 files changed, 78 insertions(+), 96 deletions(-)
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/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
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 <piraty1@inbox.ru>"
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 088359196be7e43248745588950bb8fdc3b61be4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (12 preceding siblings ...)
2019-10-10 18:50 ` voidlinux-github
@ 2019-10-10 18:51 ` voidlinux-github
2019-10-10 18:51 ` voidlinux-github
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 12731 bytes --]
From fa6250cce5e2ff1e894e276495234c8c812a4d71 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 6 +-
3 files changed, 78 insertions(+), 96 deletions(-)
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/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
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 <piraty1@inbox.ru>"
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 b4e36e3b2690e87b5461b15832bb7de7f10a7f6d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
[ci skip]
---
.../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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (13 preceding siblings ...)
2019-10-10 18:51 ` voidlinux-github
@ 2019-10-10 18:51 ` voidlinux-github
2019-10-15 15:41 ` voidlinux-github
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-10 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [ ] check what freecad says about it
- [ ] test the musl patches (someone?)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 12731 bytes --]
From fa6250cce5e2ff1e894e276495234c8c812a4d71 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 6 +-
3 files changed, 78 insertions(+), 96 deletions(-)
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/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
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 <piraty1@inbox.ru>"
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 b4e36e3b2690e87b5461b15832bb7de7f10a7f6d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: fix build with gcc9
[ci skip]
---
.../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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (14 preceding siblings ...)
2019-10-10 18:51 ` voidlinux-github
@ 2019-10-15 15:41 ` voidlinux-github
2019-10-15 15:41 ` voidlinux-github
2019-10-17 10:56 ` [PR PATCH] [Closed]: " voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-15 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [x] ~check what freecad says about it~ requires rebuild
- [ ] test the musl patches (anyone?)
- [ ] include env scripts mentioned by @karl-nilsson [here](https://github.com/void-linux/void-packages/pull/15102#issuecomment-538666759)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 14531 bytes --]
From dc481e6b5d16a1f6cbd05c70de4831af51fb0e23 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/files/opencascade.sh | 24 ++++++
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 9 ++-
4 files changed, 105 insertions(+), 96 deletions(-)
create mode 100644 srcpkgs/occt/files/opencascade.sh
diff --git a/common/shlibs b/common/shlibs
index adc63e5a8cd..b07417b98d8 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/files/opencascade.sh b/srcpkgs/occt/files/opencascade.sh
new file mode 100644
index 00000000000..4d30d9ff1d6
--- /dev/null
+++ b/srcpkgs/occt/files/opencascade.sh
@@ -0,0 +1,24 @@
+export CASROOT=/usr
+
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+
+export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources
+export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage
+export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures
+export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders
+export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage
+export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj
+export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource
+export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt
+export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources
+export DRAWHOME=$CSF_OCCTResourcePath/DrawResources
+export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 70647369464..3b131d74512 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,16 +13,19 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
maintainer="Piraty <piraty1@inbox.ru>"
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() {
rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
vlicense OCCT_LGPL_EXCEPTION.txt
rm ${DESTDIR}/usr/bin/custom*.sh
+
+ vmkdir /etc/profile.d
+ vinstall ${FILESDIR}/opencascade.sh 644 /etc/profile.d
}
occt-devel_package() {
From 2fdebce398c8f0e6d7e8b08a50d2d8af0830860e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: rebuild for occt-7.4.0
along, fix build with gcc9
[ci skip]
---
.../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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Updated] [WIP] occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (15 preceding siblings ...)
2019-10-15 15:41 ` voidlinux-github
@ 2019-10-15 15:41 ` voidlinux-github
2019-10-17 10:56 ` [PR PATCH] [Closed]: " voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-15 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages occt-7.4.0
https://github.com/void-linux/void-packages/pull/15102
[WIP] occt: update to 7.4.0.
Tracking PR.
- [ ] actually build the hole thing locally for all relevant archs
- [x] ~check what freecad says about it~ requires rebuild
- [ ] test the musl patches (anyone?)
- [ ] include env scripts mentioned by @karl-nilsson [here](https://github.com/void-linux/void-packages/pull/15102#issuecomment-538666759)
@karl-nilsson @yopito
A patch file from https://github.com/void-linux/void-packages/pull/15102.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-occt-7.4.0-15102.patch --]
[-- Type: text/x-diff, Size: 14531 bytes --]
From dc481e6b5d16a1f6cbd05c70de4831af51fb0e23 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 5 Oct 2019 01:19:47 +0200
Subject: [PATCH 1/2] occt: update to 7.4.0.
---
common/shlibs | 113 ++++++++++++++-------------
srcpkgs/occt/files/opencascade.sh | 24 ++++++
srcpkgs/occt/patches/musl-fenv.patch | 55 +++++--------
srcpkgs/occt/template | 9 ++-
4 files changed, 105 insertions(+), 96 deletions(-)
create mode 100644 srcpkgs/occt/files/opencascade.sh
diff --git a/common/shlibs b/common/shlibs
index adc63e5a8cd..b07417b98d8 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/files/opencascade.sh b/srcpkgs/occt/files/opencascade.sh
new file mode 100644
index 00000000000..4d30d9ff1d6
--- /dev/null
+++ b/srcpkgs/occt/files/opencascade.sh
@@ -0,0 +1,24 @@
+export CASROOT=/usr
+
+export CSF_LANGUAGE=us
+export MMGT_CLEAR=1
+export CSF_EXCEPTION_PROMPT=1
+
+export CSF_OCCTResourcePath=$CASROOT/share/opencascade/resources
+export CSF_SHMessage=$CSF_OCCTResourcePath/SHMessage
+export CSF_MDTVTexturesDirectory=$CSF_OCCTResourcePath/Textures
+export CSF_ShadersDirectory=$CSF_OCCTResourcePath/Shaders
+export CSF_XSMessage=$CSF_OCCTResourcePath/XSMessage
+export CSF_TObjMessage=$CSF_OCCTResourcePath/TObj
+export CSF_StandardDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_PluginDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_XCAFDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_TObjDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_StandardLiteDefaults=$CSF_OCCTResourcePath/StdResource
+export CSF_IGESDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_STEPDefaults=$CSF_OCCTResourcePath/XSTEPResource
+export CSF_XmlOcafResource=$CSF_OCCTResourcePath/XmlOcafResource
+export CSF_MIGRATION_TYPES=$CSF_OCCTResourcePath/StdResource/MigrationSheet.txt
+export CSF_DrawPluginDefaults=$CSF_OCCTResourcePath/DrawResources
+export DRAWHOME=$CSF_OCCTResourcePath/DrawResources
+export DRAWDEFAULT=$CSF_OCCTResourcePath/DrawResources/DrawDefault
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 4a2e880db4f..c4fd770646d 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -7,7 +7,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
--- src/OSD/OSD_signal.cxx.orig
+++ src/OSD/OSD_signal.cxx
-@@ -645,7 +645,7 @@
+@@ -703,7 +703,7 @@
#include <signal.h>
@@ -16,40 +16,21 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
#include <sys/signal.h>
#endif
-@@ -687,7 +687,7 @@
- // cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
- if ( ADR_ACT_SIGIO_HANDLER != NULL )
- (*ADR_ACT_SIGIO_HANDLER)() ;
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -805,7 +805,7 @@
- (void)theSignal; // silence GCC warnings
- (void)theContext;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(__GLIBC__)
- if (fFltExceptions)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
- //feenableexcept (FE_INVALID | FE_DIVBYZERO);
-@@ -892,14 +892,18 @@
- #endif
- }
- #elif defined (__linux__)
-+#if defined(__GLIBC__)
- feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_True;
- #endif
- }
- else
+@@ -914,7 +914,7 @@
+ //=======================================================================
+ void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ feclearexcept (FE_ALL_EXCEPT);
+ if (theFloatingSignal)
{
- #if defined (__linux__)
-+#if defined(__GLIBC__)
- fedisableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
-+#endif
- fFltExceptions = Standard_False;
- #endif
- }
+@@ -947,7 +947,7 @@
+ //=======================================================================
+ Standard_Boolean OSD::ToCatchFloatingSignals()
+ {
+-#if defined (__linux__)
++#if defined (__linux__) && defined(__GLIBC__)
+ return (fegetexcept() & _OSD_FPX) != 0;
+ #else
+ return Standard_False;
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 70647369464..3b131d74512 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,16 +13,19 @@ short_desc="OpenCASCADE Technology - library for CAD/CAM/CAE applications"
maintainer="Piraty <piraty1@inbox.ru>"
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() {
rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
vlicense OCCT_LGPL_EXCEPTION.txt
rm ${DESTDIR}/usr/bin/custom*.sh
+
+ vmkdir /etc/profile.d
+ vinstall ${FILESDIR}/opencascade.sh 644 /etc/profile.d
}
occt-devel_package() {
From 2fdebce398c8f0e6d7e8b08a50d2d8af0830860e Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 10 Oct 2019 16:07:55 +0200
Subject: [PATCH 2/2] freecad: rebuild for occt-7.4.0
along, fix build with gcc9
[ci skip]
---
.../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 <Base/Vector3D.h>
+
+ 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 <Mod/Part/App/Geom2d/OffsetCurve2dPy.h>
+
+ 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 <Mod/Part/App/TopoShapePy.h>
+ #include <App/Application.h>
+
++using namespace std;
++
+
+ namespace Raytracing {
+ class Module : public Py::ExtensionModule<Module>
+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
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PR PATCH] [Closed]: occt: update to 7.4.0.
2019-10-04 23:49 [PR PATCH] [WIP] occt: update to 7.4.0 voidlinux-github
` (16 preceding siblings ...)
2019-10-15 15:41 ` voidlinux-github
@ 2019-10-17 10:56 ` voidlinux-github
17 siblings, 0 replies; 19+ messages in thread
From: voidlinux-github @ 2019-10-17 10:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
There's a closed pull request on the void-packages repository
occt: update to 7.4.0.
https://github.com/void-linux/void-packages/pull/15102
Description:
Tracking PR.
- [x] actually build the hole thing locally for all relevant archs
- [x] ~check what freecad says about it~ requires rebuild
- [ ] test the musl patches (anyone?)
- [x] include env scripts mentioned by @karl-nilsson [here](https://github.com/void-linux/void-packages/pull/15102#issuecomment-538666759)
@karl-nilsson @yopito
^ permalink raw reply [flat|nested] 19+ messages in thread