pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

openscad: remove, same but qt5-based in cad/

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 5 08:11:41 2019 +0100
Changeset:	7711c3412e048ed19ccb9007ba405d478e1247e7

Modified Files:
	Makefile
Removed Files:
	openscad/DESCR
	openscad/Makefile
	openscad/PLIST
	openscad/distinfo
	openscad/patches/patch-features_qscintilla2-priv.prf
	openscad/patches/patch-openscad.pro
	openscad/patches/patch-src_colormap.h
	openscad/patches/patch-src_scintillaeditor.h

Log Message:
openscad: remove, same but qt5-based in cad/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7711c3412e048ed19ccb9007ba405d478e1247e7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 -
 openscad/DESCR                                     |  23 -----
 openscad/Makefile                                  |  51 ---------
 openscad/PLIST                                     | 114 ---------------------
 openscad/distinfo                                  |  10 --
 .../patches/patch-features_qscintilla2-priv.prf    |  19 ----
 openscad/patches/patch-openscad.pro                |  14 ---
 openscad/patches/patch-src_colormap.h              |  19 ----
 openscad/patches/patch-src_scintillaeditor.h       |  18 ----
 9 files changed, 269 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index f0c827b0ea..9c3bfd0843 100644
--- a/Makefile
+++ b/Makefile
@@ -2529,7 +2529,6 @@ SUBDIR+=	opennurbs
 SUBDIR+=	openra
 SUBDIR+=	openrct2
 SUBDIR+=	openrw-git
-SUBDIR+=	openscad
 SUBDIR+=	openscep
 SUBDIR+=	opensips
 SUBDIR+=	openssl110
diff --git a/openscad/DESCR b/openscad/DESCR
deleted file mode 100644
index 82f059439d..0000000000
--- a/openscad/DESCR
+++ /dev/null
@@ -1,23 +0,0 @@
-OpenSCAD is a software for creating solid 3D CAD objects. It is free software
-and available for Linux/UNIX, MS Windows and Mac OS X.
-
-Unlike most free software for creating 3D models (such as the famous
-application Blender) it does not focus on the artistic aspects of 3D modelling
-but instead on the CAD aspects. Thus it might be the application you are
-looking for when you are planning to create 3D models of machine parts but
-pretty sure is not what you are looking for when you are more interested in
-creating computer-animated movies.
-
-OpenSCAD is not an interactive modeller. Instead it is something like a
-3D-compiler that reads in a script file that describes the object and renders
-the 3D model from this script file (see examples below). This gives you (the
-designer) full control over the modelling process and enables you to easily
-change any step in the modelling process or make designes that are defined by
-configurable parameters.
-
-OpenSCAD provides two main modelling techniques: First there is constructive
-solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data
-exchange format format for this 2D outlines Autocad DXF files are used. In
-addition to 2D paths for extrusion it is also possible to read design
-parametes from DXF files. Besides DXF files OpenSCAD can read and create 3D
-models in the STL and OFF file formats.
diff --git a/openscad/Makefile b/openscad/Makefile
deleted file mode 100644
index 0e66b90827..0000000000
--- a/openscad/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD$
-
-VERSION=	2019.05
-DISTNAME=	openscad-${VERSION}
-CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_GITHUB:=openscad/}
-GITHUB_TAG=	openscad-${VERSION}
-
-MAINTAINER=	reinoud%NetBSD.org@localhost
-HOMEPAGE=	http://www.openscad.org/
-COMMENT=	OpenSCAD - The Programmers Solid 3D CAD Modeller
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=	c c++
-USE_TOOLS+=	bison gettext pkg-config
-USE_LIBTOOL=	yes
-
-WRKSRC=		${WRKDIR}/${PKGBASE}-${DISTNAME}
-
-CHECK_PORTABILITY_SKIP+=	tests/compare-bitmaps.sh
-
-REPLACE_PYTHON=	libraries/MCAD/get_submodules.py
-.include "../../lang/python/application.mk"
-
-MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
-
-do-configure:
-	cd ${WRKSRC} && ${QTDIR}/bin/qmake \
-	    PREFIX=${PREFIX} -after QMAKE_YACC=bison QMAKE_LEX=flex \
-	    QMAKE_CXXFLAGS+=-std=c++0x
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-# DragonFly requires FlexLexer.h from pkgsrc - base doesn't cut it.
-.include "../../devel/flex/buildlink3.mk"
-.include "../../devel/gmp/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/harfbuzz/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/glew/buildlink3.mk"
-.include "../../graphics/opencsg/buildlink3.mk"
-.include "../../math/cgal/buildlink3.mk"
-.include "../../math/eigen3/buildlink3.mk"
-.include "../../math/mpfr/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.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"
diff --git a/openscad/PLIST b/openscad/PLIST
deleted file mode 100644
index 2d1858d1c8..0000000000
--- a/openscad/PLIST
+++ /dev/null
@@ -1,114 +0,0 @@
-@comment $NetBSD$
-bin/openscad
-man/man1/openscad.1
-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
-share/openscad/color-schemes/editor/monokai.json
-share/openscad/color-schemes/editor/solarized-dark.json
-share/openscad/color-schemes/editor/solarized-light.json
-share/openscad/color-schemes/editor/tomorrow-night.json
-share/openscad/color-schemes/editor/tomorrow.json
-share/openscad/color-schemes/editor/visualstudio.json
-share/openscad/color-schemes/readme.txt
-share/openscad/color-schemes/render/beforedawn.json
-share/openscad/color-schemes/render/deepocean.json
-share/openscad/color-schemes/render/metallic.json
-share/openscad/color-schemes/render/monotone.json
-share/openscad/color-schemes/render/nature.json
-share/openscad/color-schemes/render/solarized.json
-share/openscad/color-schemes/render/starnight.json
-share/openscad/color-schemes/render/sunset.json
-share/openscad/color-schemes/render/tomorrow-night.json
-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
-share/openscad/examples/Advanced/offset.scad
-share/openscad/examples/Advanced/surface_image.png
-share/openscad/examples/Advanced/surface_image.scad
-share/openscad/examples/Basics/CSG-modules.scad
-share/openscad/examples/Basics/CSG.scad
-share/openscad/examples/Basics/LetterBlock.scad
-share/openscad/examples/Basics/linear_extrude.scad
-share/openscad/examples/Basics/logo.scad
-share/openscad/examples/Basics/logo_and_text.scad
-share/openscad/examples/Basics/projection.scad
-share/openscad/examples/Basics/projection.stl
-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
-share/openscad/examples/Functions/recursion.scad
-share/openscad/examples/Old/example001.scad
-share/openscad/examples/Old/example002.scad
-share/openscad/examples/Old/example003.scad
-share/openscad/examples/Old/example004.scad
-share/openscad/examples/Old/example005.scad
-share/openscad/examples/Old/example006.scad
-share/openscad/examples/Old/example007.dxf
-share/openscad/examples/Old/example007.scad
-share/openscad/examples/Old/example008.dxf
-share/openscad/examples/Old/example008.scad
-share/openscad/examples/Old/example009.dxf
-share/openscad/examples/Old/example009.scad
-share/openscad/examples/Old/example010.dat
-share/openscad/examples/Old/example010.scad
-share/openscad/examples/Old/example011.scad
-share/openscad/examples/Old/example012.scad
-share/openscad/examples/Old/example012.stl
-share/openscad/examples/Old/example013.dxf
-share/openscad/examples/Old/example013.scad
-share/openscad/examples/Old/example014.scad
-share/openscad/examples/Old/example015.scad
-share/openscad/examples/Old/example016.scad
-share/openscad/examples/Old/example016.stl
-share/openscad/examples/Old/example017.scad
-share/openscad/examples/Old/example018.scad
-share/openscad/examples/Old/example019.scad
-share/openscad/examples/Old/example020.scad
-share/openscad/examples/Old/example021.scad
-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
-share/openscad/fonts/Liberation-2.00.1/AUTHORS
-share/openscad/fonts/Liberation-2.00.1/ChangeLog
-share/openscad/fonts/Liberation-2.00.1/LICENSE
-share/openscad/fonts/Liberation-2.00.1/README
-share/openscad/fonts/Liberation-2.00.1/TODO
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Bold.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-BoldItalic.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Italic.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationMono-Regular.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Bold.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-BoldItalic.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Italic.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSans-Regular.ttf
-share/openscad/fonts/Liberation-2.00.1/ttf/LiberationSerif-Bold.ttf
-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/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
diff --git a/openscad/distinfo b/openscad/distinfo
deleted file mode 100644
index ecd4b5f032..0000000000
--- a/openscad/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2016/12/16 11:13:27 plunky 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 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
-SHA1 (patch-openscad.pro) = 8b4250254ea66338ecafdac437ce9a69deb2fe27
-SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
-SHA1 (patch-src_scintillaeditor.h) = 5da071ca50470c36bab3792d4aaeb135df84726d
diff --git a/openscad/patches/patch-features_qscintilla2-priv.prf b/openscad/patches/patch-features_qscintilla2-priv.prf
deleted file mode 100644
index b460e3c8fe..0000000000
--- a/openscad/patches/patch-features_qscintilla2-priv.prf
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-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
- }
diff --git a/openscad/patches/patch-openscad.pro b/openscad/patches/patch-openscad.pro
deleted file mode 100644
index 4a0359e04e..0000000000
--- a/openscad/patches/patch-openscad.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-openscad.pro,v 1.2 2016/09/01 19:53:36 plunky 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
- 
--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 --git a/openscad/patches/patch-src_colormap.h b/openscad/patches/patch-src_colormap.h
deleted file mode 100644
index f0975a353b..0000000000
--- a/openscad/patches/patch-src_colormap.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_colormap.h,v 1.1 2016/09/01 19:53:36 plunky 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	2018-03-13 12:12:43.000000000 +0000
-+++ src/colormap.h
-@@ -6,9 +6,10 @@
- #include "linalg.h"
- 
- #include "memory.h"
-+#ifndef Q_MOC_RUN
- #include <boost/filesystem.hpp>
- #include <boost/property_tree/ptree.hpp>
--
-+#endif
- namespace fs = boost::filesystem;
- 
- enum class RenderColor {
diff --git a/openscad/patches/patch-src_scintillaeditor.h b/openscad/patches/patch-src_scintillaeditor.h
deleted file mode 100644
index 0ac186c31a..0000000000
--- a/openscad/patches/patch-src_scintillaeditor.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_scintillaeditor.h,v 1.1 2016/09/01 19:53:36 plunky 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"
- 
- #include "memory.h"
-+#ifndef Q_MOC_RUN
- #include <boost/property_tree/ptree.hpp>
- #include <boost/property_tree/json_parser.hpp>
-+#endif
- 
- class EditorColorScheme
- {
Home | Main Index | Thread Index | Old Index