Add patch for Boost 1.69 header changes

This commit is contained in:
Jonathan Wakely 2019-01-29 23:41:46 +00:00
parent d325b696cb
commit 77c93b73d5
2 changed files with 22 additions and 0 deletions

17
slic3r-boost169.patch Normal file
View File

@ -0,0 +1,17 @@
From 90f108ae8e7a4315f82e317f2141733418d86a68 Mon Sep 17 00:00:00 2001
From: Joseph Lenox <lordofhyphens@gmail.com>
Date: Tue, 1 Jan 2019 16:00:39 -0600
Subject: [PATCH] Use GCC8 instead of 4.9 for travis (#4666)
diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp
index cc0b298327..0f39f5a3d1 100644
--- a/xs/src/libslic3r/GCodeSender.hpp
+++ b/xs/src/libslic3r/GCodeSender.hpp
@@ -9,6 +9,7 @@
#include <boost/asio.hpp>
#include <boost/bind.hpp>
#include <boost/thread.hpp>
+#include <boost/core/noncopyable.hpp>
namespace Slic3r {

View File

@ -22,6 +22,7 @@ Patch3: %{name}-linker.patch
Patch4: %{name}-clipper.patch Patch4: %{name}-clipper.patch
Patch5: %{name}-1.3.0-fixtest.patch Patch5: %{name}-1.3.0-fixtest.patch
Patch6: %{name}-wayland.patch Patch6: %{name}-wayland.patch
Patch7: %{name}-boost169.patch
Source1: %{name}.desktop Source1: %{name}.desktop
Source2: %{name}.appdata.xml Source2: %{name}.appdata.xml
@ -118,6 +119,7 @@ for more information.
%endif %endif
%patch5 -p1 -b .fixtest %patch5 -p1 -b .fixtest
%patch6 -p1 %patch6 -p1
%patch7 -p1
# Optional removals # Optional removals
%if %{use_system_admesh} %if %{use_system_admesh}
@ -233,6 +235,9 @@ SLIC3R_NO_AUTO=1 perl Build.PL installdirs=vendor
%{_datadir}/%{name} %{_datadir}/%{name}
%changelog %changelog
* Tue Jan 29 2019 Jonathan Wakely <jwakely@redhat.com> - 1.3.0-6
- Add patch for Boost 1.69 header changes
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 1.3.0-6 * Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 1.3.0-6
- Rebuilt for Boost 1.69 - Rebuilt for Boost 1.69