<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/ea48c6635143199360d22f86394611f49caa21bc">https://github.com/macports/macports-ports/commit/ea48c6635143199360d22f86394611f49caa21bc</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 ea48c66 freecad: update to version 0.17
</span>ea48c66 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ea48c6635143199360d22f86394611f49caa21bc
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Apr 15 19:02:23 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> freecad: update to version 0.17
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> disable FEM module, as dependents require hdf5 1.8.x
</span>---
cad/freecad/Portfile | 19 ++++++++++---------
cad/freecad/files/NULL.diff | 23 -----------------------
cad/freecad/files/patch-CMakeLists.txt.diff | 11 +++++++++++
cad/freecad/files/src-App-FreeCADInit.py.diff | 10 ----------
4 files changed, 21 insertions(+), 42 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 3586412..08bfc0c 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,7 +6,7 @@ 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.16.6712
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FreeCAD FreeCAD 0.17
</span> name freecad
categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +26,9 @@ long_description \
</span>
homepage https://www.freecadweb.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 02eee552016fc0664fdeef030569be082d600bad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 990aab10320921d14169979b19d349234f7d81de6921c23dbcd6d05be8bfa8a8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 111706057
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9f6da6f2d1b666e818de0103520d96c95cd089dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 db93b20132c97fe07b169ce453e656c94d05874f1a648c6ae4e446904ef2dcd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 192380486
</span>
depends_lib-append port:python27 \
port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,9 +48,10 @@ depends_lib-append port:python27 \
</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:#ffe0e0;'>- NULL.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src-App-FreeCADInit.py.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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# disable FreeCAD FEM module, as it requires hdf5 1.8.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.txt.diff
</span>
post-patch {
reinplace "s|QLibraryInfo::location.*|QLatin1String\(\"${applications_dir}/Qt4/\"\);|" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,10 +97,10 @@ pre-configure {
</span>
post-destroot {
# link the executables back
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/libexec/${name}/bin/FreeCAD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/${name}/MacOS/FreeCAD \
</span> ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/libexec/${name}/bin/FreeCADCmd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/${name}/MacOS/FreeCADCmd \
</span> ${destroot}${prefix}/bin
# create stub App
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/NULL.diff b/cad/freecad/files/NULL.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ff3b4e5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/files/NULL.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: ordered comparison between pointer and zero ('FILE *' (aka '__sFILE *') and 'int')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdParty/salomesmesh/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cpp.orig 2017-07-17 12:27:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdParty/salomesmesh/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cpp 2018-02-28 23:52:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *file2Read = (char *)myFile.c_str();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE* aFileId = fopen(file2Read, "r");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (aFileId < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (aFileId == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return DRS_FAIL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdParty/salomesmesh/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cpp.orig 2017-07-17 12:27:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdParty/salomesmesh/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cpp 2018-02-28 23:55:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *file2Read = (char *)myFile.c_str();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE* aFileId = fopen(file2Read, "w+");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (aFileId < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (aFileId == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return DRS_FAIL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/patch-CMakeLists.txt.diff b/cad/freecad/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1b179ac
</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-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2018-04-06 03:48:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-04-15 14:34:46.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -245,7 +245,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPTION(BUILD_FEM "Build the FreeCAD FEM module" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTION(BUILD_FEM "Build the FreeCAD FEM module" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(BUILD_ADDONMGR "Build the FreeCAD addon manager module" ON)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/src-App-FreeCADInit.py.diff b/cad/freecad/files/src-App-FreeCADInit.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 17c57ca..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/freecad/files/src-App-FreeCADInit.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/App/FreeCADInit.py.orig 2017-07-17 12:27:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/App/FreeCADInit.py 2018-02-28 23:48:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,6 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Log('Init: Initializing ' + Dir + '... done\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Log('Init: Initializing ' + Dir + '(Init.py not found)... ignore\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.path.insert(0,BinDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.path.insert(0,LibDir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.path.insert(0,Lib64Dir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.path.insert(0,ModDir)
</span></pre><pre style='margin:0'>
</pre>