graphics/FreeCAD: Updated for version 0.19.2

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Christoph Willing 2021-05-19 12:24:18 +10:00 committed by Willy Sudiarto Raharjo
parent 2b1a22e5c8
commit 40b7a25a32
No known key found for this signature in database
GPG key ID: 3F617144D7238786
5 changed files with 17 additions and 79 deletions

View file

@ -25,7 +25,7 @@
# Maintained by David Spencer <baildon.research@googlemail.com>
PRGNAM=FreeCAD
VERSION=${VERSION:-0.18.4}
VERSION=${VERSION:-0.19.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -62,7 +62,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$VERSION.tar.gz
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@ -71,22 +71,6 @@ 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
occinc=/usr/include/opencascade
elif [ -d /opt/OpenCASCADE/inc ]; then
occinc=/opt/OpenCASCADE/inc
# However, 6.9.1's libs are in /usr/lib${LIBDIRSUFFIX} just like 7.3.0
# (see OCC_LIBRARY below)
else
echo "OpenCASCADE include directory was not found"
exit 1
fi
mkdir build
cd build
cmake \
@ -94,12 +78,18 @@ cd build
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/opt/$PRGNAM \
-DDOCDIR=/usr/doc/$PRGNAM-$VERSION \
-DOCC_INCLUDE_DIR:PATH=$occinc \
-DOCC_INCLUDE_DIR:PATH=/usr/include/opencascade \
-DOCC_LIBRARY:PATH=/usr/lib${LIBDIRSUFFIX} \
-DRESOURCEDIR=/opt/$PRGNAM/share/data \
-DBUILD_ENABLE_CXX_STD=C++14 \
-DBUILD_QT5=ON \
-DBUILD_FEM=OFF \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DFREECAD_USE_PYSIDE=ON \
-DFREECAD_USE_SHIBOKEN=ON \
-DOCCT_CMAKE_FALLBACK=ON \
-DCMAKE_BUILD_TYPE=Release ..
make
make install DESTDIR=$PKG
cd ..
@ -114,13 +104,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
# Copy icon, desktop file and mime info
mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps $PKG/usr/share/mime/packages
cp $PKG/opt/$PRGNAM/data/freecad.xpm $PKG/usr/share/pixmaps/
cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
cat $CWD/$PRGNAM.xml > $PKG/usr/share/mime/packages/$PRGNAM.xml
cp $PKG/opt/$PRGNAM/share/pixmaps/freecad.xpm $PKG/usr/share/pixmaps/
cp $PKG/opt/$PRGNAM/share/applications/*.desktop $PKG/usr/share/applications/
cp $PKG/opt/$PRGNAM/share/mime/packages/*.xml $PKG/usr/share/mime/packages/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
README.md ChangeLog.txt \
README.md ChangeLog.txt LICENSE \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild

View file

@ -1,10 +0,0 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=FreeCAD
Comment=General purpose 3D CAD modeler
Categories=Graphics;
Exec=/opt/FreeCAD/bin/FreeCAD
Icon=freecad
Terminal=false
StartupNotify=false

View file

@ -1,10 +1,10 @@
PRGNAM="FreeCAD"
VERSION="0.18.4"
VERSION="0.19.2"
HOMEPAGE="https://www.freecadweb.org/"
DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/0.18.4.tar.gz"
MD5SUM="fe797a27a8ee4fb2def4f95e8eadacdd"
DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/0.19.2/FreeCAD-0.19.2.tar.gz"
MD5SUM="5c13477c7cc2e9a8324da2e5aa47ef66"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenCASCADE Pivy matplotlib pyside pyside-tools shiboken xerces-c"
REQUIRES="OpenCASCADE Pivy pyside2 shiboken2 xerces-c"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"

View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
<mime-type type="application/x-extension-fcstd">
<sub-class-of type="application/zip"/>
<comment>FreeCAD document</comment>
<glob pattern="*.fcstd"/>
</mime-type>
</mime-info>

View file

@ -1,34 +0,0 @@
From 200c7c7e00d569ed9f00e06c9d9751a27fa67c2d Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 7 Jun 2020 17:21:37 +0200
Subject: [PATCH] [skip ci] include missing boost header
---
src/Gui/DAGView/DAGView.cpp | 1 +
src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp
index c4820b35606..e0f11e0bfde 100644
--- a/src/Gui/DAGView/DAGView.cpp
+++ b/src/Gui/DAGView/DAGView.cpp
@@ -22,6 +22,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+#include <boost/bind.hpp>
#include <QAbstractEventDispatcher>
#include <QVBoxLayout>
#endif
diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
index dd8161a90f1..e8bf2a629d3 100644
--- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
+++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp
@@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
+#include <boost/bind.hpp>
#endif
#include "ui_TaskSketcherGeneral.h"