From 58a7afc460879c8bf5151b3b4270fcc808b2645a Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Thu, 17 Dec 2020 14:44:44 +0000 Subject: [PATCH] ENABLE_CXX_STD=C++14 and add check --- .SRCINFO | 2 +- PKGBUILD | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 30f284c..d0fe8c8 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.r4408.g20649ec529 + pkgver = 0.19_pre.r4724.g6c6f5e7fbf pkgrel = 1 epoch = 0 url = https://www.freecadweb.org/ diff --git a/PKGBUILD b/PKGBUILD index d12984a..e3a7040 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Sebastiaan Lokhorst pkgname=freecad-git -pkgver=0.19_pre.r4408.g20649ec529 +pkgver=0.19_pre.r4724.g6c6f5e7fbf pkgrel=1 epoch=0 pkgdesc='A general purpose 3D CAD modeler - git checkout' @@ -59,12 +59,10 @@ prepare() { # patch out a build error #curl -L "https://github.com/FreeCAD/FreeCAD/pull/2842/commits/095984fce44931a4c8e2ace269d45a62640fbfb4.patch" | patch -p1 - # OpenCascade requires that /bin comes before /usr/bin in $PATH (no longer needed?) - #export PATH="/usr/bin:$PATH" - mkdir -p build cd build cmake -Wno-dev .. \ + -D BUILD_ENABLE_CXX_STD=C++14 \ -D BUILD_QT5=ON \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_C_FLAGS="${CFLAGS} -fPIC -w" \ @@ -84,6 +82,11 @@ build() { ninja -C build } +check() { + cd FreeCAD + ./build/bin/FreeCAD --console --run-test 0 +} + package() { cd FreeCAD DESTDIR="${pkgdir}" ninja -C build install @@ -109,7 +112,6 @@ package() { install -Dm644 freecad.svg \ "${pkgdir}/usr/share/icons/hicolor/scalable/apps/freecad.svg" - # Package symlinks in /usr/bin install -d "${pkgdir}/usr/bin" ln -sf /usr/lib/freecad/bin/FreeCAD "${pkgdir}/usr/bin/freecad"