diff -Nru slic3r-1.3.0+dfsg1/debian/changelog slic3r-1.3.0+dfsg1/debian/changelog --- slic3r-1.3.0+dfsg1/debian/changelog 2020-06-09 00:34:00.000000000 +0200 +++ slic3r-1.3.0+dfsg1/debian/changelog 2020-12-15 22:27:51.000000000 +0100 @@ -1,3 +1,11 @@ +slic3r (1.3.0+dfsg1-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * [6175a8d] Add d/salsa-ci.yml + * [e4c2e26] Fix compilation against boost_1.74. (Closes: #977449) + + -- Anton Gladky Tue, 15 Dec 2020 22:27:51 +0100 + slic3r (1.3.0+dfsg1-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru slic3r-1.3.0+dfsg1/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch slic3r-1.3.0+dfsg1/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch --- slic3r-1.3.0+dfsg1/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch 2020-06-09 00:33:58.000000000 +0200 +++ slic3r-1.3.0+dfsg1/debian/patches/0006-Fix-FTBFS-with-Boost-1.71.patch 2020-12-15 21:42:35.000000000 +0100 @@ -6,10 +6,10 @@ xs/src/libslic3r/GCodeSender.hpp | 1 + 1 file changed, 1 insertion(+) -diff --git a/xs/src/libslic3r/GCodeSender.hpp b/xs/src/libslic3r/GCodeSender.hpp -index cc0b298..0f39f5a 100644 ---- a/xs/src/libslic3r/GCodeSender.hpp -+++ b/xs/src/libslic3r/GCodeSender.hpp +Index: slic3r/xs/src/libslic3r/GCodeSender.hpp +=================================================================== +--- slic3r.orig/xs/src/libslic3r/GCodeSender.hpp ++++ slic3r/xs/src/libslic3r/GCodeSender.hpp @@ -9,6 +9,7 @@ #include #include diff -Nru slic3r-1.3.0+dfsg1/debian/patches/fix_boost_174.patch slic3r-1.3.0+dfsg1/debian/patches/fix_boost_174.patch --- slic3r-1.3.0+dfsg1/debian/patches/fix_boost_174.patch 1970-01-01 01:00:00.000000000 +0100 +++ slic3r-1.3.0+dfsg1/debian/patches/fix_boost_174.patch 2020-12-15 21:54:03.000000000 +0100 @@ -0,0 +1,106 @@ +Description: Fix compilation against boost_1,74 +Author: Anton Gladky +Bug-Debian: https://bugs.debian.org/977449 +Last-Update: 2020-12-15 + +Index: slic3r/xs/src/admesh/stl.h +=================================================================== +--- slic3r.orig/xs/src/admesh/stl.h ++++ slic3r/xs/src/admesh/stl.h +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) + #include "windows.h" +Index: slic3r/xs/src/libslic3r/Config.cpp +=================================================================== +--- slic3r.orig/xs/src/libslic3r/Config.cpp ++++ slic3r/xs/src/libslic3r/Config.cpp +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +Index: slic3r/xs/src/libslic3r/PrintObject.cpp +=================================================================== +--- slic3r.orig/xs/src/libslic3r/PrintObject.cpp ++++ slic3r/xs/src/libslic3r/PrintObject.cpp +@@ -344,7 +344,7 @@ PrintObject::detect_surfaces_type() + + parallelize( + std::queue(std::deque(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue +- boost::bind(&Slic3r::Layer::detect_surfaces_type, _1), ++ boost::bind(&Slic3r::Layer::detect_surfaces_type, boost::placeholders::_1), + this->_print->config.threads.value + ); + +@@ -357,7 +357,7 @@ PrintObject::process_external_surfaces() + { + parallelize( + std::queue(std::deque(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue +- boost::bind(&Slic3r::Layer::process_external_surfaces, _1), ++ boost::bind(&Slic3r::Layer::process_external_surfaces, boost::placeholders::_1), + this->_print->config.threads.value + ); + } +@@ -1046,7 +1046,7 @@ PrintObject::_make_perimeters() + + parallelize( + std::queue(std::deque(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue +- boost::bind(&Slic3r::Layer::make_perimeters, _1), ++ boost::bind(&Slic3r::Layer::make_perimeters, boost::placeholders::_1), + this->_print->config.threads.value + ); + +@@ -1068,7 +1068,7 @@ PrintObject::_infill() + + parallelize( + std::queue(std::deque(this->layers.begin(), this->layers.end())), // cast LayerPtrs to std::queue +- boost::bind(&Slic3r::Layer::make_fills, _1), ++ boost::bind(&Slic3r::Layer::make_fills, boost::placeholders::_1), + this->_print->config.threads.value + ); + +Index: slic3r/xs/src/libslic3r/SLAPrint.cpp +=================================================================== +--- slic3r.orig/xs/src/libslic3r/SLAPrint.cpp ++++ slic3r/xs/src/libslic3r/SLAPrint.cpp +@@ -67,7 +67,7 @@ SLAPrint::slice() + parallelize( + 0, + this->layers.size()-1, +- boost::bind(&SLAPrint::_infill_layer, this, _1, fill.get()), ++ boost::bind(&SLAPrint::_infill_layer, this, boost::placeholders::_1, fill.get()), + this->config.threads.value + ); + } +Index: slic3r/xs/src/libslic3r/TriangleMesh.cpp +=================================================================== +--- slic3r.orig/xs/src/libslic3r/TriangleMesh.cpp ++++ slic3r/xs/src/libslic3r/TriangleMesh.cpp +@@ -771,7 +771,7 @@ TriangleMeshSlicer::slice(const std:: + parallelize( + 0, + this->mesh->stl.stats.number_of_facets-1, +- boost::bind(&TriangleMeshSlicer::_slice_do, this, _1, &lines, &lines_mutex, z) ++ boost::bind(&TriangleMeshSlicer::_slice_do, this, boost::placeholders::_1, &lines, &lines_mutex, z) + ); + } + +@@ -782,7 +782,7 @@ TriangleMeshSlicer::slice(const std:: + parallelize( + 0, + lines.size()-1, +- boost::bind(&TriangleMeshSlicer::_make_loops_do, this, _1, &lines, layers) ++ boost::bind(&TriangleMeshSlicer::_make_loops_do, this, boost::placeholders::_1, &lines, layers) + ); + } + diff -Nru slic3r-1.3.0+dfsg1/debian/patches/series slic3r-1.3.0+dfsg1/debian/patches/series --- slic3r-1.3.0+dfsg1/debian/patches/series 2020-06-09 00:33:58.000000000 +0200 +++ slic3r-1.3.0+dfsg1/debian/patches/series 2020-12-15 21:53:58.000000000 +0100 @@ -4,3 +4,4 @@ Use-system-expat.h.patch Drop-error-admesh-works-correctly-on-little-endian-machin.patch 0006-Fix-FTBFS-with-Boost-1.71.patch +fix_boost_174.patch diff -Nru slic3r-1.3.0+dfsg1/debian/salsa-ci.yml slic3r-1.3.0+dfsg1/debian/salsa-ci.yml --- slic3r-1.3.0+dfsg1/debian/salsa-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ slic3r-1.3.0+dfsg1/debian/salsa-ci.yml 2020-12-15 19:16:25.000000000 +0100 @@ -0,0 +1,6 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +reprotest: + allow_failure: true