From afc9e42772de8a69a6c2a028e98dc5ca8d96df52 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Thu, 8 Apr 2021 19:35:50 +0200 Subject: 20210408.1 global branch merge. Signed-off-by: Matteo Bernardini --- graphics/FreeCAD/FreeCAD.SlackBuild | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'graphics/FreeCAD/FreeCAD.SlackBuild') diff --git a/graphics/FreeCAD/FreeCAD.SlackBuild b/graphics/FreeCAD/FreeCAD.SlackBuild index 2efa262ff0..63c8c07832 100644 --- a/graphics/FreeCAD/FreeCAD.SlackBuild +++ b/graphics/FreeCAD/FreeCAD.SlackBuild @@ -25,8 +25,7 @@ # Maintained by David Spencer PRGNAM=FreeCAD -VERSION=${VERSION:-0.17.13541} -COMMIT=${COMMIT:-9948ee4f1570df9216862a79705afb367b2c6ffb} +VERSION=${VERSION:-0.18.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$COMMIT -tar xvf $CWD/$PRGNAM-$COMMIT.tar.gz -cd $PRGNAM-$COMMIT +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -72,6 +71,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch to fix boost header include according to https://github.com/FreeCAD/FreeCAD/commit/200c7c7e00d569ed9f00e06c9d9751a27fa67c2d#diff-b3a49ec758b2fdfb5ee0069b6c113f656133a89cabc0ae789398b41c3295aa57 +patch -p1 < $CWD/addBoostHeaders-200c7c7.patch + # SBo's OpenCASCADE 6.9.1 includes were in /opt/OpenCASCADE, but for 7.3.0 # the includes are in /usr/include/opencascade, so let's accept either :) if [ -d /usr/include/opencascade ]; then @@ -96,6 +98,7 @@ cd build -DOCC_LIBRARY:PATH=/usr/lib${LIBDIRSUFFIX} \ -DRESOURCEDIR=/opt/$PRGNAM/share/data \ -DBUILD_FEM=OFF \ + -DOCCT_CMAKE_FALLBACK=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG -- cgit v1.2.3