From ec891916a2180b0eb274de1e486c5dac3a722afe Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Oct 2020 09:55:53 -0400
Subject: [PATCH] python3-occ: rebuild for Python 3.9, fix breakage with occt

---
 srcpkgs/python3-occ/patches/occt.patch | 48 ++++++++++++++++++++++++++
 srcpkgs/python3-occ/template           |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/python3-occ/patches/occt.patch

diff --git a/srcpkgs/python3-occ/patches/occt.patch b/srcpkgs/python3-occ/patches/occt.patch
new file mode 100644
index 0000000000..1dc133471c
--- /dev/null
+++ b/srcpkgs/python3-occ/patches/occt.patch
@@ -0,0 +1,48 @@
+Patch for occt-7.4.0p1. See disussion at
+https://github.com/tpaviot/pythonocc-core/issues/870
+
+Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPAlgo.i
+===================================================================
+--- src/SWIG_files/wrapper/BOPAlgo.i
++++ src/SWIG_files/wrapper/BOPAlgo.i
+@@ -632,17 +632,6 @@ class BOPAlgo_Tools {
+ 	:rtype: void") PerformCommonBlocks;
+ 		static void PerformCommonBlocks (const BOPDS_IndexedDataMapOfPaveBlockListOfInteger & theMBlocks,const opencascade::handle<NCollection_BaseAllocator> & theAllocator,BOPDS_PDS & pDS,const opencascade::handle<IntTools_Context> & theContext = opencascade::handle<IntTools_Context>());
+ 
+-		/****************** TreatCompound ******************/
+-		%feature("compactdefaultargs") TreatCompound;
+-		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
+-	:param theS:
+-	:type theS: TopoDS_Shape
+-	:param theMFence:
+-	:type theMFence: TopTools_MapOfShape
+-	:param theLS:
+-	:type theLS: TopTools_ListOfShape
+-	:rtype: void") TreatCompound;
+-		static void TreatCompound (const TopoDS_Shape & theS,TopTools_MapOfShape & theMFence,TopTools_ListOfShape & theLS);
+ 
+ 		/****************** WiresToFaces ******************/
+ 		%feature("compactdefaultargs") WiresToFaces;
+Index: pythonocc-core-7.4.0/src/SWIG_files/wrapper/BOPTools.i
+===================================================================
+--- src/SWIG_files/wrapper/BOPTools.i
++++ src/SWIG_files/wrapper/BOPTools.i
+@@ -776,6 +776,18 @@ class BOPTools_AlgoTools {
+ 	:rtype: int") Sense;
+ 		static Standard_Integer Sense (const TopoDS_Face & theF1,const TopoDS_Face & theF2,const opencascade::handle<IntTools_Context> & theContext);
+ 
++		/****************** TreatCompound ******************/
++		%feature("compactdefaultargs") TreatCompound;
++		%feature("autodoc", "* Collect in the output list recursively all non-compound subshapes of the first level of the given shape theS. If a shape presents in the map theMFence it is skipped. All shapes put in the output are also added into theMFence.
++	:param theS:
++	:type theS: TopoDS_Shape
++	:param theLS:
++	:type theLS: TopTools_ListOfShape
++	:param theMFence:
++	:type theMFence: TopTools_MapOfShape
++	:rtype: void") TreatCompound;
++		static void TreatCompound (const TopoDS_Shape & theS,TopTools_ListOfShape & theLS, TopTools_MapOfShape * theMFence);
++
+ 		/****************** UpdateVertex ******************/
+ 		%feature("compactdefaultargs") UpdateVertex;
+ 		%feature("autodoc", "* @name Updating the vertex Update the tolerance value for vertex <aV> taking into account the fact that <aV> lays on the curve <aIC>
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index 945f80cdc2..42d742ba0a 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-occ'
 pkgname=python3-occ
 version=7.4.0
-revision=1
+revision=2
 archs="i686* x86_64* armv7l* aarch64* ppc*"
 wrksrc="pythonocc-core-${version}"
 build_style=cmake