From b7c74a517803a0cceb341ff9e53587931800adab Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 12 Nov 2020 12:17:52 -0500 Subject: [PATCH] python3-occ: update to 7.4.1. --- srcpkgs/python3-occ/patches/occt.patch | 48 -------------------------- srcpkgs/python3-occ/template | 6 ++-- 2 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/python3-occ/patches/occt.patch diff --git a/srcpkgs/python3-occ/patches/occt.patch b/srcpkgs/python3-occ/patches/occt.patch deleted file mode 100644 index 1dc133471c7..00000000000 --- a/srcpkgs/python3-occ/patches/occt.patch +++ /dev/null @@ -1,48 +0,0 @@ -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 & theAllocator,BOPDS_PDS & pDS,const opencascade::handle & theContext = opencascade::handle()); - -- /****************** 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 & 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 taking into account the fact that lays on the curve diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template index 42d742ba0af..705f3745794 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=2 +version=7.4.1 +revision=1 archs="i686* x86_64* armv7l* aarch64* ppc*" wrksrc="pythonocc-core-${version}" build_style=cmake @@ -13,4 +13,4 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="http://pythonocc.org" distfiles="https://github.com/tpaviot/pythonocc-core/archive/${version}.tar.gz" -checksum=c53481e8b7387b7d3b5f717e86ef8a78849d5041e9cb2966dc6ed4210a3aceac +checksum=6d62002244a0e7f4e5c1ad590d332a60601c44b2501ad017361443b54371e667