Update to rc0.

This commit is contained in:
Jason Tibbitts 2019-09-04 17:46:24 -05:00
parent 50b1a61360
commit 42d48f00ca
3 changed files with 20 additions and 39 deletions

View File

@ -1,21 +0,0 @@
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 3880f1d79..907231b76 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -142,6 +142,16 @@ GUI_App::GUI_App()
bool GUI_App::OnInit()
{
+ wxSetAssertHandler([](const wxString &file,
+ int line,
+ const wxString &func,
+ const wxString &cond,
+ const wxString &msg)
+ {
+ BOOST_LOG_TRIVIAL(debug) << file << " line: " << line << ":\n" << func
+ << " " << cond << " " << msg;
+ });
+
try {
return on_init_inner();
} catch (...) {

View File

@ -2,7 +2,7 @@
%bcond_without perltests
Name: prusa-slicer
Version: 2.1.0~alpha1
Version: 2.1.0~rc0
Release: 1%{?dist}
Summary: 3D printing slicer optimized for Prusa printers
@ -16,7 +16,7 @@ Summary: 3D printing slicer optimized for Prusa printers
# that here.
License: AGPLv3
URL: https://github.com/prusa3d/PrusaSlicer/
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-alpha1.tar.gz
Source0: https://github.com/prusa3d/PrusaSlicer/archive/version_2.1.0-rc.tar.gz
Source1: %name.desktop
Source2: %name.appdata.xml
@ -27,15 +27,6 @@ Source2: %name.appdata.xml
# https://github.com/prusa3d/PrusaSlicer/issues/2461
Source10: patch-testsuite-epsilon
# Fix a failure due to -Werror=format-security
# https://github.com/prusa3d/PrusaSlicer/pull/2757
Patch1: patch-format-security
# This patch is pulled from upstream's Debian packaging.
# I (JT) have not personally seen related bugs these fix but upstream asked
# that this be included.
Patch10: https://raw.githubusercontent.com/prusa3d/PrusaSlicer/debian/debian/patches/handle-wx-assert-with-boost.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: cereal-devel
@ -226,8 +217,9 @@ with Mach3, LinuxCNC and Machinekit controllers.
PrusaSlicer is based on Slic3r by Alessandro Ranelucci and the RepRap
community.
%prep
%autosetup -S git -n PrusaSlicer-version_2.1.0-alpha1
%autosetup -S git -n PrusaSlicer-version_2.1.0-rc
commit () { git commit -q -a -m "$1" --author "%{__scm_author}"; }
@ -274,20 +266,26 @@ unbundle poly2tri
# and this will be fixed upstream in the next release.
%if %{?fedora} >= 31
unbundle miniz
sed -i 's/^#include.*miniz.*/#include <miniz.h>/' \
src/libslic3r/Format/{3mf.cpp,AMF.cpp,PRUS.cpp} \
src/libslic3r/Rasterizer/Rasterizer.cpp \
src/libslic3r/Zipper.cpp
commit "Fix miniz includes"
#sed -i 's/^#include.*miniz.*/#include <miniz.h>/' \
# src/libslic3r/Format/{3mf.cpp,AMF.cpp,PRUS.cpp} \
# src/libslic3r/Zipper.cpp
#commit "Fix miniz includes"
%endif
# A single test fails on these architectures due to a difference in floating
# point rounding causing a tiny value instead of an expected zero.
# XXX probably not needed now
%ifarch s390x aarch64
git apply %SOURCE10
commit "Testsuite fix"
%endif
# These tests were fixed but the fixes were undone upsteam with commit ac6969c
# https://github.com/prusa3d/PrusaSlicer/issues/2288
# Just remove them for now
rm -f t/combineinfill.t t/custom_gcode.t t/fill.t t/multi.t t/retraction.t t/skirt_brim.t
commit "Remove xfail tests."
%build
mkdir Build
@ -403,6 +401,10 @@ make test ARGS=-V
%changelog
* Wed Sep 04 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.1.0~rc0-1
- Update to rc0.
- Drop tests which are known to fail.
* Tue Aug 13 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 2.1.0~alpha1-1
- Update to the current alpha.
- Drop several upstreamed patches.

View File

@ -1 +1 @@
SHA512 (version_2.0.0.tar.gz) = 31f51f4b0d54f9061e6556631297e5a2c3bbe7f867a891b5ec8e8c6ed4f4d973c38c8897e7b4b9d8935843aafd4a44556d9779865ebf35a75822036d8fae20f3
SHA512 (version_2.1.0-rc.tar.gz) = d116059983cb9055efe6cb10591fd5c168dc4335c5ec0ca5a0bcd113d45b7f071dc1a92ba177f59adffb0945d52b88d8ba1cb4c55c3c76bc550757a431444df4