<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b9a2d7f280669f3a600f68b81761f9b08d0d18b6">https://github.com/macports/macports-ports/commit/b9a2d7f280669f3a600f68b81761f9b08d0d18b6</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 b9a2d7f2806 OpenSCAD 2021.01 (#19257)
</span>b9a2d7f2806 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b9a2d7f280669f3a600f68b81761f9b08d0d18b6
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Sun Jul 2 17:19:28 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> OpenSCAD 2021.01 (#19257)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * OpenSCAD 2021.01: WIP
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Openscan: require qt5-qtmultimedia
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openscad: Needs c++14 now; don't disable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Was checking for libboost_thread* in standard (/lib) location,
</span><span style='display:block; white-space:pre;color:#404040;'> which only exists if the 'boost' port itself is installed. Fails
</span><span style='display:block; white-space:pre;color:#404040;'> with tons of errors (from boost) if c++14 isn't active.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openscad-devel: Remove (obsolete)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * openscad: Final cleanup / dorp old patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * cgal4: rev-bump to force build; openscad build fix.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * OpenCSG: revbump
</span>---
gis/cgal4/Portfile | 8 +-
science/OpenCSG/Portfile | 4 +-
science/openscad/Portfile | 142 +++++++++------------
.../openscad/files/patch-DEVEL-openscad.pro.diff | 12 --
.../files/patch-DEVEL-src-AppleEvents.cc.diff | 8 --
.../files/patch-DEVEL-src-scintillaeditor.h.diff | 13 --
science/openscad/files/patch-c++std.pri.diff | 27 ++++
science/openscad/files/patch-openscad.pro.diff | 34 -----
science/openscad/files/patch-qscintilla2.prf.diff | 20 ---
.../openscad/files/patch-src-AppleEvents.cc.diff | 8 --
science/openscad/files/patch-src-colormap.h.diff | 12 --
.../files/patch-src-scintillaeditor.h.diff | 13 --
12 files changed, 96 insertions(+), 205 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/cgal4/Portfile b/gis/cgal4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a589e82fa6..dc692c02cfc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/cgal4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/cgal4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ long_description The goal of the ${description} is to provide easy access to\
</span> platforms darwin
github.setup CGAL cgal 4.14.3 releases/CGAL-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 c297a51c63a8161000d91128628d8c20ffdbf487 \
sha256 5bafe7abe8435beca17a1082062d363368ec1e3f0d6581bb0da8b010fb389fe4 \
size 15618196
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ distname CGAL-${version}
</span>
homepage http://www.cgal.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.76
</span>
depends_lib-append port:mpfr \
port:zlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,12 @@ depends_lib-append port:mpfr \
</span> configure.args-append -DCGAL_INSTALL_CMAKE_DIR="share/CGAL/cmake" \
-DWITH_CGAL_Qt5:BOOL=OFF \
-DWITH_Eigen3:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_ZLIB:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_ZLIB:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_STANDARD=11
</span>
# gcc 4.0 is too old to compile CGAL properly; see <http://www.cgal.org/FAQ.html#mac_optimization_bug>
compiler.blacklist-append gcc-4.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
variant debug description {Build with debug symbols} {
configure.args-delete -DCMAKE_BUILD_TYPE=Release
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/OpenCSG/Portfile b/science/OpenCSG/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 615eb3e290f..6a8226f50e4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/OpenCSG/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/OpenCSG/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span>
name OpenCSG
version 1.4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> license GPL-2
categories science cad
maintainers {dstrubbe @dstrubbe} openmaintainer
<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 d4513b0ae60..21c5d30bee9 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;'>@@ -1,79 +1,37 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qmake5 1.0
</span> PortGroup boost 1.0
name openscad
subport openscad-devel {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version 1.76
</span>
if {${subport} eq "openscad"} {
conflicts openscad-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2015.03-3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2021.01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> master_sites http://files.openscad.org
distfiles ${distname}.src${extract.suffix}
<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><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles for openscad 2015.03-3 release
</span><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:#e0ffe0;'>+ checksums rmd160 886e111da28bfb78c64ba1bbfaa555c980dad22d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 15817555
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only builds against libc++ now; requires c++14.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-c++std.pri.diff
</span>
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]
livecheck.regex ${name}-(\[0-9.-\]+).src${extract.suffix}
} elseif {${subport} eq "openscad-devel"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts openscad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup openscad openscad e7c0851d4023817b2a11df2583d6f406f3b58883
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2018.04-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 57ce759879770675cb7853a6735ad66a5956ddd1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 40447cbb91a853a16dc1872063cd5c90150356ff31c4d8b5e6296a7a4ec26f23
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # should move this to another distfile at some point instead of using git clone
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract-append port:git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/libraries "${prefix}/bin/git clone https://github.com/openscad/MCAD.git"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles - unchanged from 2015.03-1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-src-colormap.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patchfiles - changed for 2018.04-1 devel release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>- patchfiles-append patch-DEVEL-src-scintillaeditor.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-append patch-DEVEL-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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-DEVEL-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by openscad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2021.01
</span> }
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,25 +39,27 @@ categories science cad
</span> maintainers {dstrubbe @dstrubbe} openmaintainer
description Software for creating solid 3D CAD objects
long_description ${description}. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Unlike most free software for creating 3D models (such as the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- famous application Blender) it does not focus on the artistic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aspects of 3D modelling but instead on the CAD aspects. Thus \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it might be the application you are looking for when you are \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- planning to create 3D models of machine parts but pretty sure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- is not what you are looking for when you are more interested \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in creating computer-animated movies. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OpenSCAD is not an interactive modeller. Instead it is something \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- like a 3D-compiler that reads in a script file that describes \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the object and renders the 3D model from this script file. This \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gives you (the designer) full control over the modelling process \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and enables you to easily change any step in the modelling process \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- or make designes that are defined by configurable parameters. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OpenSCAD provides two main modelling techniques: First there is \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constructive solid geometry (aka CSG) and second there is extrusion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of 2D outlines. As data exchange format for this 2D outlines \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Autocad DXF files are used. In addition to 2D paths for extrusion \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- it is also possible to read design parameters from DXF files. Besides \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DXF files OpenSCAD can read and create 3D models in the STL and OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Unlike most free software for creating 3D models (such \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ as the famous application Blender) it does not focus on the \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ artistic aspects of 3D modelling but instead on the CAD \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ aspects. Thus it might be the application you are looking \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for when you are planning to create 3D models of machine \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parts but pretty sure is not what you are looking for when \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ you are more interested in creating computer-animated \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ movies. OpenSCAD is not an interactive modeller. Instead \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ it is something like a 3D-compiler that reads in a script \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file that describes the object and renders the 3D model \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from this script file. This gives you (the designer) full \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ control over the modelling process and enables you to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ easily change any step in the modelling process or make \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ designes that are defined by configurable parameters. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OpenSCAD provides two main modelling techniques: First \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ there is constructive solid geometry (aka CSG) and second \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ there is extrusion of 2D outlines. As data exchange format \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for this 2D outlines Autocad DXF files are used. In \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ addition to 2D paths for extrusion it is also possible to \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read design parameters from DXF files. Besides DXF files \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OpenSCAD can read and create 3D models in the STL and OFF \
</span> file formats.
platforms darwin
homepage http://www.openscad.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,21 +69,43 @@ depends_build-append \
</span> port:flex \
path:share/pkgconfig/eigen3.pc:eigen3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:cgal4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glew \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:double-conversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:eigen3 \
</span> port:gmp \
port:mpfr \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:OpenCSG \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qscintilla-qt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:glew \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libffi \
</span> port:freetype \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ragel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/harfbuzz.pc:harfbuzz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libzip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span> port:fontconfig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/harfbuzz.pc:harfbuzz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hidapi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ossp-uuid \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lib3mf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpixman \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cgal4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:OpenCSG \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qscintilla-qt5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qt5-qtmultimedia
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2014
</span>
configure.env-append \
OPENSCAD_LIBRARIES=${prefix}
configure.pre_args-append \
VERSION=${version} CONFIG-=debug openscad.pro
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Let qmake take care of this; we are building for the OS we are on.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/QMAKE_MACOSX_DEPLOYMENT_TARGET.*//" openscad.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Grabs ccache if it exists independent of settings; crowbar.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s/ccache/false/" openscad.pro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-destroot {
# The install location is wrong so we have to move the files to the expected places
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3f13b94128..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-DEVEL-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openscad.pro.orig 2018-04-02 14:30:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openscad.pro 2018-04-02 14:34:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +81,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APP_RESOURCES.files = OpenSCAD.sdef dsa_pub.pem icons/SCAD.icns
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_BUNDLE_DATA += APP_RESOURCES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -framework Cocoa -framework ApplicationServices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# QMAKE_OBJECTIVE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a5c1a1839f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-DEVEL-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/AppleEvents.cc.orig 2018-04-02 14:25:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/AppleEvents.cc 2018-04-02 14:26:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "AppleEvents.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <MacTypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AssertMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d17b4c73f79..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-DEVEL-src-scintillaeditor.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/scintillaeditor.h.orig 2016-06-13 12:19:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/scintillaeditor.h 2016-06-13 12:27:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,8 +12,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "parsersettings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "memory.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_MOC_RUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/property_tree/ptree.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/property_tree/json_parser.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class EditorColorScheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-c++std.pri.diff b/science/openscad/files/patch-c++std.pri.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..812eb45d46f
</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-c++std.pri.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- c++std.pri.orig 2023-06-28 11:53:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ c++std.pri 2023-06-28 11:54:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,22 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Mac needs special care to link against the correct C++ library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # We attempt to auto-detect it by inspecting Boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for(dir, dirs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- system(otool -L $${dir}/libboost_thread* | grep libc++ >& /dev/null ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message("Using libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message("Using libstdc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG += libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- c++std {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # libc++ is a requirement for using C++14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- warning("Disabling C++14 since libstdc++ dependencies were found")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CONFIG -= c++std
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message("Using libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CONFIG += libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-openscad.pro.diff b/science/openscad/files/patch-openscad.pro.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 741edb7c2f4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-openscad.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openscad.pro.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openscad.pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -117,8 +117,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_LFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_OBJECTIVE_CFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # libc++ on requires Mac OS X 10.7+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMAKE_OBJECTIVE_CXXFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,21 +172,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *g++* {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMAKE_CXXFLAGS *= -fno-strict-aliasing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedefs # ignored before 4.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--*clang* {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # http://llvm.org/bugs/show_bug.cgi?id=9182
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-overloaded-virtual
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # disable enormous amount of warnings about CGAL / boost / etc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # gettext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-format-security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # might want to actually turn this on once in a while
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG(skip-version-check) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-qscintilla2.prf.diff b/science/openscad/files/patch-qscintilla2.prf.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7164a9a28c2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-qscintilla2.prf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- qscintilla2.prf.orig 2017-02-22 09:40:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ qscintilla2.prf 2017-02-22 09:41:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CONFIG(debug, debug|release) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #LIBS += -lqscintilla2_debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS += -lqscintilla2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS += -lqscintilla2_qt4_debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -lqscintilla2d
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mac: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBS += -lqscintilla2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBS += -lqscintilla2_qt4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- win32: {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS += -lqscintilla2
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-src-AppleEvents.cc.diff b/science/openscad/files/patch-src-AppleEvents.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38dca69ea3b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-src-AppleEvents.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/AppleEvents.cc.orig 2016-06-14 14:01:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/AppleEvents.cc 2016-06-14 14:01:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,5 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AppleEvents.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <MacTypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QApplication>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "MainWindow.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-src-colormap.h.diff b/science/openscad/files/patch-src-colormap.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 42c4bbb0ea2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-src-colormap.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/colormap.h.orig 2016-06-13 12:49:57.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/colormap.h 2016-06-13 13:04:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,7 +7,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/shared_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/filesystem.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_MOC_RUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/property_tree/ptree.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace fs = boost::filesystem;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/openscad/files/patch-src-scintillaeditor.h.diff b/science/openscad/files/patch-src-scintillaeditor.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7fa593d5c30..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/openscad/files/patch-src-scintillaeditor.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/scintillaeditor.h.orig 2016-06-13 12:19:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/scintillaeditor.h 2016-06-13 12:27:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,8 +12,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "parsersettings.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/shared_ptr.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef Q_MOC_RUN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/property_tree/ptree.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/property_tree/json_parser.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class EditorColorScheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>