<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d0bd8794340c57b55aa8962b4eb52908ed4c1bf2">https://github.com/macports/macports-ports/commit/d0bd8794340c57b55aa8962b4eb52908ed4c1bf2</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 d0bd879 New port: openscad-devel. Newer pre-release version of openscad port. Courtesy of kencu.
</span>d0bd879 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d0bd8794340c57b55aa8962b4eb52908ed4c1bf2
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Thu Jul 26 22:55:55 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> New port: openscad-devel. Newer pre-release version of openscad port. Courtesy of kencu.
</span>---
science/openscad/Portfile | 100 +++++++++++++++------
.../openscad/files/patch-DEVEL-openscad.pro.diff | 12 +++
.../files/patch-DEVEL-src-AppleEvents.cc.diff | 8 ++
.../files/patch-DEVEL-src-scintillaeditor.h.diff | 13 +++
4 files changed, 105 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/Portfile b/science/openscad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 681e345..c1da2df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openscad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,72 @@ PortSystem 1.0
</span> PortGroup qmake 1.0
name openscad
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2015.03-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport openscad-devel {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "openscad"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts openscad-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2015.03-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites http://files.openscad.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles ${distname}.src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5d2a7d83c32f4201ee0d17445a36baccaebc0bc7facd009fc8dd86ee537c5a36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles for openscad 2015.03-3 release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix these errors, as per https://bugreports.qt.io/browse/QTBUG-22829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #src/scintillaeditor.h -o objects/moc_scintillaeditor.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #src/QGLView.h -o objects/moc_QGLView.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #:info:build opt/local/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On 10.6: src/AppleEvents.cc:2:22: error: MacTypes.h: No such file or directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-scintillaeditor.h.diff patch-src-colormap.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix the Qsci library name changed in 2.10.0 release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qscintilla2.prf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix Objective C++ flags when using libc++; remove -W warnings to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow more robust building; remove MACOSX_DEPLOYMENT_TARGET to allow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for building on older MacOS when bootstrapping libc++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex ${name}-(\[0-9.-\]+).src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "openscad-devel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts openscad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup openscad openscad e7c0851d4023817b2a11df2583d6f406f3b58883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2018.04-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 57ce759879770675cb7853a6735ad66a5956ddd1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 40447cbb91a853a16dc1872063cd5c90150356ff31c4d8b5e6296a7a4ec26f23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/libraries "${prefix}/bin/git clone https://github.com/openscad/MCAD.git"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles - unchanged from 2015.03-1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-src-colormap.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix the Qsci library name changed in 2.10.0 release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qscintilla2.prf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patchfiles - changed for 2018.04-1 devel release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #:info:build opt/local/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-DEVEL-src-scintillaeditor.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On 10.6: src/AppleEvents.cc:2:22: error: MacTypes.h: No such file or directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-DEVEL-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # remove MACOSX_DEPLOYMENT_TARGET to allow
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for building on older MacOS when bootstrapping libc++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-DEVEL-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> license GPL-2
categories science cad
maintainers {dstrubbe @dstrubbe} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,12 +98,6 @@ long_description ${description}. \
</span> platforms darwin
homepage http://www.openscad.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://files.openscad.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${distname}.src${extract.suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5d2a7d83c32f4201ee0d17445a36baccaebc0bc7facd009fc8dd86ee537c5a36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:bison \
port:flex \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,20 +120,6 @@ configure.env-append \
</span> configure.pre_args-append \
VERSION=${version} CONFIG-=debug openscad.pro
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix these errors, as per https://bugreports.qt.io/browse/QTBUG-22829
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#src/scintillaeditor.h -o objects/moc_scintillaeditor.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#src/QGLView.h -o objects/moc_QGLView.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#:info:build opt/local/include/boost/type_traits/detail/has_binary_operator.hp:50: Parse error at "BOOST_JOIN"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On 10.6: src/AppleEvents.cc:2:22: error: MacTypes.h: No such file or directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-scintillaeditor.h.diff patch-src-colormap.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix the Qsci library name changed in 2.10.0 release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qscintilla2.prf.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix Objective C++ flags when using libc++; remove -W warnings to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow more robust building; remove MACOSX_DEPLOYMENT_TARGET to allow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# for building on older MacOS when bootstrapping libc++.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build yes
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,20 +159,20 @@ post-destroot {
</span> file delete ${destroot}${prefix}/share/pixmaps/openscad.png
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# need cmake dependency, and to set DYLD_LIBRARY_PATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# need cmake and ImageMagick dependency, and to set DYLD_LIBRARY_PATH
</span> # First 194 passed, remaining 1016 failed, with Error: openscad_nogui failed with return code -11
# Advice from link below did not help unfortunately.
# https://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Linux/UNIX#Test_suite_problems
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# assert tests fail, needs to be enabled as Feature according to http://forum.openscad.org/feedback-let-echo-and-assert-in-expressions-td19111.html
</span> test.run yes
pre-test {
set worksrcdir ${worksrcdir}/tests
}
test {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "chmod -R a+rw ."
</span> system -W ${worksrcpath} "cmake . -DCOMPARATOR=ncc"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # or AE, ncc, unspecified, old, diffpng
</span> system -W ${worksrcpath} "make -j"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${prefix}/bin/ctest -C All"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${prefix}/bin/ctest -C Default --verbose"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # or All, Default, Heavy, Examples
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.-\]+).src${extract.suffix}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-DEVEL-openscad.pro.diff b/science/openscad/files/patch-DEVEL-openscad.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b3f13b9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openscad/files/patch-DEVEL-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- openscad.pro.orig 2018-04-02 14:30:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ openscad.pro 2018-04-02 14:34:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_BUNDLE_DATA += APP_RESOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBS += -framework Cocoa -framework ApplicationServices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# QMAKE_OBJECTIVE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set same stack size for the linker and #define used in PlatformUtils.h
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-DEVEL-src-AppleEvents.cc.diff b/science/openscad/files/patch-DEVEL-src-AppleEvents.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1a5c1a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openscad/files/patch-DEVEL-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/AppleEvents.cc.orig 2018-04-02 14:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/AppleEvents.cc 2018-04-02 14:26:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "AppleEvents.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <MacTypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AssertMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QApplication>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-DEVEL-src-scintillaeditor.h.diff b/science/openscad/files/patch-DEVEL-src-scintillaeditor.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d17b4c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/openscad/files/patch-DEVEL-src-scintillaeditor.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/scintillaeditor.h.orig 2016-06-13 12:19:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/scintillaeditor.h 2016-06-13 12:27:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,8 +12,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "parsersettings.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "memory.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef Q_MOC_RUN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/property_tree/ptree.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/property_tree/json_parser.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class EditorColorScheme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>