diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..d5c1b35 --- /dev/null +++ b/_constraints @@ -0,0 +1,10 @@ + + + + 3 + + + 5 + + + diff --git a/openscad-2015.03-2.src.tar.gz b/openscad-2015.03-2.src.tar.gz deleted file mode 100644 index e3a26a5..0000000 --- a/openscad-2015.03-2.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 -size 13307974 diff --git a/openscad-2019.05.src.tar.gz b/openscad-2019.05.src.tar.gz new file mode 100644 index 0000000..9bdb7e8 --- /dev/null +++ b/openscad-2019.05.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59 +size 14604881 diff --git a/openscad-git4fa5f0340a.patch b/openscad-git4fa5f0340a.patch deleted file mode 100644 index f8b920f..0000000 --- a/openscad-git4fa5f0340a.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 4fa5f0340a2b7b031a0b39f7de0ca795d52bb68b -Author: Torsten Paul -Date: Sun Nov 27 19:29:04 2016 +0100 - - Handle 2 argument translation calls generated by Qt 5.7.1 (fixes #1872). - -diff --git a/src/qtgettext.h b/src/qtgettext.h -index 6e667163..dbc4f174 100644 ---- a/src/qtgettext.h -+++ b/src/qtgettext.h -@@ -16,10 +16,16 @@ - - #define N_(String) String - --inline QString _( const char *msgid, int category ) -+inline QString _(const char *msgid, int category) - { -- Q_UNUSED( category ); -- return QString::fromUtf8( _( msgid ) ); -+ Q_UNUSED(category); -+ return QString::fromUtf8(_(msgid)); -+} -+ -+inline QString _(const char *msgid, const char *disambiguation) -+{ -+ Q_UNUSED(disambiguation); -+ return QString::fromUtf8(_(msgid)); - } - - #endif diff --git a/openscad-git_c68684f9520d.patch b/openscad-git_c68684f9520d.patch deleted file mode 100644 index 793b387..0000000 --- a/openscad-git_c68684f9520d.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c68684f9520d6c241dd5d96e57a0020837504a32 Mon Sep 17 00:00:00 2001 -From: Marius Kintel -Date: Sun, 21 Oct 2018 12:02:50 -0400 -Subject: [PATCH] Build fix for boost 1.69 - ---- - src/CSGTermEvaluator.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc -index 6416f29b6e..b3753cf431 100644 ---- a/src/CSGTermEvaluator.cc -+++ b/src/CSGTermEvaluator.cc -@@ -109,7 +109,7 @@ static shared_ptr evaluate_csg_term_from_geometry(const State &state, - shared_ptr ps = dynamic_pointer_cast(geom); - // Since is_convex() doesn't handle non-planar faces, we need to tessellate - // also in the indeterminate state so we cannot just use a boolean comparison. See #1061 -- bool convex = ps->convexValue(); -+ bool convex{ps->convexValue()}; - if (ps && !convex) { - assert(ps->getDimension() == 3); - PolySet *ps_tri = new PolySet(3, ps->convexValue()); diff --git a/openscad.changes b/openscad.changes index c79937a..bc2b662 100644 --- a/openscad.changes +++ b/openscad.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon Jun 24 20:06:33 UTC 2019 - Stefan Brüns + +- Update to 2019.05 release + + 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 +- Updated BuildRequires: + - Drop glew-devel and some boost headers + - Add libspnav for 3D mouse, Qt5Multimedia for notifications +- Cleanup spec file, remove conditionals for Fedora (still targeting EOLed Qt4) +- Drop upstream patches: + openscad-git4fa5f0340a.patch + openscad-git_c68684f9520d.patch + ------------------------------------------------------------------- Wed Mar 20 00:14:44 UTC 2019 - Stefan Brüns diff --git a/openscad.spec b/openscad.spec index 9ff7b40..53ea593 100644 --- a/openscad.spec +++ b/openscad.spec @@ -17,48 +17,38 @@ Name: openscad -Version: 2015.03 +Version: 2019.05 Release: 0 Summary: Programmers Solid 3D CAD Modeller License: GPL-3.0-or-later Group: Productivity/Graphics/CAD -Url: http://www.openscad.org/ -Source: http://files.openscad.org/%{name}-%{version}-2.src.tar.gz -#PATCH-FIX-UPSTREAM openscad-git4fa5f0340a.patch -- Fix Build with Qt 5.7.1 -Patch0: openscad-git4fa5f0340a.patch -# PATCH-FIX-UPSTREAM https://github.com/openscad/openscad/commit/c68684f9520d.patch -- Fix build with Boost 1.69 -Patch1: openscad-git_c68684f9520d.patch +Url: https://www.openscad.org/ +Source: https://files.openscad.org/%{name}-%{version}.src.tar.gz +BuildRequires: bison +BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: flex BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ -BuildRequires: glew-devel BuildRequires: harfbuzz-devel -BuildRequires: libcgal-devel -BuildRequires: opencsg-devel -%if 0%{?suse_version} -BuildRequires: bison BuildRequires: libboost_filesystem-devel BuildRequires: libboost_program_options-devel BuildRequires: libboost_regex-devel -BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel +BuildRequires: libcgal-devel BuildRequires: libqscintilla-qt5-devel +BuildRequires: libspnav-devel +BuildRequires: memory-constraints +BuildRequires: opencsg-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) -%endif -%if 0%{?fedora_version} -BuildRequires: boost-devel -BuildRequires: byacc -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: qscintilla-devel -BuildRequires: qt-devel -%endif +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libzip) %description OpenSCAD is a software for creating solid 3D CAD objects. It does not @@ -67,34 +57,30 @@ creation of, say, computer-animated movies, but instead on the CAD aspects, e.g. modelling of machine parts. %prep -%setup -q -n %{name}-%{version}-2 -%patch0 -p1 -%patch1 -p1 +%setup -q -n %{name}-%{version} %build -%if 0%{?suse_version} qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget -%endif -%if 0%{?fedora_version} -qmake-qt4 PREFIX=%{_prefix} -%endif -make # %{?_smp_mflags} # don't use parallel build +%limit_build -m 2200 +make %{?_smp_mflags} %install make INSTALL_ROOT=%{buildroot} install install -D -m 0644 doc/openscad.1 %{buildroot}%{_mandir}/man1/openscad.1 +# remove bundled liberation fonts +rm -rf %{buildroot}%{_datadir}/openscad/fonts %find_lang %{name} %files -f %{name}.lang -%doc README.md RELEASE_NOTES doc/*.pdf +%doc README.md doc/*.pdf %license COPYING %{_bindir}/openscad %{_datadir}/openscad/ %{_datadir}/applications/openscad.desktop %{_datadir}/pixmaps/openscad.png %{_mandir}/man1/* -%dir %{_datadir}/appdata -%{_datadir}/appdata/openscad.appdata.xml +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/org.openscad.OpenSCAD.appdata.xml %{_datadir}/mime/packages/openscad.xml %changelog