Received: by mail.netbsd.org (Postfix, from userid 605) id 4005584DD5; Sat, 22 Jun 2019 12:57:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BBE8984DCA for ; Sat, 22 Jun 2019 12:57:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id VisJ0BkLZ-2p for ; Sat, 22 Jun 2019 12:57:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9651A84C81 for ; Sat, 22 Jun 2019 12:57:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 92C3BFBF4; Sat, 22 Jun 2019 12:57:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1561208270169370" MIME-Version: 1.0 Date: Sat, 22 Jun 2019 12:57:50 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/cad/openscad To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20190622125750.92C3BFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1561208270169370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Sat Jun 22 12:57:50 UTC 2019 Modified Files: pkgsrc/cad/openscad: Makefile PLIST distinfo pkgsrc/cad/openscad/patches: patch-src_colormap.h patch-src_scintillaeditor.h Added Files: pkgsrc/cad/openscad/patches: patch-features_qscintilla2-priv.prf Removed Files: pkgsrc/cad/openscad/patches: patch-src_CSGTermEvaluator.cc Log Message: (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 To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 pkgsrc/cad/openscad/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/openscad/PLIST cvs rdiff -u -r1.7 -r1.8 pkgsrc/cad/openscad/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf cvs rdiff -u -r1.1 -r0 \ pkgsrc/cad/openscad/patches/patch-src_CSGTermEvaluator.cc cvs rdiff -u -r1.1 -r1.2 pkgsrc/cad/openscad/patches/patch-src_colormap.h \ pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1561208270169370 Content-Disposition: inline Content-Length: 10995 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/cad/openscad/Makefile diff -u pkgsrc/cad/openscad/Makefile:1.56 pkgsrc/cad/openscad/Makefile:1.57 --- pkgsrc/cad/openscad/Makefile:1.56 Sat Jun 8 11:04:29 2019 +++ pkgsrc/cad/openscad/Makefile Sat Jun 22 12:57:50 2019 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.56 2019/06/08 11:04:29 rillig Exp $ -# +# $NetBSD: Makefile,v 1.57 2019/06/22 12:57:50 mef Exp $ -DISTNAME= openscad-2015.03-3.src -PKGNAME= openscad-2015.03p3 -PKGREVISION= 14 +VERSION= 2019.05 +DISTNAME= openscad-${VERSION} CATEGORIES= cad -MASTER_SITES= http://files.openscad.org/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=openscad/} +GITHUB_TAG= openscad-${VERSION} MAINTAINER= reinoud@NetBSD.org HOMEPAGE= http://www.openscad.org/ @@ -16,9 +15,7 @@ USE_LANGUAGES= c c++ USE_TOOLS+= bison gettext pkg-config USE_LIBTOOL= yes -WRKSRC= ${WRKDIR}/${DISTNAME:R} - -MAKE_JOBS_SAFE= no +WRKSRC= ${WRKDIR}/${PKGBASE}-${DISTNAME} CHECK_PORTABILITY_SKIP+= tests/compare-bitmaps.sh @@ -49,5 +46,6 @@ do-configure: .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" .include "../../x11/qt4-qscintilla/buildlink3.mk" - +.include "../../textproc/libxml++/buildlink3.mk" +.include "../../math/double-conversion/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/cad/openscad/PLIST diff -u pkgsrc/cad/openscad/PLIST:1.2 pkgsrc/cad/openscad/PLIST:1.3 --- pkgsrc/cad/openscad/PLIST:1.2 Thu Sep 1 19:53:36 2016 +++ pkgsrc/cad/openscad/PLIST Sat Jun 22 12:57:50 2019 @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2016/09/01 19:53:36 plunky Exp $ +@comment $NetBSD: PLIST,v 1.3 2019/06/22 12:57:50 mef Exp $ bin/openscad man/man1/openscad.1 -share/appdata/openscad.appdata.xml share/applications/openscad.desktop +share/metainfo/org.openscad.OpenSCAD.appdata.xml share/mime/packages/openscad.xml share/openscad/color-schemes/editor/dark-background.json share/openscad/color-schemes/editor/light-background.json @@ -25,6 +25,7 @@ share/openscad/color-schemes/render/tomo share/openscad/color-schemes/render/tomorrow.json share/openscad/examples/Advanced/GEB.scad share/openscad/examples/Advanced/animation.scad +share/openscad/examples/Advanced/assert.scad share/openscad/examples/Advanced/children.scad share/openscad/examples/Advanced/children_indexed.scad share/openscad/examples/Advanced/module_recursion.scad @@ -42,6 +43,7 @@ share/openscad/examples/Basics/projectio share/openscad/examples/Basics/rotate_extrude.scad share/openscad/examples/Basics/text_on_cube.scad share/openscad/examples/COPYING-CC0.txt +share/openscad/examples/Functions/echo.scad share/openscad/examples/Functions/functions.scad share/openscad/examples/Functions/list_comprehensions.scad share/openscad/examples/Functions/polygon_areas.scad @@ -77,6 +79,10 @@ share/openscad/examples/Old/example021.s share/openscad/examples/Old/example022.scad share/openscad/examples/Old/example023.scad share/openscad/examples/Old/example024.scad +share/openscad/examples/Parametric/candleStand.json +share/openscad/examples/Parametric/candleStand.scad +share/openscad/examples/Parametric/sign.json +share/openscad/examples/Parametric/sign.scad share/openscad/examples/examples.json share/openscad/fonts/05-osx-fonts.conf share/openscad/fonts/10-liberation.conf @@ -97,57 +103,12 @@ share/openscad/fonts/Liberation-2.00.1/t share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-BoldItalic.ttf share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Italic.ttf share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Regular.ttf -share/openscad/libraries/MCAD/2Dshapes.scad -share/openscad/libraries/MCAD/3d_triangle.scad -share/openscad/libraries/MCAD/README.markdown -share/openscad/libraries/MCAD/TODO -share/openscad/libraries/MCAD/__init__.py -share/openscad/libraries/MCAD/bearing.scad -share/openscad/libraries/MCAD/bitmap/README -share/openscad/libraries/MCAD/bitmap/alphabet_block.scad -share/openscad/libraries/MCAD/bitmap/bitmap.scad -share/openscad/libraries/MCAD/bitmap/height_map.scad -share/openscad/libraries/MCAD/bitmap/letter_necklace.scad -share/openscad/libraries/MCAD/bitmap/name_tag.scad -share/openscad/libraries/MCAD/boxes.scad -share/openscad/libraries/MCAD/constants.scad -share/openscad/libraries/MCAD/curves.scad -share/openscad/libraries/MCAD/fonts.scad -share/openscad/libraries/MCAD/gears.scad -share/openscad/libraries/MCAD/get_submodules.py -share/openscad/libraries/MCAD/gridbeam.scad -share/openscad/libraries/MCAD/hardware.scad -share/openscad/libraries/MCAD/involute_gears.scad -share/openscad/libraries/MCAD/layouts.scad -share/openscad/libraries/MCAD/lego_compatibility.scad -share/openscad/libraries/MCAD/lgpl-2.1.txt -share/openscad/libraries/MCAD/libtriangles.scad -share/openscad/libraries/MCAD/materials.scad -share/openscad/libraries/MCAD/math.scad -share/openscad/libraries/MCAD/metric_fastners.scad -share/openscad/libraries/MCAD/motors.scad -share/openscad/libraries/MCAD/multiply.scad -share/openscad/libraries/MCAD/nuts_and_bolts.scad -share/openscad/libraries/MCAD/openscad_testing.py -share/openscad/libraries/MCAD/openscad_utils.py -share/openscad/libraries/MCAD/polyholes.scad -share/openscad/libraries/MCAD/regular_shapes.scad -share/openscad/libraries/MCAD/screw.scad -share/openscad/libraries/MCAD/servos.scad -share/openscad/libraries/MCAD/shapes.scad -share/openscad/libraries/MCAD/stepper.scad -share/openscad/libraries/MCAD/teardrop.scad -share/openscad/libraries/MCAD/test_docs.py -share/openscad/libraries/MCAD/test_mcad.py -share/openscad/libraries/MCAD/transformations.scad -share/openscad/libraries/MCAD/triangles.scad -share/openscad/libraries/MCAD/trochoids.scad -share/openscad/libraries/MCAD/units.scad -share/openscad/libraries/MCAD/unregular_shapes.scad -share/openscad/libraries/MCAD/utilities.scad share/openscad/locale/cs/LC_MESSAGES/openscad.mo share/openscad/locale/de/LC_MESSAGES/openscad.mo share/openscad/locale/es/LC_MESSAGES/openscad.mo share/openscad/locale/fr/LC_MESSAGES/openscad.mo +share/openscad/locale/pl/LC_MESSAGES/openscad.mo share/openscad/locale/ru/LC_MESSAGES/openscad.mo +share/openscad/locale/uk/LC_MESSAGES/openscad.mo share/pixmaps/openscad.png +@pkgdir share/openscad/libraries/MCAD Index: pkgsrc/cad/openscad/distinfo diff -u pkgsrc/cad/openscad/distinfo:1.7 pkgsrc/cad/openscad/distinfo:1.8 --- pkgsrc/cad/openscad/distinfo:1.7 Mon Jun 3 15:22:51 2019 +++ pkgsrc/cad/openscad/distinfo Sat Jun 22 12:57:50 2019 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2019/06/03 15:22:51 bouyer Exp $ +$NetBSD: distinfo,v 1.8 2019/06/22 12:57:50 mef Exp $ -SHA1 (openscad-2015.03-3.src.tar.gz) = a04d154e77f5ae2251ea65333d5ac76834a19227 -RMD160 (openscad-2015.03-3.src.tar.gz) = 323eda5bd96b2093d4fbb2274763f7a0ae4eb7f4 -SHA512 (openscad-2015.03-3.src.tar.gz) = b2cee90563bdf2cb9f7b5a0d637b2266f5fcd62add6147c9326b843a5b0975b8ec900d13a2aa86485fce4a5e7e53a08cf4171a3d1d66355e813d01ca9096faee -Size (openscad-2015.03-3.src.tar.gz) = 13309147 bytes +SHA1 (openscad-2019.05.tar.gz) = 3817758e0c7299dbfbe340cdae0fe39da915c799 +RMD160 (openscad-2019.05.tar.gz) = 047761217599899d40226ee051f2f0d14e65b650 +SHA512 (openscad-2019.05.tar.gz) = 4a9408131bc3529239f350f99eefa717b2309296935158badeb430b574ef300411158a9c696498febf81ae659ba7f88009a633a4d14440c8b3fec66fd3fd7dd4 +Size (openscad-2019.05.tar.gz) = 14605674 bytes +SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27 -SHA1 (patch-src_CSGTermEvaluator.cc) = 6364b4b48478c0a003ac849367ff4024aae16977 -SHA1 (patch-src_colormap.h) = 6e2a4509dc0a93bd5c5e656b8dff3b2de7a30c1a -SHA1 (patch-src_scintillaeditor.h) = c28a86e8c9951ed27b571fb943b3099138c97b5c +SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038 +SHA1 (patch-src_scintillaeditor.h) = 5da071ca50470c36bab3792d4aaeb135df84726d Index: pkgsrc/cad/openscad/patches/patch-src_colormap.h diff -u pkgsrc/cad/openscad/patches/patch-src_colormap.h:1.1 pkgsrc/cad/openscad/patches/patch-src_colormap.h:1.2 --- pkgsrc/cad/openscad/patches/patch-src_colormap.h:1.1 Thu Sep 1 19:53:36 2016 +++ pkgsrc/cad/openscad/patches/patch-src_colormap.h Sat Jun 22 12:57:50 2019 @@ -1,19 +1,19 @@ -$NetBSD: patch-src_colormap.h,v 1.1 2016/09/01 19:53:36 plunky Exp $ +$NetBSD: patch-src_colormap.h,v 1.2 2019/06/22 12:57:50 mef Exp $ the Qt4 moc has some difficulty parsing in the boost headers. Apply the workaround from https://bugreports.qt.io/browse/QTBUG-22829 ---- src/colormap.h.orig 2016-09-01 12:19:29.305274482 +0000 +--- src/colormap.h.orig 2018-03-13 12:12:43.000000000 +0000 +++ src/colormap.h -@@ -5,9 +5,11 @@ - #include +@@ -6,9 +6,10 @@ #include "linalg.h" + #include "memory.h" +#ifndef Q_MOC_RUN - #include #include #include +- +#endif - namespace fs = boost::filesystem; + enum class RenderColor { Index: pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h diff -u pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h:1.1 pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h:1.2 --- pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h:1.1 Thu Sep 1 19:53:36 2016 +++ pkgsrc/cad/openscad/patches/patch-src_scintillaeditor.h Sat Jun 22 12:57:50 2019 @@ -1,16 +1,15 @@ -$NetBSD: patch-src_scintillaeditor.h,v 1.1 2016/09/01 19:53:36 plunky Exp $ +$NetBSD: patch-src_scintillaeditor.h,v 1.2 2019/06/22 12:57:50 mef Exp $ the Qt4 moc has some difficulty parsing in the boost headers. Apply the workaround from https://bugreports.qt.io/browse/QTBUG-22829 ---- src/scintillaeditor.h.orig 2015-04-05 14:01:12.000000000 +0000 +--- src/scintillaeditor.h.orig 2018-03-13 12:12:43.000000000 +0000 +++ src/scintillaeditor.h -@@ -11,9 +11,11 @@ - #include "scadlexer.h" +@@ -12,8 +12,10 @@ #include "parsersettings.h" + #include "memory.h" +#ifndef Q_MOC_RUN - #include #include #include +#endif Added files: Index: pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf diff -u /dev/null pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf:1.1 --- /dev/null Sat Jun 22 12:57:50 2019 +++ pkgsrc/cad/openscad/patches/patch-features_qscintilla2-priv.prf Sat Jun 22 12:57:50 2019 @@ -0,0 +1,19 @@ +$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 + } --_----------=_1561208270169370--