Accepting request 889693 from graphics

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/889693 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openscad?expand=0&rev=8
2021-05-02 16:35:59 +00:00 · 2021-05-02 16:35:59 +00:00 · 2b64caee36
commit 2b64caee36
parent 78da138e95 e94a315176
5 changed files with 90 additions and 38 deletions
--- a/boost_include.diff
+++ b/boost_include.diff
@ -1,22 +0,0 @@
-diff -ur openscad-2019.05/src/import.cc openscad-2019.05_fix/src/import.cc
--- openscad-2019.05/src/import.cc	2019-03-31 06:14:41.000000000 +0200
-+++ openscad-2019.05_fix/src/import.cc	2020-10-02 12:34:14.840331047 +0200
-@@ -50,7 +50,6 @@
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
- 
-#include <boost/detail/endian.hpp>
- #include <cstdint>
- 
- extern PolySet * import_amf(std::string, const Location &loc);
-diff -ur openscad-2019.05/src/parser.y openscad-2019.05_fix/src/parser.y
--- openscad-2019.05/src/parser.y	2019-04-07 17:45:27.000000000 +0200
-+++ openscad-2019.05_fix/src/parser.y	2020-10-02 11:58:27.114794108 +0200
-@@ -35,6 +35,7 @@
- #else
- #include <unistd.h>
- #endif
-+#include <stack>
- 
- #include "FileModule.h"
- #include "UserModule.h"
--- a/openscad-2019.05.src.tar.gz
+++ b/openscad-2019.05.src.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a16c4263ce52380819dd91c609a719d38f12f6b8c4da0e828dcbe5b70996f59
-size 14604881
--- a/openscad-2021.01.src.tar.gz
+++ b/openscad-2021.01.src.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359
+size 15817555
--- a/openscad.changes
+++ b/openscad.changes
@ -1,3 +1,75 @@
+-------------------------------------------------------------------
+Tue Apr 20 11:48:29 UTC 2021 - Samu Voutilainen <smar@smar.fi>
+
+- Update to 2021.1 release
+  + Language Features
+    * New
+        Add function literals
+        Add exponent function (e.g. 2^3)
+        Add convexity parameter to resize()
+        Add support for generic tail recursion
+        Add $vpf for viewport field of view
+        Add warnings for ranges with begin < end
+        Add warnings for matrix structure problems
+    * Changed
+        Allow random seeds to stick between rands() calls
+        Make comparison operators on mixed types return undef
+        Track reason for values turning undef
+    * Fixed
+        Fix Range precision
+        Fix empty geometry handling
+        Fix search order for imported modules
+        Improve internal handling of data values
+        Improve performance of array concatenation
+        Improve float accuracy of mirror matrix calculation
+        Improve polygon and polyhedron warnings/errors
+  + Program Features
+    * GUI
+        Add jump to source code from 3D preview
+        Add Error-Log window for tracking errors and warnings
+        Add window menu to allow keyboard access to all docked windows
+        Enable default binary stl output, and ascii option
+        Show message in console when caches are flushed
+        Disable HTML rendering in console
+        Enable color scheme for CGAL 2D render
+        Simplified OpenCSG edge shader, with added smoothing
+        New and updated translations: Chinese, Armenian, French, Russian, Polish, German
+    * Editor
+        Edit multiple files in tabs
+        Switch tabs via Ctrl+Tab / Ctrl+Shift+Tab
+        Modify numbers via mouse scroll (when holding ALT)
+        Add auto-complete & call-tips for built-ins
+        Add configurable code snippets
+        Add (line) bookmarks
+        Add jump to error
+        Add support for line/block copy and move
+        Add convenience context menu to tab header
+        Open include<>/use<> files via inline link
+        Fix search highlight for utf8 text
+        Fix display of matches in search field
+        Add Find/Find Next/Find Previous to editor context menu
+    * Command line
+        Support reading scripts from STDIN
+        Support export to STDOUT
+        Add multi-export on command line
+        Add --animate command line option
+        Add --export-format command line option
+        Allow view-port variables in command-line mode
+        Allow export to .ast, .csg, .echo and .term in preview mode
+        Print statistics in cmdline mode as in GUI
+    * General
+        Add PDF export (single page only)
+        Add support for line-cap and line-join in SVG import
+        Add support stroke-linejoin in SVG import
+        Change CGAL Union to join least complex geometries first
+        Install start shortcut for all users on Windows
+        Install icons with defined sizes (e.g. required by flathub)
+        Switch to C++14 and allow usage of header-only CGAL
+        Add support for lib3MF v2.0 API
+        Update AppStream release info
+- Ran spec through spec-cleaner
+- removed boost_include.diff (upstream)
+
 -------------------------------------------------------------------
 Tue Oct  6 12:05:11 UTC 2020 - Guillaume GARDET <guillaume.gardet@opensuse.org>

--- a/openscad.spec
+++ b/openscad.spec
@ -1,7 +1,7 @@
 #
 # spec file for package openscad
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,13 @@


 Name:           openscad
-Version:        2019.05
+Version:        2021.01
 Release:        0
 Summary:        Programmers Solid 3D CAD Modeller
 License:        GPL-3.0-or-later
 Group:          Productivity/Graphics/CAD
 URL:            https://www.openscad.org/
 Source:         https://files.openscad.org/%{name}-%{version}.src.tar.gz
-#PATCH-FIX-UPSTREAM remove and add an include line to fix build
-Patch1:         boost_include.diff
 BuildRequires:  bison
 BuildRequires:  double-conversion-devel
 BuildRequires:  eigen3-devel
@ -42,6 +40,7 @@ BuildRequires:  libcgal-devel
 BuildRequires:  libqscintilla-qt5-devel
 BuildRequires:  libspnav-devel
 BuildRequires:  opencsg-devel
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
@ -52,7 +51,7 @@ BuildRequires:  pkgconfig(Qt5Widgets)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(libzip)
 # With v2019.05, openGL is required but Arm uses openGL ES
-ExcludeArch:    %arm aarch64
+ExcludeArch:    %{arm} aarch64

 %description
 OpenSCAD is a software for creating solid 3D CAD objects. It does not
@ -61,12 +60,11 @@ creation of, say, computer-animated movies, but instead on the CAD
 aspects, e.g. modelling of machine parts.

 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1
+%setup -q

 %build
-qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget CONFIG+=c++14
-make %{?_smp_mflags}
+%qmake5 PREFIX=%{_prefix} CONFIG+=qopenglwidget CONFIG+=c++14
+%make_build

 %install
 make INSTALL_ROOT=%{buildroot} install
@ -75,16 +73,20 @@ install -D -m 0644 doc/openscad.1 %{buildroot}%{_mandir}/man1/openscad.1
 rm -rf %{buildroot}%{_datadir}/openscad/fonts
 %find_lang %{name}

+rm %{buildroot}%{_datadir}/openscad/libraries/MCAD/.gitignore
+
 %files -f %{name}.lang
+%dir %{_datadir}/metainfo
+
 %doc README.md doc/*.pdf
 %license COPYING
+
 %{_bindir}/openscad
-%{_datadir}/openscad/
 %{_datadir}/applications/openscad.desktop
-%{_datadir}/pixmaps/openscad.png
-%{_mandir}/man1/*
-%dir %{_datadir}/metainfo
+%{_datadir}/icons/hicolor/
 %{_datadir}/metainfo/org.openscad.OpenSCAD.appdata.xml
 %{_datadir}/mime/packages/openscad.xml
+%{_datadir}/openscad/
+%{_mandir}/man1/*

 %changelog