aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAiden Grossman <agrossman154@yahoo.com>2021-11-23 19:33:19 +0000
committerLeo <thinkabit.ukim@gmail.com>2021-11-25 07:24:01 +0000
commit5571811950847d6a3de96fc38bac79b4d6db4442 (patch)
tree64e5cef376efc8d2d50332242a0fade446c20191
parent075120fd462e11a2a901693d2d0a3d05625b438f (diff)
downloadaports-5571811950847d6a3de96fc38bac79b4d6db4442.tar.gz
aports-5571811950847d6a3de96fc38bac79b4d6db4442.tar.bz2
aports-5571811950847d6a3de96fc38bac79b4d6db4442.tar.xz
testing/kicad: rebuild against opencascade 7.6.0
-rw-r--r--testing/kicad/APKBUILD4
-rw-r--r--testing/kicad/opencascade76.patch43
2 files changed, 46 insertions, 1 deletions
diff --git a/testing/kicad/APKBUILD b/testing/kicad/APKBUILD
index 1ed7eec9ab..f229e146f2 100644
--- a/testing/kicad/APKBUILD
+++ b/testing/kicad/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=kicad
pkgver=5.1.12
-pkgrel=0
+pkgrel=1
pkgdesc="A Cross Platform and Open Source Electronics Design Automation Suite"
url="https://kicad-pcb.org/"
# No support for s390x/riscv64 in libcontext (shipped with kicad) broken on mips
@@ -30,6 +30,7 @@ subpackages="$pkgname-i18n:i18n:noarch $pkgname-doc"
source="
https://gitlab.com/kicad/code/kicad/-/archive/$pkgver/kicad-$pkgver.tar.gz
https://gitlab.com/kicad/code/kicad-i18n/-/archive/$pkgver/kicad-i18n-$pkgver.tar.gz
+ opencascade76.patch
"
case "$CARCH" in
@@ -125,4 +126,5 @@ opencascade() {
sha512sums="
2a38ef605c7d3daa908a9fffa569ad7857e4f197bb406a0c19e94ff90f1cd6ed7cafef19b458dfbdfd9a087ef0f92a5263e21fcb1dfd75fa59a1e6848e46d400 kicad-5.1.12.tar.gz
56fd278e08c3174b99c977043680afb61de3a5522065054c8b496ef675257f17b2703af656accf3487bca2a25d2e4bcf5b87c6f7e8678585dd2bf94aa220ae87 kicad-i18n-5.1.12.tar.gz
+1bd5c2396ab6e8b7137a1cf1a90a2b0ef4f7a0ec0b3d21561bba869640e4d564e29cebc476c173bf658f7fb845072e16b10901854af947de8cdd89936623a9e8 opencascade76.patch
"
diff --git a/testing/kicad/opencascade76.patch b/testing/kicad/opencascade76.patch
new file mode 100644
index 0000000000..b93d1d369d
--- /dev/null
+++ b/testing/kicad/opencascade76.patch
@@ -0,0 +1,43 @@
+patches kicad to work with opencascade v7.6.0
+Patch has already been in upstreamed in the following commits
+and should not be needed once kicad v6 is released:
+https://gitlab.com/kicad/code/kicad/-/commit/12152d433103c85051628927f47f5d2eb4ad5d3a
+https://gitlab.com/kicad/code/kicad/-/commit/8f87638de59fba45451c3d456191fd22a575c0f8
+--- ./plugins/3d/oce/loadmodel.cpp
++++ ./plugins/3d/oce/loadmodel.cpp.new
+@@ -71,6 +71,8 @@
+ #include <TDF_LabelSequence.hxx>
+ #include <TDF_ChildIterator.hxx>
+
++#include <Standard_Version.hxx>
++
+ #include "plugins/3dapi/ifsg_all.h"
+
+ // log mask for wxLogTrace
+@@ -865,9 +867,6 @@
+ else
+ S3D::AddSGNodeRef( vshape.GetRawPtr(), ocolor );
+
+- const TColgp_Array1OfPnt& arrPolyNodes = triangulation->Nodes();
+- const Poly_Array1OfTriangle& arrTriangles = triangulation->Triangles();
+-
+ std::vector< SGPOINT > vertices;
+ std::vector< int > indices;
+ std::vector< int > indices2;
+@@ -875,14 +874,14 @@
+
+ for(int i = 1; i <= triangulation->NbNodes(); i++)
+ {
+- gp_XYZ v( arrPolyNodes(i).Coord() );
++ gp_XYZ v( triangulation->Node(i).Coord() );
+ vertices.push_back( SGPOINT( v.X(), v.Y(), v.Z() ) );
+ }
+
+ for(int i = 1; i <= triangulation->NbTriangles(); i++)
+ {
+ int a, b, c;
+- arrTriangles( i ).Get( a, b, c );
++ triangulation->Triangle(i).Get(a, b, c);
+ a--;
+
+ if( reverse )