[med-svn] [Git][med-team/sailfish][master] Try to adapt to Debian packaged spdlog by simply commenting missing header...

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / sailfish


Commits:
33f8a5a3 by Andreas Tille at 2019-03-27T13:53:29Z
Try to adapt to Debian packaged spdlog by simply commenting missing header file - unfortunately its not that simple ...

- - - - -


2 changed files:

- + debian/patches/fix_spdlog.patch
- debian/patches/series


Changes:

=====================================
debian/patches/fix_spdlog.patch
=====================================
@@ -0,0 +1,63 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Just comment header file which is not part of current spdlog any more
+ FIXME: Unfortunately its not that simple:
+ .
+ /build/sailfish-0.10.1+dfsg/src/SailfishQuantify.cpp:1246:17: error: 'set_async_mode' is not a member of 'spdlog'
+          spdlog::set_async_mode(max_q_size);
+                  ^~~~~~~~~~~~~~
+
+--- a/include/SailfishIndexVersionInfo.hpp
++++ b/include/SailfishIndexVersionInfo.hpp
+@@ -1,7 +1,7 @@
+ #ifndef __SAILFISH_INDEX_VERSION_INFO_HPP__
+ #define __SAILFISH_INDEX_VERSION_INFO_HPP__
+ 
+-#include "spdlog/details/format.h"
++/* #include "spdlog/details/format.h" */
+ #include "boost/filesystem.hpp"
+ #include "cereal/archives/json.hpp"
+ 
+--- a/include/SailfishUtils.hpp
++++ b/include/SailfishUtils.hpp
+@@ -13,7 +13,7 @@
+ 
+ #include "tbb/atomic.h"
+ 
+-#include "spdlog/details/format.h"
++/* #include "spdlog/details/format.h" */
+ 
+ #include "SailfishOpts.hpp"
+ #include "SailfishMath.hpp"
+--- a/src/CollapsedEMOptimizer.cpp
++++ b/src/CollapsedEMOptimizer.cpp
+@@ -13,7 +13,7 @@
+ #include <boost/math/special_functions/digamma.hpp>
+ 
+ // C++ string formatting library
+-#include "spdlog/details/format.h"
++/* #include "spdlog/details/format.h" */
+ 
+ #include "cuckoohash_map.hh"
+ #include "Eigen/Dense"
+--- a/src/CollapsedGibbsSampler.cpp
++++ b/src/CollapsedGibbsSampler.cpp
+@@ -13,7 +13,7 @@
+ #include <boost/filesystem.hpp>
+ 
+ // C++ string formatting library
+-#include "spdlog/details/format.h"
++/* #include "spdlog/details/format.h" */
+ 
+ #include "cuckoohash_map.hh"
+ 
+--- a/src/SailfishIndexer.cpp
++++ b/src/SailfishIndexer.cpp
+@@ -61,7 +61,7 @@
+ #include "SailfishUtils.hpp"
+ #include "SailfishIndex.hpp"
+ #include "spdlog/spdlog.h"
+-#include "spdlog/details/format.h"
++/* #include "spdlog/details/format.h" */
+ 
+ int mainIndex( int argc, char *argv[] ) {
+     using std::string;


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 dfsg-please.patch
+fix_spdlog.patch



View it on GitLab: https://salsa.debian.org/med-team/sailfish/commit/33f8a5a398dea457f55ed89f326e4f621f16bd32

-- 
View it on GitLab: https://salsa.debian.org/med-team/sailfish/commit/33f8a5a398dea457f55ed89f326e4f621f16bd32
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190327/080db299/attachment-0001.html>