git » freecad.git » commit ff3dd35

upgpkg: 0.21.1-8: Try to fix FS#80321

author Sven-Hendrik Haase
2023-11-23 02:40:56 UTC
committer Sven-Hendrik Haase
2023-11-23 02:40:56 UTC
parent c2e2e082a68f957382e2cf3ecc403f07becf2c8e

upgpkg: 0.21.1-8: Try to fix FS#80321

.SRCINFO +2 -2
PKGBUILD +2 -2
freecad-vtk9.3.patch +3 -2

diff --git a/.SRCINFO b/.SRCINFO
index 29b6987..af6cc2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.1
-	pkgrel = 7
+	pkgrel = 8
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -57,6 +57,6 @@ pkgbase = freecad
 	source = git+https://github.com/freecad/freecad#commit=f6708547a9bb3f71a4aaade12109f511a72c207c
 	source = freecad-vtk9.3.patch
 	b2sums = SKIP
-	b2sums = 709e6321a45b050187a6c5447b4381a5e9958687a1a5f25d0418f63e85f52e040fdf37fb1aa1d2886e06edb1b5b4cce847cf4865d4e6396fdfb4839557657f53
+	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
 
 pkgname = freecad
diff --git a/PKGBUILD b/PKGBUILD
index 8d7a136..8a5c4e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 pkgname=freecad
 pkgver=0.21.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
@@ -30,7 +30,7 @@ optdepends=('graphviz: dependency graph support'
 source=("git+https://github.com/$pkgname/$pkgname#commit=f6708547a9bb3f71a4aaade12109f511a72c207c"
         freecad-vtk9.3.patch) # tag: 0.21.1
 b2sums=('SKIP'
-        '709e6321a45b050187a6c5447b4381a5e9958687a1a5f25d0418f63e85f52e040fdf37fb1aa1d2886e06edb1b5b4cce847cf4865d4e6396fdfb4839557657f53')
+        'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
diff --git a/freecad-vtk9.3.patch b/freecad-vtk9.3.patch
index 9482994..9270285 100644
--- a/freecad-vtk9.3.patch
+++ b/freecad-vtk9.3.patch
@@ -1,12 +1,13 @@
 diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-index 7e3de0070a..2f81a799de 100644
+index 7e3de0070a..dc5249158d 100644
 --- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
 +++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-@@ -1026,7 +1026,7 @@ void SMDS_UnstructuredGrid::BuildLinks()
+@@ -1026,7 +1026,8 @@ void SMDS_UnstructuredGrid::BuildLinks()
    GetLinks()->Allocate(this->GetNumberOfPoints());
    GetLinks()->Register(this);
  //FIXME: vtk9
 -  GetLinks()->BuildLinks(this);
++  GetLinks()->SetDataSet(this);
 +  GetLinks()->BuildLinks();
    GetLinks()->Delete();
  #else