pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/cad/openscad Update to 2021.01, ok reinoud@
details: https://anonhg.NetBSD.org/pkgsrc/rev/3dcc7fcd7ec0
branches: trunk
changeset: 449945:3dcc7fcd7ec0
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Thu Apr 08 10:26:08 2021 +0000
description:
Update to 2021.01, ok reinoud@
Main changes since 2019.05:
The big language change is the introduction of function literals but there are
a number of other useful changes too, like the new exponent operator (^) and
much better and more general support for tail recursion optimization.
The GUI and especially the Editor has seen a huge amount of new features.
Most visible is probably the auto-complete which can propose built-in
functions and modules.
Another much anticipated feature is the "jump to code" from the 3d preview.
While it's not possible to go into the deepest levels of the design in all
cases, it's a great tool to navigate designs.
But it's worth highlighting also some of the not so obvious smaller features
which might improve the editing workflow.
» Bookmarks - Ctrl+F2 to toogle bookmarks, F2 / Shift+F2 for jumping to
next/previous bookmark.
» Changing numbers via mouse - Similar to ALT+Cursor-Up/Down, numbers can
be modified by placing the cursor at the number and using the mouse
scroll wheel while pressing the ALT key.
» Code snippets - Insert often used code snippets using ALT+Insert or via
editor context menu, custom templates can be added as simple files.
for a complete list of changes see
http://www.openscad.org/news.html#20210131
diffstat:
cad/openscad/Makefile | 5 ++---
cad/openscad/PLIST | 17 +++++++++++++++--
cad/openscad/distinfo | 16 +++++++---------
cad/openscad/patches/patch-openscad.pro | 13 +++++++------
cad/openscad/patches/patch-src_import.cc | 15 ---------------
cad/openscad/patches/patch-src_parser.y | 14 --------------
cad/openscad/patches/patch-src_scintillaeditor.h | 16 ++++++++--------
7 files changed, 39 insertions(+), 57 deletions(-)
diffs (164 lines):
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/Makefile
--- a/cad/openscad/Makefile Thu Apr 08 10:20:09 2021 +0000
+++ b/cad/openscad/Makefile Thu Apr 08 10:26:08 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2021/02/07 06:30:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2021/04/08 10:26:08 bouyer Exp $
-VERSION= 2019.05
+VERSION= 2021.01
DISTNAME= openscad-${VERSION}
-PKGREVISION= 17
CATEGORIES= cad
MASTER_SITES= ${MASTER_SITE_GITHUB:=openscad/}
GITHUB_TAG= openscad-${VERSION}
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/PLIST
--- a/cad/openscad/PLIST Thu Apr 08 10:20:09 2021 +0000
+++ b/cad/openscad/PLIST Thu Apr 08 10:26:08 2021 +0000
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2019/06/22 12:57:50 mef Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/04/08 10:26:08 bouyer Exp $
bin/openscad
man/man1/openscad.1
share/applications/openscad.desktop
+share/icons/hicolor/128x128/apps/openscad.png
+share/icons/hicolor/256x256/apps/openscad.png
+share/icons/hicolor/48x48/apps/openscad.png
+share/icons/hicolor/512x512/apps/openscad.png
+share/icons/hicolor/64x64/apps/openscad.png
share/metainfo/org.openscad.OpenSCAD.appdata.xml
share/mime/packages/openscad.xml
share/openscad/color-schemes/editor/dark-background.json
@@ -107,8 +112,16 @@
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/hy/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
+share/openscad/locale/zh_CN/LC_MESSAGES/openscad.mo
+share/openscad/locale/zh_TW/LC_MESSAGES/openscad.mo
+share/openscad/templates/difference.json
+share/openscad/templates/for.json
+share/openscad/templates/function.json
+share/openscad/templates/module.json
+share/openscad/templates/rotate.json
+share/openscad/templates/translate.json
@pkgdir share/openscad/libraries/MCAD
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/distinfo
--- a/cad/openscad/distinfo Thu Apr 08 10:20:09 2021 +0000
+++ b/cad/openscad/distinfo Thu Apr 08 10:26:08 2021 +0000
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.10 2020/05/14 13:16:19 mef Exp $
+$NetBSD: distinfo,v 1.11 2021/04/08 10:26:08 bouyer Exp $
-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 (openscad-2021.01.tar.gz) = 4dce768db6ba1f95b0b10e9c53b3b8cd7318d11d
+RMD160 (openscad-2021.01.tar.gz) = 4ee2d86c8b2d56bedaef49eeed38765844e2cf60
+SHA512 (openscad-2021.01.tar.gz) = 2dac2d9c2fdbb720bc2e56f66849a75abe10ee646f918c53dadf33d57a30f3c605a536483bd97410d715309064ac99330ce15657440e4d66b426635dfab6a32b
+Size (openscad-2021.01.tar.gz) = 15656800 bytes
SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
-SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
+SHA1 (patch-openscad.pro) = 55e97368d2fdd77c8a4773699cfffdaccd65d63f
SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
-SHA1 (patch-src_import.cc) = 34e4821d3ae171c6baf069e916eb5d07392c4ff8
-SHA1 (patch-src_parser.y) = 48b538fe16927c0acd37a96d312554541f46f1e4
-SHA1 (patch-src_scintillaeditor.h) = 5da071ca50470c36bab3792d4aaeb135df84726d
+SHA1 (patch-src_scintillaeditor.h) = 47d2cde8d7349a23770c549e5df9b219678825e9
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/patches/patch-openscad.pro
--- a/cad/openscad/patches/patch-openscad.pro Thu Apr 08 10:20:09 2021 +0000
+++ b/cad/openscad/patches/patch-openscad.pro Thu Apr 08 10:26:08 2021 +0000
@@ -1,14 +1,15 @@
-$NetBSD: patch-openscad.pro,v 1.2 2016/09/01 19:53:36 plunky Exp $
+$NetBSD: patch-openscad.pro,v 1.3 2021/04/08 10:26:08 bouyer Exp $
install manpage to correct location
---- openscad.pro.orig 2015-11-16 05:13:56.000000000 +0000
-+++ openscad.pro
-@@ -585,6 +585,6 @@ icons.path = $$PREFIX/share/pixmaps
- icons.extra = test -f icons/$${FULLNAME}.png && cp -f icons/$${FULLNAME}.png \"\$(INSTALL_ROOT)$${icons.path}/\" || cp -f icons/openscad.png \"\$(INSTALL_ROOT)$${icons.path}/$${FULLNAME}.png\"
- INSTALLS += icons
+--- openscad.pro.orig 2021-01-31 18:41:09.000000000 +0100
++++ openscad.pro 2021-04-04 20:58:11.094361964 +0200
+@@ -757,7 +757,7 @@
+ icon512.extra = test -f icons/$${FULLNAME}-512.png && cp -f icons/$${FULLNAME}-512.png \"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\" || cp -f icons/openscad-512.png
\"\$(INSTALL_ROOT)$${icon512.path}/$${FULLNAME}.png\"
+ INSTALLS += icon48 icon64 icon128 icon256 icon512
-man.path = $$PREFIX/share/man/man1
+man.path = $$PREFIX/man/man1
man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
INSTALLS += man
+
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/patches/patch-src_import.cc
--- a/cad/openscad/patches/patch-src_import.cc Thu Apr 08 10:20:09 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_import.cc,v 1.1 2020/05/14 13:16:19 mef Exp $
-
-boost 1.73 adaptation
-
---- src/import.cc.orig 2019-05-10 14:03:44.000000000 +0900
-+++ src/import.cc 2020-05-14 21:43:09.208595797 +0900
-@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
-
--#include <boost/detail/endian.hpp>
-+#include <boost/endian.hpp>
- #include <cstdint>
-
- extern PolySet * import_amf(std::string, const Location &loc);
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/patches/patch-src_parser.y
--- a/cad/openscad/patches/patch-src_parser.y Thu Apr 08 10:20:09 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_parser.y,v 1.1 2020/04/06 18:30:00 plunky Exp $
-
-add missing header, from upstream commit b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0
-
---- src/parser.y.orig 2019-05-10 05:03:44.000000000 +0000
-+++ src/parser.y
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
-
diff -r e42708c0126d -r 3dcc7fcd7ec0 cad/openscad/patches/patch-src_scintillaeditor.h
--- a/cad/openscad/patches/patch-src_scintillaeditor.h Thu Apr 08 10:20:09 2021 +0000
+++ b/cad/openscad/patches/patch-src_scintillaeditor.h Thu Apr 08 10:26:08 2021 +0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_scintillaeditor.h,v 1.2 2019/06/22 12:57:50 mef Exp $
+$NetBSD: patch-src_scintillaeditor.h,v 1.3 2021/04/08 10:26:08 bouyer 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 2018-03-13 12:12:43.000000000 +0000
-+++ src/scintillaeditor.h
-@@ -12,8 +12,10 @@
- #include "parsersettings.h"
+--- src/scintillaeditor.h.orig 2021-01-31 18:41:09.000000000 +0100
++++ src/scintillaeditor.h 2021-04-04 21:01:50.732077378 +0200
+@@ -1,8 +1,10 @@
+ #pragma once
- #include "memory.h"
+ #include <functional>
+#ifndef Q_MOC_RUN
#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
+#endif
- class EditorColorScheme
- {
+ #include <QMap>
+ #include <QObject>
Home |
Main Index |
Thread Index |
Old Index