Accepting request 862449 from science

OBS-URL: https://build.opensuse.org/request/show/862449
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/PrusaSlicer?expand=0&rev=8

PrusaSlicer-2.2.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0
-size 30811929

PrusaSlicer-2.3.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5
+size 34785471

PrusaSlicer-pr4340-boost-1-73.patch

@@ -1,63 +0,0 @@
-From 13abc305a1344cde55e5616cc877f4a3e2f8a2cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 3 Jun 2020 01:32:44 +0200
-Subject: [PATCH] Remove deprecated boost/detail/endian.hpp usage
-
-boost/detail/endian.hpp is removed in Boost 1.73
-boost/endian/endian.hpp is deprecated in Boost 1.73
-
-Fixes https://github.com/prusa3d/PrusaSlicer/issues/4264
----
- src/admesh/stlinit.cpp | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/src/admesh/stlinit.cpp b/src/admesh/stlinit.cpp
-index 390fe56a40..7ac27044b1 100644
---- a/src/admesh/stlinit.cpp
-+++ b/src/admesh/stlinit.cpp
-@@ -28,7 +28,6 @@
- 
- #include <boost/log/trivial.hpp>
- #include <boost/nowide/cstdio.hpp>
--#include <boost/detail/endian.hpp>
- 
- #include "stl.h"
- 
-@@ -36,9 +35,9 @@
- #error "SEEK_SET not defined"
- #endif
- 
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
- 
- static FILE* stl_open_count_facets(stl_file *stl, const char *file) 
- {
-@@ -89,10 +88,10 @@ static FILE* stl_open_count_facets(stl_file *stl, const char *file)
-     	// Read the int following the header.  This should contain # of facets.
- 	  	uint32_t header_num_facets;
-     	bool header_num_faces_read = fread(&header_num_facets, sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-     	// Convert from little endian to big endian.
-     	stl_internal_reverse_quads((char*)&header_num_facets, 4);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-     	if (! header_num_faces_read || num_facets != header_num_facets)
- 			BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: Warning: File size doesn't match number of facets in the header: " << file;
-   	}
-@@ -158,10 +157,10 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
-       		// Read a single facet from a binary .STL file. We assume little-endian architecture!
-       		if (fread(&facet, 1, SIZEOF_STL_FACET, fp) != SIZEOF_STL_FACET)
-       			return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-       		// Convert the loaded little endian data to big endian.
-       		stl_internal_reverse_quads((char*)&facet, 48);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-     	} else {
- 			// Read a single facet from an ASCII .STL file
- 			// skip solid/endsolid

PrusaSlicer.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon Jan 11 18:43:08 UTC 2021 - Benjamin Greiner <code@bnavigator.de>
+
+- Update to v2.3.0 
+  * Introducing paint-on supports, ironing, monotonic 
+    infill, seam painting, adaptive and support cubic 
+    infill, print time per feature analysis, standalone 
+    G-code viewer application, better auto-arrange with a 
+    customizable gap and rotation, search function for the 
+    settings, reworked "Avoid crossing perimeters" function, 
+    physical printers (network settings), many new 3rd party 
+    printer profiles and much, much more.
+- Full Changelog entries for betas and release candidates:
+  https://github.com/prusa3d/PrusaSlicer/releases
+- Drop PrusaSlicer-pr4340-boost-1-73.patch merged upstream
+
+-------------------------------------------------------------------
+Sun Dec 20 20:12:40 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Remove extra PrusaSlicer.desktop. Use upstream's desktop files. 
+  Graphics;3DGraphics seems to be the consensus now.
+- Remove wrapper gh#prusa3d/PrusaSlicer#4691
+
 -------------------------------------------------------------------
 Tue Sep  1 21:20:26 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 

PrusaSlicer.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=PrusaSlicer
-GenericName=Slicer Software for 3D Printers
-Categories=Science;Construction;
-Type=Application
-Exec=prusa-slicer
-Icon=PrusaSlicer
-

PrusaSlicer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package PrusaSlicer
 #
-# 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,16 +17,13 @@
 
 
 Name:           PrusaSlicer
-Version:        2.2.0
+Version:        2.3.0
 Release:        0
 Summary:        G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)
 License:        AGPL-3.0-only
 Group:          Hardware/Printing
 URL:            https://www.prusa3d.com/prusaslicer/
 Source0:        https://github.com/prusa3d/PrusaSlicer/archive/version_%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
-# PATCH-FIX-UPSTREAM https://github.com/prusa3d/PrusaSlicer/pull/4340
-Patch0:         PrusaSlicer-pr4340-boost-1-73.patch
 BuildRequires:  cereal-devel
 BuildRequires:  cgal-devel >= 4.13.2
 BuildRequires:  cmake
@@ -65,9 +62,11 @@ all those based on the Marlin, Prusa, Sprinter and Repetier firmware.
 It also works with Mach3, LinuxCNC and Machinekit controllers.
 
 %prep
-%setup -q -n %{name}-version_%{version}
+%autosetup -p1 -n %{name}-version_%{version}
-%patch0 -p1
+%if 0%{?suse_version}
 sed -i 's/UNKNOWN/%{release}-%{?is_opensuse:open}SUSE-%{suse_version}/' version.inc
+%endif
+rm -r resources/data/flatpak
 
 %build
 # The build process really acquires that much memory per job. We are
@@ -89,27 +88,19 @@ sed -i 's/UNKNOWN/%{release}-%{?is_opensuse:open}SUSE-%{suse_version}/' version.
 %install
 %cmake_install
 
-# https://github.com/prusa3d/PrusaSlicer/issues/4691
-# Since the binary segfaults under Wayland, we have to wrap it.
-mv %{buildroot}%{_bindir}/prusa-slicer %{buildroot}%{_bindir}/prusa-slicer.wrapped
-cat >> %{buildroot}%{_bindir}/prusa-slicer <<'END'
-#!/bin/sh
-export GDK_BACKEND=x11
-exec %{_bindir}/prusa-slicer.wrapped "$@"
-END
-chmod 755 %{buildroot}%{_bindir}/prusa-slicer
-
 for res in 32 128 192; do
   mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps/
   ln -sr %{buildroot}%{_datadir}/%{name}/icons/%{name}_${res}px.png \
          %{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps/%{name}.png
+  ln -sr %{buildroot}%{_datadir}/%{name}/icons/%{name}-gcodeviewer_${res}px.png \
+         %{buildroot}%{_datadir}/icons/hicolor/${res}x${res}/apps/%{name}-gcodeviewer.png
 done
-%if 0%{?suse_version} > 1500
+
-    %suse_update_desktop_file -i %{name}
+mkdir -p %{buildroot}%{_datadir}/applications
-%else
+mv %{buildroot}%{_datadir}/{PrusaSlicer/,}applications/PrusaSlicer.desktop
-    # Non Tumbleweed versions do not like the chosen categories
+mv %{buildroot}%{_datadir}/{PrusaSlicer/,}applications/PrusaGcodeviewer.desktop
-    %suse_update_desktop_file -i -r %{name} Graphics 3DGraphics
+%suse_update_desktop_file -r PrusaSlicer Graphics 3DGraphics Science Engineering
-%endif
+%suse_update_desktop_file -r PrusaGcodeviewer Graphics 3DGraphics
 
 #remove stray font file
 rm -rf %{buildroot}%{_datadir}/%{name}/fonts
@@ -151,13 +142,17 @@ find %{buildroot}%{_datadir}/%{name}/localization -type d | sed '
 
 %files -f lang-files
 %{_bindir}/prusa-slicer
-%{_bindir}/prusa-slicer.wrapped
+%{_bindir}/prusa-gcodeviewer
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/{icons,models,profiles,shaders,udev}/
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/128x128/apps/%{name}.png
 %{_datadir}/icons/hicolor/192x192/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/32x32/apps/%{name}-gcodeviewer.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}-gcodeviewer.png
+%{_datadir}/icons/hicolor/192x192/apps/%{name}-gcodeviewer.png
+%{_datadir}/applications/PrusaSlicer.desktop
+%{_datadir}/applications/PrusaGcodeviewer.desktop
 %license LICENSE
 %doc README.md doc/