From 49357d4dff054413d29774e986e8947aa0041acc Mon Sep 17 00:00:00 2001
From: Greyson Christoforo <grey@christoforo.net>
Date: Sun, 20 Dec 2020 17:25:30 +0000
Subject: [PATCH] move cmake prep from prepare() to build(), add python-ply dep

---
 .SRCINFO |  3 ++-
 PKGBUILD | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d0fe8c8..0411161 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freecad-git
 	pkgdesc = A general purpose 3D CAD modeler - git checkout
-	pkgver = 0.19_pre.r4724.g6c6f5e7fbf
+	pkgver = 0.19_pre.r4809.gefa6346e5f
 	pkgrel = 1
 	epoch = 0
 	url = https://www.freecadweb.org/
@@ -29,6 +29,7 @@ pkgbase = freecad-git
 	depends = pyside2-tools
 	depends = python-matplotlib
 	depends = python-pivy
+	depends = python-ply
 	depends = python-pyside2
 	depends = qt5-svg
 	depends = qt5-tools
diff --git a/PKGBUILD b/PKGBUILD
index e3a7040..2c3abc0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Sebastiaan Lokhorst <sebastiaanlokhorst@gmail.com>
 
 pkgname=freecad-git
-pkgver=0.19_pre.r4724.g6c6f5e7fbf
+pkgver=0.19_pre.r4809.gefa6346e5f
 pkgrel=1
 epoch=0
 pkgdesc='A general purpose 3D CAD modeler - git checkout'
@@ -21,6 +21,7 @@ openmpi
 pyside2-tools
 python-matplotlib
 python-pivy
+python-ply
 python-pyside2
 qt5-svg
 qt5-tools
@@ -58,9 +59,11 @@ prepare() {
   cd FreeCAD
   # patch out a build error
   #curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1
+}
+
+build() {
+  cd FreeCAD
 
-  mkdir -p build
-  cd build
   cmake -Wno-dev .. \
     -D BUILD_ENABLE_CXX_STD=C++14 \
     -D BUILD_QT5=ON \
@@ -74,22 +77,19 @@ prepare() {
     -D FREECAD_USE_OCC_VARIANT="Official Version" \
     -D FREECAD_USE_QT_FILEDIALOG=ON \
     -D PYTHON_EXECUTABLE=/usr/bin/python \
-    -G Ninja
-}
+    -G Ninja -B "${srcdir}/build" -S .
 
-build() {
-  cd FreeCAD
-  ninja -C build
+  ninja -C "${srcdir}/build"
 }
 
 check() {
   cd FreeCAD
-  ./build/bin/FreeCAD --console --run-test 0
+  "${srcdir}/build/bin/FreeCAD" --console --run-test 0
 }
 
 package() {
   cd FreeCAD
-  DESTDIR="${pkgdir}" ninja -C build install
+  DESTDIR="${pkgdir}" ninja -C "${srcdir}/build" install
 
   # Create desktop shortcut
   gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name FreeCAD \