<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/3441e8eefa0d0ab05a764160d1b168b6a310be62">https://github.com/macports/macports-ports/commit/3441e8eefa0d0ab05a764160d1b168b6a310be62</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3441e8eefa0d0ab05a764160d1b168b6a310be62
</span>Author: Ryan Schmidt <git@ryandesign.com>
AuthorDate: Thu Mar 1 10:55:35 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> FreeCAD: Update to 0.16.6712
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55847
</span>---
cad/freecad/Portfile | 17 +++++++++--------
cad/freecad/files/NULL.diff | 23 +++++++++++++++++++++++
cad/freecad/files/src-App-FreeCADInit.py.diff | 10 +++++-----
3 files changed, 37 insertions(+), 13 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 a91db7b..e622218 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,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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup FreeCAD FreeCAD 0.16.6712
</span> name freecad
categories cad
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,10 +24,11 @@ long_description \
</span> Source (LGPL2+ license) and extremely modular, allowing for very \
advanced extension and customization.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.freecadweb.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.freecadweb.org
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 21974e87bfa6ea9b1a8ceb4a3cc3dbf1f74c685b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f4ac4b38a32086155506717885d239453131cc64b177b75616f44163276d343
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 02eee552016fc0664fdeef030569be082d600bad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 990aab10320921d14169979b19d349234f7d81de6921c23dbcd6d05be8bfa8a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 111706057
</span>
depends_lib-append port:python27 \
port:boost \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ depends_lib-append port:python27 \
</span> depends_run port:qt4-mac-sqlite3-plugin
patchfiles cMake-FindCoin3D.cmake.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL.diff \
</span> src-App-FreeCADInit.py.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,9 +89,9 @@ pre-configure {
</span> -DPYTHON_LIBRARY=${python_prefix}/Python \
-DPYTHON_INCLUDE_DIR=${python_prefix}/Headers \
-DPYTHON_EXECUTABLE=${python_prefix}/bin/python2.7 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DShiboken_DIR=${python_prefix}/lib/cmake/Shiboken-1.2.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPySide_DIR=${python_prefix}/lib/cmake/PySide-1.2.2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOCE_DIR=${frameworks_dir}/OCE.framework/Versions/0.15/Resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DShiboken_DIR=${python_prefix}/lib/cmake/Shiboken-1.2.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPySide_DIR=${python_prefix}/lib/cmake/PySide-1.2.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOCE_DIR=${frameworks_dir}/OCE.framework/Versions/0.17/Resources
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/NULL.diff b/cad/freecad/files/NULL.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ff3b4e5
</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/NULL.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: ordered comparison between pointer and zero ('FILE *' (aka '__sFILE *') and 'int')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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:#e0ffe0;'>+@@ -52,7 +52,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ****************************************************************************/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *file2Read = (char *)myFile.c_str();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE* aFileId = fopen(file2Read, "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (aFileId < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (aFileId == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return DRS_FAIL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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:#e0ffe0;'>+@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *file2Read = (char *)myFile.c_str();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE* aFileId = fopen(file2Read, "w+");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (aFileId < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (aFileId == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return DRS_FAIL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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><span style='display:block; white-space:pre;color:#808080;'>index 96ee40e..17c57ca 100644
</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;'>+++ b/cad/freecad/files/src-App-FreeCADInit.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/App/FreeCADInit.py.orig 2014-07-13 10:33:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/App/FreeCADInit.py 2014-07-17 20:19:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,6 +101,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/App/FreeCADInit.py.orig 2017-07-17 12:27:47.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/App/FreeCADInit.py 2018-02-28 23:48:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,6 +110,7 @@
</span> Log('Init: Initializing ' + Dir + '... done\n')
else:
Log('Init: Initializing ' + Dir + '(Init.py not found)... ignore\n')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.path.insert(0,BinDir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.path.insert(0,BinDir)
</span> sys.path.insert(0,LibDir)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys.path.insert(0,Lib64Dir)
</span> sys.path.insert(0,ModDir)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Log("Using "+ModDir+" as module path!\n")
</span></pre><pre style='margin:0'>
</pre>