[med-svn] [Git][med-team/mrs][master] Refresh existing patch and apply gcc-10 patch
Shayan Doust
gitlab at salsa.debian.org
Wed Sep 16 16:45:24 BST 2020
Shayan Doust pushed to branch master at Debian Med / mrs
Commits:
0d015023 by Shayan Doust at 2020-09-16T16:44:56+01:00
Refresh existing patch and apply gcc-10 patch
- - - - -
3 changed files:
- debian/patches/boost-1.65-compat.patch
- + debian/patches/gcc-10.patch
- debian/patches/series
Changes:
=====================================
debian/patches/boost-1.65-compat.patch
=====================================
@@ -4,10 +4,8 @@ Description: fix compatibility with boost 1.65
Author: Steve Langasek <steve.langasek at ubuntu.com>
Last-Modified: 2018-03-18
-Index: mrs-6.0.5+dfsg/src/M6Databank.h
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Databank.h
-+++ mrs-6.0.5+dfsg/src/M6Databank.h
+--- mrs.orig/src/M6Databank.h
++++ mrs/src/M6Databank.h
@@ -8,7 +8,7 @@
#include <vector>
#include <map>
@@ -17,10 +15,8 @@ Index: mrs-6.0.5+dfsg/src/M6Databank.h
#include "M6File.h"
-Index: mrs-6.0.5+dfsg/src/M6BlastCache.h
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6BlastCache.h
-+++ mrs-6.0.5+dfsg/src/M6BlastCache.h
+--- mrs.orig/src/M6BlastCache.h
++++ mrs/src/M6BlastCache.h
@@ -10,7 +10,7 @@
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
@@ -30,10 +26,8 @@ Index: mrs-6.0.5+dfsg/src/M6BlastCache.h
#include "M6Blast.h"
-Index: mrs-6.0.5+dfsg/src/M6Builder.h
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Builder.h
-+++ mrs-6.0.5+dfsg/src/M6Builder.h
+--- mrs.orig/src/M6Builder.h
++++ mrs/src/M6Builder.h
@@ -10,7 +10,7 @@
#include <boost/filesystem/path.hpp>
@@ -43,10 +37,8 @@ Index: mrs-6.0.5+dfsg/src/M6Builder.h
#include <zeep/xml/node.hpp>
#include "M6Lexicon.h"
-Index: mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6CmdLineDriver.cpp
-+++ mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp
+--- mrs.orig/src/M6CmdLineDriver.cpp
++++ mrs/src/M6CmdLineDriver.cpp
@@ -16,7 +16,7 @@
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
@@ -56,10 +48,8 @@ Index: mrs-6.0.5+dfsg/src/M6CmdLineDriver.cpp
#include <boost/algorithm/string.hpp>
#include "M6Builder.h"
-Index: mrs-6.0.5+dfsg/src/M6Iterator.h
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Iterator.h
-+++ mrs-6.0.5+dfsg/src/M6Iterator.h
+--- mrs.orig/src/M6Iterator.h
++++ mrs/src/M6Iterator.h
@@ -8,7 +8,7 @@
#include <vector>
#include <algorithm>
@@ -69,10 +59,8 @@ Index: mrs-6.0.5+dfsg/src/M6Iterator.h
#include "M6BitStream.h"
#include "M6File.h"
-Index: mrs-6.0.5+dfsg/src/M6Server.h
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Server.h
-+++ mrs-6.0.5+dfsg/src/M6Server.h
+--- mrs.orig/src/M6Server.h
++++ mrs/src/M6Server.h
@@ -9,7 +9,7 @@
#include <map>
#include <set>
@@ -82,10 +70,8 @@ Index: mrs-6.0.5+dfsg/src/M6Server.h
#include <zeep/http/webapp.hpp>
#include <zeep/http/webapp/el.hpp>
-Index: mrs-6.0.5+dfsg/src/M6Server.cpp
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Server.cpp
-+++ mrs-6.0.5+dfsg/src/M6Server.cpp
+--- mrs.orig/src/M6Server.cpp
++++ mrs/src/M6Server.cpp
@@ -14,7 +14,7 @@
#include <numeric>
@@ -95,12 +81,10 @@ Index: mrs-6.0.5+dfsg/src/M6Server.cpp
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
#include <boost/filesystem/fstream.hpp>
-Index: mrs-6.0.5+dfsg/src/M6Tokenizer.cpp
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6Tokenizer.cpp
-+++ mrs-6.0.5+dfsg/src/M6Tokenizer.cpp
-@@ -11,7 +11,7 @@
- #include <iterator>
+--- mrs.orig/src/M6Tokenizer.cpp
++++ mrs/src/M6Tokenizer.cpp
+@@ -12,7 +12,7 @@
+ #include <iostream>
#include <algorithm>
-#include <boost/tr1/tuple.hpp>
@@ -108,10 +92,8 @@ Index: mrs-6.0.5+dfsg/src/M6Tokenizer.cpp
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
-Index: mrs-6.0.5+dfsg/src/M6WSSearch.cpp
-===================================================================
---- mrs-6.0.5+dfsg.orig/src/M6WSSearch.cpp
-+++ mrs-6.0.5+dfsg/src/M6WSSearch.cpp
+--- mrs.orig/src/M6WSSearch.cpp
++++ mrs/src/M6WSSearch.cpp
@@ -10,7 +10,7 @@
#include <zeep/dispatcher.hpp>
=====================================
debian/patches/gcc-10.patch
=====================================
@@ -0,0 +1,21 @@
+Description: fix gcc-10 build
+ iostream is not auto included anymore through other headers, therefore we hit
+ src/M6Tokenizer.cpp: In function ‘std::ostream& operator<<(std::ostream&, M6Token)’:
+ src/M6Tokenizer.cpp:32:28: error: no match for ‘operator<<’ (operand types are ‘std::ostream’ {aka ‘std::basic_ostream<char>’} and ‘const char [10]’)
+ 32 | case eM6TokenNone: os << "no token?"; break;
+ Fix just needs an explicit iostream include in one place.
+Forwarded: yes (via email to the Author as listed on https://mrs.cmbi.ru.nl/)
+Author: Christian Ehrhardt <christian.ehrhardt at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mrs/+bug/1891023
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957567
+Last-Update: 2020-08-11
+--- mrs.orig/src/M6Tokenizer.cpp
++++ mrs/src/M6Tokenizer.cpp
+@@ -9,6 +9,7 @@
+ #include <cstring>
+ #include <vector>
+ #include <iterator>
++#include <iostream>
+ #include <algorithm>
+
+ #include <boost/tr1/tuple.hpp>
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+gcc-10.patch
makefile.diff
init_d.diff
gcc-6.patch
View it on GitLab: https://salsa.debian.org/med-team/mrs/-/commit/0d0150234de6d2ee232e7eb63b5e614c32003336
--
View it on GitLab: https://salsa.debian.org/med-team/mrs/-/commit/0d0150234de6d2ee232e7eb63b5e614c32003336
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/20200916/9492f259/attachment-0001.html>
More information about the debian-med-commit
mailing list