Control: tags -1 + patch fixed-upstream Hi,
On Fri, 18 Aug 2017 17:33:47 +0100 Ghislain Vaillant <ghisv...@gmail.com> wrote: > On 18/08/17 17:26, Sebastiaan Couwenberg wrote: > > On Mon, 7 Aug 2017 08:49:19 +0100 Ghislain Vaillant wrote: > >> control: forwarded -1 https://github.com/Shark-ML/Shark/issues/194 > > > > Instead of packaging a snapshot as suggested by upstream, I suggest to > > explicitly build the package with GCC 6 (as per the attached patch)( > > until the new upstream release is available which builds successfully > > with GCC 7. > > That's a good point, though I am worried of the lack of response from > upstream and lack of commit activity overall (compared to when I > packaged the software initially). > > Thanks for the patch, I'll incorporate it soon. Please note this is fixed in upstream release v3.1.4 [1]. [1] https://github.com/Shark-ML/Shark/issues/194#issuecomment-323731152 Patch attached. Thanks, _g.
diff -Nru shark-3.1.3+ds1/debian/changelog shark-3.1.3+ds1/debian/changelog --- shark-3.1.3+ds1/debian/changelog 2016-12-01 15:44:45.000000000 +0100 +++ shark-3.1.3+ds1/debian/changelog 2017-10-12 13:53:21.000000000 +0200 @@ -1,3 +1,10 @@ +shark (3.1.3+ds1-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload + * New patch gcc-7.patch to fix FTBFS with GCC-7 + + -- Gilles Filippini <p...@debian.org> Thu, 12 Oct 2017 13:53:21 +0200 + shark (3.1.3+ds1-2) unstable; urgency=medium * Fix FTBFS on mips and more architectures. diff -Nru shark-3.1.3+ds1/debian/patches/gcc-7.patch shark-3.1.3+ds1/debian/patches/gcc-7.patch --- shark-3.1.3+ds1/debian/patches/gcc-7.patch 1970-01-01 01:00:00.000000000 +0100 +++ shark-3.1.3+ds1/debian/patches/gcc-7.patch 2017-10-12 13:53:19.000000000 +0200 @@ -0,0 +1,71 @@ +Description: Fix FTBFS with GCC-7 + Fixes from upstream commit a3de671 +Index: shark/Test/Rng/Rng.cpp +=================================================================== +--- shark.orig/Test/Rng/Rng.cpp ++++ shark/Test/Rng/Rng.cpp +@@ -3,7 +3,6 @@ + #include <shark/Rng/Binomial.h> + #include <shark/Rng/Cauchy.h> + #include <shark/Rng/DiffGeometric.h> +-#include <shark/Rng/Dirichlet.h> + #include <shark/Rng/DiscreteUniform.h> + #include <shark/Rng/Erlang.h> + #include <shark/Rng/Gamma.h> +@@ -57,7 +56,6 @@ BOOST_AUTO_TEST_CASE( Distribution_Defau + shark::Binomial<> dist3( shark::Rng::globalRng ); + shark::Cauchy<> dist4( shark::Rng::globalRng ); + shark::DiffGeometric<> dist5( shark::Rng::globalRng ); +- shark::Dirichlet<> dist6( shark::Rng::globalRng ); + shark::DiscreteUniform<> dist7( shark::Rng::globalRng ); + shark::Erlang<> dist8( shark::Rng::globalRng ); + shark::Gamma<> dist9( shark::Rng::globalRng ); +Index: shark/include/shark/Models/Normalizer.h +=================================================================== +--- shark.orig/include/shark/Models/Normalizer.h ++++ shark/include/shark/Models/Normalizer.h +@@ -99,14 +99,6 @@ public: + std::string name() const + { return "Normalizer"; } + +- /// swap +- friend void swap(const Normalizer& model1, const Normalizer& model2) +- { +- std::swap(model1.m_A, model2.m_A); +- std::swap(model1.m_b, model2.m_b); +- std::swap(model1.m_hasOffset, model2.m_hasOffset); +- } +- + /// assignment operator + const self_type operator = (const self_type& model) + { +Index: shark/include/shark/Rng/GlobalRng.h +=================================================================== +--- shark.orig/include/shark/Rng/GlobalRng.h ++++ shark/include/shark/Rng/GlobalRng.h +@@ -87,7 +87,6 @@ + #include <shark/Rng/Binomial.h> + #include <shark/Rng/Cauchy.h> + #include <shark/Rng/DiffGeometric.h> +-#include <shark/Rng/Dirichlet.h> + #include <shark/Rng/DiscreteUniform.h> + #include <shark/Rng/Erlang.h> + #include <shark/Rng/Gamma.h> +@@ -186,17 +185,6 @@ namespace shark { + return cauchy(); + } + +- //! creates a dirichlet distributed number +- static std::vector<double> dir(size_t n,double alpha) { +- Dirichlet< rng_type > dist(globalRng,n,alpha); +- return dist(); +- } +- //! creates a dirichlet distributed number +- static std::vector<double> dir(const std::vector<double>& alphas) { +- Dirichlet< this_type > dist(globalRng,alphas); +- return dist(); +- } +- + //! Sets the seed for all random number generators to "s". + static void seed( typename rng_type::result_type s ) { + globalRng.seed( s ); diff -Nru shark-3.1.3+ds1/debian/patches/series shark-3.1.3+ds1/debian/patches/series --- shark-3.1.3+ds1/debian/patches/series 2016-12-01 15:44:45.000000000 +0100 +++ shark-3.1.3+ds1/debian/patches/series 2017-10-12 13:49:47.000000000 +0200 @@ -12,3 +12,4 @@ Disable-version-query-via-svnversion.patch Fix-build-on-MIPS.patch Update-list-of-slow-tests.patch +gcc-7.patch
signature.asc
Description: OpenPGP digital signature