<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cdc850a6be0ba1b5b5114f90c818252ef443b937">https://github.com/macports/macports-ports/commit/cdc850a6be0ba1b5b5114f90c818252ef443b937</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 cdc850a freecad: Use a patchfile instead of a reinplace
</span>cdc850a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cdc850a6be0ba1b5b5114f90c818252ef443b937
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Oct 28 22:02:00 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> freecad: Use a patchfile instead of a reinplace
</span>---
cad/freecad/Portfile | 13 ++------
cad/freecad/files/FindPySideTools.cmake.patch | 46 +++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 11 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 dfd6bc2..1dc9924 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;'>@@ -58,6 +58,8 @@ patchfiles cMake-FindCoin3D.cmake.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:#e0ffe0;'>+patchfiles-append FindPySideTools.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|QLibraryInfo::location.*|QLatin1String\(\"${applications_dir}/Qt4/\"\);|" \
${worksrcpath}/src/Gui/Assistant.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,17 +102,6 @@ pre-configure {
</span> -DOCE_DIR=${frameworks_dir}/OCE.framework/Versions/0.17/Resources
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|sed -i|sed -i .orig|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Arch/CMakeFiles/Arch.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Draft/CMakeFiles/Draft.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Material/CMakeFiles/Material.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/OpenSCAD/CMakeFiles/OpenSCAD.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Plot/CMakeFiles/Plot.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Ship/CMakeFiles/Ship.dir/build.make \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/build/src/Mod/Tux/CMakeFiles/Tux.dir/build.make
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
# link the executables back
ln -s ${prefix}/libexec/${name}/MacOS/FreeCAD \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/freecad/files/FindPySideTools.cmake.patch b/cad/freecad/files/FindPySideTools.cmake.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4d59957
</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/FindPySideTools.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Invoke sed in a BSD-sed-compatible way.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream has solved it in a different way, so this patch will not be needed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in later versions of freecad.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/FreeCAD/FreeCAD/commit/c44ade6961c39009dee34f61491f27ccf8b81852
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cMake/FindPySide2Tools.cmake.orig 2019-10-22 11:53:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cMake/FindPySide2Tools.cmake 2019-10-28 21:55:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we follow the tool command with in-place sed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND "${PYSIDE2UICBINARY}" "${infile}" -o "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND sed -i "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND sed -i .orig "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAIN_DEPENDENCY "${infile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we follow the tool command with in-place sed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND "${PYSIDE2RCCBINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND sed -i "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND sed -i .orig "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAIN_DEPENDENCY "${infile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cMake/FindPySideTools.cmake.orig 2019-10-22 11:53:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cMake/FindPySideTools.cmake 2019-10-28 21:55:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we follow the tool command with in-place sed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND "${PYSIDEUIC4BINARY}" "${infile}" -o "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND sed -i "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND sed -i .orig "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAIN_DEPENDENCY "${infile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we follow the tool command with in-place sed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND "${PYSIDERCC4BINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND sed -i "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMMAND sed -i .orig "/^# /d" "${outfile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAIN_DEPENDENCY "${infile}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(WIN32)
</span></pre><pre style='margin:0'>
</pre>