summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/FreeCAD/FreeCAD.SlackBuild13
-rw-r--r--graphics/FreeCAD/FreeCAD.info6
-rw-r--r--graphics/FreeCAD/addBoostHeaders-200c7c7.patch34
3 files changed, 45 insertions, 8 deletions
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 <baildon.research@googlemail.com>
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
diff --git a/graphics/FreeCAD/FreeCAD.info b/graphics/FreeCAD/FreeCAD.info
index b9449797bc..6bca6eeea7 100644
--- a/graphics/FreeCAD/FreeCAD.info
+++ b/graphics/FreeCAD/FreeCAD.info
@@ -1,8 +1,8 @@
PRGNAM="FreeCAD"
-VERSION="0.17.13541"
+VERSION="0.18.4"
HOMEPAGE="https://www.freecadweb.org/"
-DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/9948ee4/FreeCAD-9948ee4f1570df9216862a79705afb367b2c6ffb.tar.gz"
-MD5SUM="1cc16667376a7c9d981319144b857e46"
+DOWNLOAD="https://github.com/FreeCAD/FreeCAD/archive/0.18.4.tar.gz"
+MD5SUM="fe797a27a8ee4fb2def4f95e8eadacdd"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="OpenCASCADE Pivy matplotlib pyside pyside-tools shiboken xerces-c"
diff --git a/graphics/FreeCAD/addBoostHeaders-200c7c7.patch b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch
new file mode 100644
index 0000000000..3e607c4366
--- /dev/null
+++ b/graphics/FreeCAD/addBoostHeaders-200c7c7.patch
@@ -0,0 +1,34 @@
+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"