Sat Jun 22 12:57:50 2019 UTC ()
(cad/openscad) Updated 2015.03-3 to 2019.05 (Re: PR pkg/54302)

# OpenSCAD 2019.05

**Language Features:**

* New modules
    * assert() - stop script evaluation on failed constraints
    * let() - scoped assignment
* New functions
    * ord() - convert from character to Unicode code point
    * echo()
    * assert() - stop script evaluation on failed constraints
    * Type testing functions: is_undef(), is_list(), is_num(), is_bool(), is_string()
* New special variable: $preview variable which is set to true in preview mode
* List comprehension updates
   * Added if/else condition
   * Added each keyword
   * Added C-style for loop
   * Now allows looping over characters of a string
* rotate_extrude(): Added angle parameter to
* import() now supports SVG, 3MF and AMF
* color() now supports hex color codes
* Removed glide() and subdiv() which were never implemented

**Program Features:**

* Customizer: Allow parametrizing design parameters with GUI customization
* Support for using 3D-Mouse / Joystick / Gamepad input devices for controlling the 3D view
* 3D Printing support: Purchase from a print service partner or print to Octoprint
* New export file formats: SVG, 3MF, AMF
* Quick-edit and preview of values using Alt-Arrows (Shift-Alt-Arrows on macOS)
* Added --view cmd-line parameter
* Play sound notification on render complete
* Line numbers and filenames are now shown for many errors and warnings
* Hardwarning preference: Stop on first warning
* Hardwarning and assert now shows a stack trace
* New warnings
    * Module call parameterns don't match module declaration
    * Argument value of of range
    * Duplicate passed argument
    * Children passed to module not accepting children
    * Reference to inknown $special_variables
    * Duplicate assigment
* New translations: Ukrainian, Polish


(mef)
diff -r1.56 -r1.57 pkgsrc/cad/openscad/Makefile
diff -r1.2 -r1.3 pkgsrc/cad/openscad/PLIST
diff -r1.7 -r1.8 pkgsrc/cad/openscad/distinfo
diff -r0 -r1.1 pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf
diff -r1.1 -r0 pkgsrc/cad/openscad/patches/patch-src_CSGTermEvaluator.cc
diff -r1.1 -r1.2 pkgsrc/cad/openscad/patches/patch-src_colormap.h
diff -r1.1 -r1.2 pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h

cvs diff -r1.56 -r1.57 pkgsrc/cad/openscad/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/openscad/Makefile 2019/06/08 11:04:29 1.56
+++ pkgsrc/cad/openscad/Makefile 2019/06/22 12:57:50 1.57
@@ -1,34 +1,31 @@ @@ -1,34 +1,31 @@
1# $NetBSD: Makefile,v 1.56 2019/06/08 11:04:29 rillig Exp $ 1# $NetBSD: Makefile,v 1.57 2019/06/22 12:57:50 mef Exp $
2# 
3 2
4DISTNAME= openscad-2015.03-3.src 3VERSION= 2019.05
5PKGNAME= openscad-2015.03p3 4DISTNAME= openscad-${VERSION}
6PKGREVISION= 14 
7CATEGORIES= cad 5CATEGORIES= cad
8MASTER_SITES= http://files.openscad.org/ 6MASTER_SITES= ${MASTER_SITE_GITHUB:=openscad/}
 7GITHUB_TAG= openscad-${VERSION}
9 8
10MAINTAINER= reinoud@NetBSD.org 9MAINTAINER= reinoud@NetBSD.org
11HOMEPAGE= http://www.openscad.org/ 10HOMEPAGE= http://www.openscad.org/
12COMMENT= OpenSCAD - The Programmers Solid 3D CAD Modeller 11COMMENT= OpenSCAD - The Programmers Solid 3D CAD Modeller
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
16USE_TOOLS+= bison gettext pkg-config 15USE_TOOLS+= bison gettext pkg-config
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18 17
19WRKSRC= ${WRKDIR}/${DISTNAME:R} 18WRKSRC= ${WRKDIR}/${PKGBASE}-${DISTNAME}
20 
21MAKE_JOBS_SAFE= no 
22 19
23CHECK_PORTABILITY_SKIP+= tests/compare-bitmaps.sh 20CHECK_PORTABILITY_SKIP+= tests/compare-bitmaps.sh
24 21
25REPLACE_PYTHON= libraries/MCAD/get_submodules.py 22REPLACE_PYTHON= libraries/MCAD/get_submodules.py
26.include "../../lang/python/application.mk" 23.include "../../lang/python/application.mk"
27 24
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 25MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 26
30do-configure: 27do-configure:
31 cd ${WRKSRC} && ${QTDIR}/bin/qmake \ 28 cd ${WRKSRC} && ${QTDIR}/bin/qmake \
32 PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex \ 29 PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex \
33 QMAKE_CXXFLAGS+=-std=c++0x 30 QMAKE_CXXFLAGS+=-std=c++0x
34 31
@@ -39,15 +36,16 @@ do-configure: @@ -39,15 +36,16 @@ do-configure:
39.include "../../devel/gmp/buildlink3.mk" 36.include "../../devel/gmp/buildlink3.mk"
40.include "../../fonts/fontconfig/buildlink3.mk" 37.include "../../fonts/fontconfig/buildlink3.mk"
41.include "../../fonts/harfbuzz/buildlink3.mk" 38.include "../../fonts/harfbuzz/buildlink3.mk"
42.include "../../graphics/freetype2/buildlink3.mk" 39.include "../../graphics/freetype2/buildlink3.mk"
43.include "../../graphics/glew/buildlink3.mk" 40.include "../../graphics/glew/buildlink3.mk"
44.include "../../graphics/opencsg/buildlink3.mk" 41.include "../../graphics/opencsg/buildlink3.mk"
45.include "../../math/cgal/buildlink3.mk" 42.include "../../math/cgal/buildlink3.mk"
46.include "../../math/eigen3/buildlink3.mk" 43.include "../../math/eigen3/buildlink3.mk"
47.include "../../math/mpfr/buildlink3.mk" 44.include "../../math/mpfr/buildlink3.mk"
48.include "../../sysutils/desktop-file-utils/desktopdb.mk" 45.include "../../sysutils/desktop-file-utils/desktopdb.mk"
49.include "../../x11/qt4-libs/buildlink3.mk" 46.include "../../x11/qt4-libs/buildlink3.mk"
50.include "../../x11/qt4-tools/buildlink3.mk" 47.include "../../x11/qt4-tools/buildlink3.mk"
51.include "../../x11/qt4-qscintilla/buildlink3.mk" 48.include "../../x11/qt4-qscintilla/buildlink3.mk"
52 49.include "../../textproc/libxml++/buildlink3.mk"
 50.include "../../math/double-conversion/buildlink3.mk"
53.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"

cvs diff -r1.2 -r1.3 pkgsrc/cad/openscad/PLIST (expand / switch to unified diff)

--- pkgsrc/cad/openscad/PLIST 2016/09/01 19:53:36 1.2
+++ pkgsrc/cad/openscad/PLIST 2019/06/22 12:57:50 1.3
@@ -1,57 +1,59 @@ @@ -1,57 +1,59 @@
1@comment $NetBSD: PLIST,v 1.2 2016/09/01 19:53:36 plunky Exp $ 1@comment $NetBSD: PLIST,v 1.3 2019/06/22 12:57:50 mef Exp $
2bin/openscad 2bin/openscad
3man/man1/openscad.1 3man/man1/openscad.1
4share/appdata/openscad.appdata.xml 
5share/applications/openscad.desktop 4share/applications/openscad.desktop
 5share/metainfo/org.openscad.OpenSCAD.appdata.xml
6share/mime/packages/openscad.xml 6share/mime/packages/openscad.xml
7share/openscad/color-schemes/editor/dark-background.json 7share/openscad/color-schemes/editor/dark-background.json
8share/openscad/color-schemes/editor/light-background.json 8share/openscad/color-schemes/editor/light-background.json
9share/openscad/color-schemes/editor/monokai.json 9share/openscad/color-schemes/editor/monokai.json
10share/openscad/color-schemes/editor/solarized-dark.json 10share/openscad/color-schemes/editor/solarized-dark.json
11share/openscad/color-schemes/editor/solarized-light.json 11share/openscad/color-schemes/editor/solarized-light.json
12share/openscad/color-schemes/editor/tomorrow-night.json 12share/openscad/color-schemes/editor/tomorrow-night.json
13share/openscad/color-schemes/editor/tomorrow.json 13share/openscad/color-schemes/editor/tomorrow.json
14share/openscad/color-schemes/editor/visualstudio.json 14share/openscad/color-schemes/editor/visualstudio.json
15share/openscad/color-schemes/readme.txt 15share/openscad/color-schemes/readme.txt
16share/openscad/color-schemes/render/beforedawn.json 16share/openscad/color-schemes/render/beforedawn.json
17share/openscad/color-schemes/render/deepocean.json 17share/openscad/color-schemes/render/deepocean.json
18share/openscad/color-schemes/render/metallic.json 18share/openscad/color-schemes/render/metallic.json
19share/openscad/color-schemes/render/monotone.json 19share/openscad/color-schemes/render/monotone.json
20share/openscad/color-schemes/render/nature.json 20share/openscad/color-schemes/render/nature.json
21share/openscad/color-schemes/render/solarized.json 21share/openscad/color-schemes/render/solarized.json
22share/openscad/color-schemes/render/starnight.json 22share/openscad/color-schemes/render/starnight.json
23share/openscad/color-schemes/render/sunset.json 23share/openscad/color-schemes/render/sunset.json
24share/openscad/color-schemes/render/tomorrow-night.json 24share/openscad/color-schemes/render/tomorrow-night.json
25share/openscad/color-schemes/render/tomorrow.json 25share/openscad/color-schemes/render/tomorrow.json
26share/openscad/examples/Advanced/GEB.scad 26share/openscad/examples/Advanced/GEB.scad
27share/openscad/examples/Advanced/animation.scad 27share/openscad/examples/Advanced/animation.scad
 28share/openscad/examples/Advanced/assert.scad
28share/openscad/examples/Advanced/children.scad 29share/openscad/examples/Advanced/children.scad
29share/openscad/examples/Advanced/children_indexed.scad 30share/openscad/examples/Advanced/children_indexed.scad
30share/openscad/examples/Advanced/module_recursion.scad 31share/openscad/examples/Advanced/module_recursion.scad
31share/openscad/examples/Advanced/offset.scad 32share/openscad/examples/Advanced/offset.scad
32share/openscad/examples/Advanced/surface_image.png 33share/openscad/examples/Advanced/surface_image.png
33share/openscad/examples/Advanced/surface_image.scad 34share/openscad/examples/Advanced/surface_image.scad
34share/openscad/examples/Basics/CSG-modules.scad 35share/openscad/examples/Basics/CSG-modules.scad
35share/openscad/examples/Basics/CSG.scad 36share/openscad/examples/Basics/CSG.scad
36share/openscad/examples/Basics/LetterBlock.scad 37share/openscad/examples/Basics/LetterBlock.scad
37share/openscad/examples/Basics/linear_extrude.scad 38share/openscad/examples/Basics/linear_extrude.scad
38share/openscad/examples/Basics/logo.scad 39share/openscad/examples/Basics/logo.scad
39share/openscad/examples/Basics/logo_and_text.scad 40share/openscad/examples/Basics/logo_and_text.scad
40share/openscad/examples/Basics/projection.scad 41share/openscad/examples/Basics/projection.scad
41share/openscad/examples/Basics/projection.stl 42share/openscad/examples/Basics/projection.stl
42share/openscad/examples/Basics/rotate_extrude.scad 43share/openscad/examples/Basics/rotate_extrude.scad
43share/openscad/examples/Basics/text_on_cube.scad 44share/openscad/examples/Basics/text_on_cube.scad
44share/openscad/examples/COPYING-CC0.txt 45share/openscad/examples/COPYING-CC0.txt
 46share/openscad/examples/Functions/echo.scad
45share/openscad/examples/Functions/functions.scad 47share/openscad/examples/Functions/functions.scad
46share/openscad/examples/Functions/list_comprehensions.scad 48share/openscad/examples/Functions/list_comprehensions.scad
47share/openscad/examples/Functions/polygon_areas.scad 49share/openscad/examples/Functions/polygon_areas.scad
48share/openscad/examples/Functions/recursion.scad 50share/openscad/examples/Functions/recursion.scad
49share/openscad/examples/Old/example001.scad 51share/openscad/examples/Old/example001.scad
50share/openscad/examples/Old/example002.scad 52share/openscad/examples/Old/example002.scad
51share/openscad/examples/Old/example003.scad 53share/openscad/examples/Old/example003.scad
52share/openscad/examples/Old/example004.scad 54share/openscad/examples/Old/example004.scad
53share/openscad/examples/Old/example005.scad 55share/openscad/examples/Old/example005.scad
54share/openscad/examples/Old/example006.scad 56share/openscad/examples/Old/example006.scad
55share/openscad/examples/Old/example007.dxf 57share/openscad/examples/Old/example007.dxf
56share/openscad/examples/Old/example007.scad 58share/openscad/examples/Old/example007.scad
57share/openscad/examples/Old/example008.dxf 59share/openscad/examples/Old/example008.dxf
@@ -67,87 +69,46 @@ share/openscad/examples/Old/example013.d @@ -67,87 +69,46 @@ share/openscad/examples/Old/example013.d
67share/openscad/examples/Old/example013.scad 69share/openscad/examples/Old/example013.scad
68share/openscad/examples/Old/example014.scad 70share/openscad/examples/Old/example014.scad
69share/openscad/examples/Old/example015.scad 71share/openscad/examples/Old/example015.scad
70share/openscad/examples/Old/example016.scad 72share/openscad/examples/Old/example016.scad
71share/openscad/examples/Old/example016.stl 73share/openscad/examples/Old/example016.stl
72share/openscad/examples/Old/example017.scad 74share/openscad/examples/Old/example017.scad
73share/openscad/examples/Old/example018.scad 75share/openscad/examples/Old/example018.scad
74share/openscad/examples/Old/example019.scad 76share/openscad/examples/Old/example019.scad
75share/openscad/examples/Old/example020.scad 77share/openscad/examples/Old/example020.scad
76share/openscad/examples/Old/example021.scad 78share/openscad/examples/Old/example021.scad
77share/openscad/examples/Old/example022.scad 79share/openscad/examples/Old/example022.scad
78share/openscad/examples/Old/example023.scad 80share/openscad/examples/Old/example023.scad
79share/openscad/examples/Old/example024.scad 81share/openscad/examples/Old/example024.scad
 82share/openscad/examples/Parametric/candleStand.json
 83share/openscad/examples/Parametric/candleStand.scad
 84share/openscad/examples/Parametric/sign.json
 85share/openscad/examples/Parametric/sign.scad
80share/openscad/examples/examples.json 86share/openscad/examples/examples.json
81share/openscad/fonts/05-osx-fonts.conf 87share/openscad/fonts/05-osx-fonts.conf
82share/openscad/fonts/10-liberation.conf 88share/openscad/fonts/10-liberation.conf
83share/openscad/fonts/Liberation-2.00.1/AUTHORS 89share/openscad/fonts/Liberation-2.00.1/AUTHORS
84share/openscad/fonts/Liberation-2.00.1/ChangeLog 90share/openscad/fonts/Liberation-2.00.1/ChangeLog
85share/openscad/fonts/Liberation-2.00.1/LICENSE 91share/openscad/fonts/Liberation-2.00.1/LICENSE
86share/openscad/fonts/Liberation-2.00.1/README 92share/openscad/fonts/Liberation-2.00.1/README
87share/openscad/fonts/Liberation-2.00.1/TODO 93share/openscad/fonts/Liberation-2.00.1/TODO
88share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf 94share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf
89share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf 95share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf
90share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf 96share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf
91share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf 97share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf
92share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf 98share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf
93share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf 99share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf
94share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf 100share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf
95share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf 101share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf
96share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf 102share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf
97share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf 103share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf
98share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf 104share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf
99share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf 105share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf
100share/openscad/libraries/MCAD/2Dshapes.scad 
101share/openscad/libraries/MCAD/3d_triangle.scad 
102share/openscad/libraries/MCAD/README.markdown 
103share/openscad/libraries/MCAD/TODO 
104share/openscad/libraries/MCAD/__init__.py 
105share/openscad/libraries/MCAD/bearing.scad 
106share/openscad/libraries/MCAD/bitmap/README 
107share/openscad/libraries/MCAD/bitmap/alphabet_block.scad 
108share/openscad/libraries/MCAD/bitmap/bitmap.scad 
109share/openscad/libraries/MCAD/bitmap/height_map.scad 
110share/openscad/libraries/MCAD/bitmap/letter_necklace.scad 
111share/openscad/libraries/MCAD/bitmap/name_tag.scad 
112share/openscad/libraries/MCAD/boxes.scad 
113share/openscad/libraries/MCAD/constants.scad 
114share/openscad/libraries/MCAD/curves.scad 
115share/openscad/libraries/MCAD/fonts.scad 
116share/openscad/libraries/MCAD/gears.scad 
117share/openscad/libraries/MCAD/get_submodules.py 
118share/openscad/libraries/MCAD/gridbeam.scad 
119share/openscad/libraries/MCAD/hardware.scad 
120share/openscad/libraries/MCAD/involute_gears.scad 
121share/openscad/libraries/MCAD/layouts.scad 
122share/openscad/libraries/MCAD/lego_compatibility.scad 
123share/openscad/libraries/MCAD/lgpl-2.1.txt 
124share/openscad/libraries/MCAD/libtriangles.scad 
125share/openscad/libraries/MCAD/materials.scad 
126share/openscad/libraries/MCAD/math.scad 
127share/openscad/libraries/MCAD/metric_fastners.scad 
128share/openscad/libraries/MCAD/motors.scad 
129share/openscad/libraries/MCAD/multiply.scad 
130share/openscad/libraries/MCAD/nuts_and_bolts.scad 
131share/openscad/libraries/MCAD/openscad_testing.py 
132share/openscad/libraries/MCAD/openscad_utils.py 
133share/openscad/libraries/MCAD/polyholes.scad 
134share/openscad/libraries/MCAD/regular_shapes.scad 
135share/openscad/libraries/MCAD/screw.scad 
136share/openscad/libraries/MCAD/servos.scad 
137share/openscad/libraries/MCAD/shapes.scad 
138share/openscad/libraries/MCAD/stepper.scad 
139share/openscad/libraries/MCAD/teardrop.scad 
140share/openscad/libraries/MCAD/test_docs.py 
141share/openscad/libraries/MCAD/test_mcad.py 
142share/openscad/libraries/MCAD/transformations.scad 
143share/openscad/libraries/MCAD/triangles.scad 
144share/openscad/libraries/MCAD/trochoids.scad 
145share/openscad/libraries/MCAD/units.scad 
146share/openscad/libraries/MCAD/unregular_shapes.scad 
147share/openscad/libraries/MCAD/utilities.scad 
148share/openscad/locale/cs/LC_MESSAGES/openscad.mo 106share/openscad/locale/cs/LC_MESSAGES/openscad.mo
149share/openscad/locale/de/LC_MESSAGES/openscad.mo 107share/openscad/locale/de/LC_MESSAGES/openscad.mo
150share/openscad/locale/es/LC_MESSAGES/openscad.mo 108share/openscad/locale/es/LC_MESSAGES/openscad.mo
151share/openscad/locale/fr/LC_MESSAGES/openscad.mo 109share/openscad/locale/fr/LC_MESSAGES/openscad.mo
 110share/openscad/locale/pl/LC_MESSAGES/openscad.mo
152share/openscad/locale/ru/LC_MESSAGES/openscad.mo 111share/openscad/locale/ru/LC_MESSAGES/openscad.mo
 112share/openscad/locale/uk/LC_MESSAGES/openscad.mo
153share/pixmaps/openscad.png 113share/pixmaps/openscad.png
 114@pkgdir share/openscad/libraries/MCAD

cvs diff -r1.7 -r1.8 pkgsrc/cad/openscad/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/openscad/distinfo 2019/06/03 15:22:51 1.7
+++ pkgsrc/cad/openscad/distinfo 2019/06/22 12:57:50 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2019/06/03 15:22:51 bouyer Exp $ 1$NetBSD: distinfo,v 1.8 2019/06/22 12:57:50 mef Exp $
2 2
3SHA1 (openscad-2015.03-3.src.tar.gz) = a04d154e77f5ae2251ea65333d5ac76834a19227 3SHA1 (openscad-2019.05.tar.gz) = 3817758e0c7299dbfbe340cdae0fe39da915c799
4RMD160 (openscad-2015.03-3.src.tar.gz) = 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 4RMD160 (openscad-2019.05.tar.gz) = 047761217599899d40226ee051f2f0d14e65b650
5SHA512 (openscad-2015.03-3.src.tar.gz) = b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee 5SHA512 (openscad-2019.05.tar.gz) = 4a9408131bc3529239f350f99eefa717b2309296935158badeb430b574ef300411158a9c696498febf81ae659ba7f88009a633a4d14440c8b3fec66fd3fd7dd4
6Size (openscad-2015.03-3.src.tar.gz) = 13309147 bytes 6Size (openscad-2019.05.tar.gz) = 14605674 bytes
 7SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
7SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27 8SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
8SHA1 (patch-src_CSGTermEvaluator.cc) = 6364b4b48478c0a003ac849367ff4024aae16977 9SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
9SHA1 (patch-src_colormap.h) = 6e2a4509dc0a93bd5c5e656b8dff3b2de7a30c1a 10SHA1 (patch-src_scintillaeditor.h) = 5da071ca50470c36bab3792d4aaeb135df84726d
10SHA1 (patch-src_scintillaeditor.h) = c28a86e8c9951ed27b571fb943b3099138c97b5c 

File Added: pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf
$NetBSD: patch-features_qscintilla2-priv.prf,v 1.1 2019/06/22 12:57:50 mef Exp $

To avoid following problem
-------
 ....
QtMultimedia -lQtOpenGL -lQtGui -lQtNetwork -lQtCore -lGLU -lGL -lXmu -lX11
ld: cannot find -lqscintilla2_qt4
*** [openscad] Error code 1
-------

--- features/qscintilla2-priv.prf.orig	2019-05-10 14:03:44.000000000 +0900
+++ features/qscintilla2-priv.prf	2019-05-28 21:34:58.087656036 +0900
@@ -23,5 +23,5 @@ CONFIG(debug, debug|release) {
         }
     }
 } else {
-    LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
+    LIBS += -lqscintilla2
 }

File Deleted: pkgsrc/cad/openscad/patches/Attic/patch-src_CSGTermEvaluator.cc

cvs diff -r1.1 -r1.2 pkgsrc/cad/openscad/patches/patch-src_colormap.h (expand / switch to unified diff)

--- pkgsrc/cad/openscad/patches/patch-src_colormap.h 2016/09/01 19:53:36 1.1
+++ pkgsrc/cad/openscad/patches/patch-src_colormap.h 2019/06/22 12:57:50 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-src_colormap.h,v 1.1 2016/09/01 19:53:36 plunky Exp $ 1$NetBSD: patch-src_colormap.h,v 1.2 2019/06/22 12:57:50 mef Exp $
2 2
3the Qt4 moc has some difficulty parsing in the boost headers. Apply 3the Qt4 moc has some difficulty parsing in the boost headers. Apply
4the workaround from https://bugreports.qt.io/browse/QTBUG-22829 4the workaround from https://bugreports.qt.io/browse/QTBUG-22829
5 5
6--- src/colormap.h.orig 2016-09-01 12:19:29.305274482 +0000 6--- src/colormap.h.orig 2018-03-13 12:12:43.000000000 +0000
7+++ src/colormap.h 7+++ src/colormap.h
8@@ -5,9 +5,11 @@ 8@@ -6,9 +6,10 @@
9 #include <list> 
10 #include "linalg.h" 9 #include "linalg.h"
11  10
 11 #include "memory.h"
12+#ifndef Q_MOC_RUN 12+#ifndef Q_MOC_RUN
13 #include <boost/shared_ptr.hpp> 
14 #include <boost/filesystem.hpp> 13 #include <boost/filesystem.hpp>
15 #include <boost/property_tree/ptree.hpp> 14 #include <boost/property_tree/ptree.hpp>
 15-
16+#endif 16+#endif
17  
18 namespace fs = boost::filesystem; 17 namespace fs = boost::filesystem;
19  18
 19 enum class RenderColor {

cvs diff -r1.1 -r1.2 pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h (expand / switch to unified diff)

--- pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h 2016/09/01 19:53:36 1.1
+++ pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h 2019/06/22 12:57:50 1.2
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1$NetBSD: patch-src_scintillaeditor.h,v 1.1 2016/09/01 19:53:36 plunky Exp $ 1$NetBSD: patch-src_scintillaeditor.h,v 1.2 2019/06/22 12:57:50 mef Exp $
2 2
3the Qt4 moc has some difficulty parsing in the boost headers. Apply 3the Qt4 moc has some difficulty parsing in the boost headers. Apply
4the workaround from https://bugreports.qt.io/browse/QTBUG-22829 4the workaround from https://bugreports.qt.io/browse/QTBUG-22829
5 5
6--- src/scintillaeditor.h.orig 2015-04-05 14:01:12.000000000 +0000 6--- src/scintillaeditor.h.orig 2018-03-13 12:12:43.000000000 +0000
7+++ src/scintillaeditor.h 7+++ src/scintillaeditor.h
8@@ -11,9 +11,11 @@ 8@@ -12,8 +12,10 @@
9 #include "scadlexer.h" 
10 #include "parsersettings.h" 9 #include "parsersettings.h"
11  10
 11 #include "memory.h"
12+#ifndef Q_MOC_RUN 12+#ifndef Q_MOC_RUN
13 #include <boost/shared_ptr.hpp> 
14 #include <boost/property_tree/ptree.hpp> 13 #include <boost/property_tree/ptree.hpp>
15 #include <boost/property_tree/json_parser.hpp> 14 #include <boost/property_tree/json_parser.hpp>
16+#endif 15+#endif
17  16
18 class EditorColorScheme 17 class EditorColorScheme
19 { 18 {