<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb53e55876a4da1e0977287035d1691273eeab00">https://github.com/macports/macports-ports/commit/bb53e55876a4da1e0977287035d1691273eeab00</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bb53e55 freecad: update to 0.18.4
</span>bb53e55 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb53e55876a4da1e0977287035d1691273eeab00
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Oct 28 20:00:39 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> freecad: update to 0.18.4
</span>---
cad/freecad/Portfile | 34 ++++++++++++++++++------
cad/freecad/files/patch-src-Main-MainPy.cpp.diff | 14 ++++++++++
2 files changed, 40 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/Portfile b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6587b4..dfd6bc2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/freecad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup compilers 1.0
</span> PortGroup github 1.0
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup FreeCAD FreeCAD 0.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FreeCAD FreeCAD 0.18.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> name freecad
categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,16 +27,18 @@ long_description \
</span>
homepage https://www.freecadweb.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f6da6f2d1b666e818de0103520d96c95cd089dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 db93b20132c97fe07b169ce453e656c94d05874f1a648c6ae4e446904ef2dcd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 192380486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2fdb6bb247571e2ffaffaca1defb02ca0b2e1cc5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d2f10f861cbcc9d19b34f79cd1c96baca2f23174f232e834f64a7c4a74f5f1e7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 219760632
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:doxygen
</span>
depends_lib-append port:boost \
port:Coin-framework \
port:eigen3 \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:oce \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opencascade \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-backports-functools_lru_cache \
</span> port:py27-matplotlib \
port:py27-pivy \
port:py27-pyside \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +52,8 @@ depends_lib-append port:boost \
</span>
depends_run port:qt4-mac-sqlite3-plugin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles cMake-FindCoin3D.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles cMake-FindCoin3D.cmake.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Main-MainPy.cpp.diff
</span>
# disable FreeCAD FEM module, as it requires hdf5 1.8.x
patchfiles-append patch-CMakeLists.txt.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +100,17 @@ pre-configure {
</span> -DOCE_DIR=${frameworks_dir}/OCE.framework/Versions/0.17/Resources
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|sed -i|sed -i .orig|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Arch/CMakeFiles/Arch.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Draft/CMakeFiles/Draft.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Material/CMakeFiles/Material.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/OpenSCAD/CMakeFiles/OpenSCAD.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Plot/CMakeFiles/Plot.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Ship/CMakeFiles/Ship.dir/build.make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${workpath}/build/src/Mod/Tux/CMakeFiles/Tux.dir/build.make
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# link the executables back
ln -s ${prefix}/libexec/${name}/MacOS/FreeCAD \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,4 +132,8 @@ post-destroot {
</span> reinplace -W ${appdir}/Contents/MacOS "s,@@PREFIX@@,${prefix},g" FreeCAD
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant oce description {use Community Edition version of Open CASCADE} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:opencascade port:oce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> github.livecheck.regex {(\d\.\d+(\.\d+)?(?!_pre))}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/patch-src-Main-MainPy.cpp.diff b/cad/freecad/files/patch-src-Main-MainPy.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a5bb12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/freecad/files/patch-src-Main-MainPy.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Main/MainPy.cpp.orig 2019-05-11 06:02:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Main/MainPy.cpp 2019-06-16 16:46:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -143,7 +143,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // backwards since the FreeCAD path was likely appended just before
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // we were imported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = PyList_Size(pySysPath) - 1; i >= 0 ; --i) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *basePath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char *basePath;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *pyPath = PyList_GetItem(pySysPath, i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ long sz = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>