git » freecad.git » commit 1e8608f

diff --git a/PKGBUILD b/PKGBUILD
index e146ef0..cf6d8d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,19 +11,18 @@
 # Contributor: Adrian Insaurralde
 
 pkgname=freecad
-pkgver=0.21.2
-pkgrel=6
+pkgver=1.0.0
+pkgrel=1
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64 'armv7h')
 url='https://freecadweb.org/'
 license=(LGPL)
-depends=(boost-libs coin fmt glew jsoncpp libspnav 
+depends=(boost-libs coin fmt glew libspnav 
 #med-openmpi 
-netcdf
          opencascade 
 #openmpi 
-pugixml pyside2 pyside2-tools python-gitpython
-         python-markdown
+pugixml pyside2 pyside2-tools
+         yaml-cpp python-markdown 
 # python-matplotlib python-pip
         python-pivy python-ply
          python-yaml qt5-svg qt5-tools qt5-webengine qt5-x11extras
@@ -40,14 +39,15 @@ python-shiboken2
              qt5-webengine shiboken2 swig utf8cpp nlohmann-json)
 optdepends=('graphviz: dependency graph support'
             'openscad: OpenSCAD support')
-source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
-        freecad-vtk9.3.patch) # tag: 0.21.1
-b2sums=('SKIP'
-        'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5')
+options=(!lto)
+source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver")
 
 prepare() {
-#  patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
-   true
+  cd freecad
+  git submodule update --init --recursive
+  # Backport fix to build against VTK 9.4; c.f. https://github.com/FreeCAD/FreeCAD/pull/18543
+  git cherry-pick -n 8934af10128f0bd2d0ffada946d1c93bc5d8869f
+
 }
 
 build() {
@@ -90,3 +90,4 @@ package() {
   ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/freecadcmd"
   ln -sf /usr/lib/freecad/bin/FreeCADCmd "$pkgdir/usr/bin/FreeCADCmd"
 }
+sha256sums=('076ea8ff3917475123353d1e526da89671f50c55107829a32873065ee75fda8a')
diff --git a/freecad-vtk9.3.patch b/freecad-vtk9.3.patch
deleted file mode 100644
index 9270285..0000000
--- a/freecad-vtk9.3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-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,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
-   this->Links = SMDS_CellLinks::New();