summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreyson Christoforo2020-12-20 17:25:30 +0000
committerGreyson Christoforo2020-12-20 17:25:30 +0000
commit49357d4dff054413d29774e986e8947aa0041acc (patch)
tree42dc6886d988b0ba976e30e50c42abb24d7c9f13
parent58a7afc460879c8bf5151b3b4270fcc808b2645a (diff)
downloadaur-49357d4dff054413d29774e986e8947aa0041acc.tar.gz
move cmake prep from prepare() to build(), add python-ply dep
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD20
2 files changed, 12 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0fe8c8bbb7..04111613d37 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 e3a70406251..2c3abc0550c 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 \