diff -Nru libpwiz-3.0.18342/debian/changelog libpwiz-3.0.18342/debian/changelog
--- libpwiz-3.0.18342/debian/changelog	2019-02-01 22:38:03.000000000 +0000
+++ libpwiz-3.0.18342/debian/changelog	2020-06-08 08:35:31.000000000 +0000
@@ -1,3 +1,10 @@
+libpwiz (3.0.18342-2+rpi1) bullseye-staging; urgency=medium
+
+  [Changes taken from 3.0.18342-2ubuntu1 by Dimitri John Ledkov]
+  * Fix ftbfs with new gcc or boost.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 08 Jun 2020 08:35:31 +0000
+
 libpwiz (3.0.18342-2) unstable; urgency=low
 
   * Improve header path (move pwiz to proteowizard) to ease with nested
diff -Nru libpwiz-3.0.18342/debian/patches/fix-ftbfs.patch libpwiz-3.0.18342/debian/patches/fix-ftbfs.patch
--- libpwiz-3.0.18342/debian/patches/fix-ftbfs.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpwiz-3.0.18342/debian/patches/fix-ftbfs.patch	2020-06-08 08:34:30.000000000 +0000
@@ -0,0 +1,70 @@
+Description: New gcc/boost fail to cast tribool to bool, force it.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+
+Index: libpwiz-3.0.18342/pwiz/data/identdata/IdentData.cpp
+===================================================================
+--- libpwiz-3.0.18342.orig/pwiz/data/identdata/IdentData.cpp
++++ libpwiz-3.0.18342/pwiz/data/identdata/IdentData.cpp
+@@ -1047,7 +1047,7 @@ PWIZ_API_DECL proteome::DigestedPeptide
+     BOOST_FOREACH(CVID cleavageAgent, cleavageAgents)
+     {
+         if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, cleavageAgent, "",
+-                                          sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
++                                          (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+                                           bestSpecificity, bestResult))
+             break;
+     }
+@@ -1055,7 +1055,7 @@ PWIZ_API_DECL proteome::DigestedPeptide
+     BOOST_FOREACH(const string& regex, cleavageAgentRegexes)
+     {
+         if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, CVID_Unknown, regex,
+-                                          sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
++                                          (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+                                           bestSpecificity, bestResult))
+             break;
+     }
+@@ -1109,7 +1109,7 @@ PWIZ_API_DECL vector<proteome::DigestedP
+         BOOST_FOREACH(CVID cleavageAgent, cleavageAgents)
+         {
+             if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, cleavageAgent, "",
+-                                              sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
++                                              (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+                                               bestSpecificity, bestResult))
+                 break;
+         }
+@@ -1117,7 +1117,7 @@ PWIZ_API_DECL vector<proteome::DigestedP
+         BOOST_FOREACH(const string& regex, cleavageAgentRegexes)
+         {
+             if (!findPeptideEvidenceWithRegex(pe, peptide, peptideSequenceInContext, CVID_Unknown, regex,
+-                                              sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
++                                              (bool) sip.enzymes.independent, nTerminusIsSpecific, cTerminusIsSpecific,
+                                               bestSpecificity, bestResult))
+                 break;
+         }
+Index: libpwiz-3.0.18342/pwiz/data/identdata/Serializer_pepXML.cpp
+===================================================================
+--- libpwiz-3.0.18342.orig/pwiz/data/identdata/Serializer_pepXML.cpp
++++ libpwiz-3.0.18342/pwiz/data/identdata/Serializer_pepXML.cpp
+@@ -409,7 +409,7 @@ struct EnzymePtr_minDistance
+ void write_sample_enzyme(XMLWriter& xmlWriter, const IdentData& mzid)
+ {
+     const SpectrumIdentificationProtocol& sip = *mzid.analysisProtocolCollection.spectrumIdentificationProtocol[0];
+-    bool independent = sip.enzymes.independent;
++    bool independent = (bool) sip.enzymes.independent;
+ 
+     // create a cumulative enzyme name for multiple enzymes like "Trypsin + AspN + Chymotrypsin"
+     string enzymeName = bal::join(sip.enzymes.enzymes | boost::adaptors::transformed(EnzymePtr_name()), " + ");
+Index: libpwiz-3.0.18342/pwiz/data/identdata/TextWriter.hpp
+===================================================================
+--- libpwiz-3.0.18342.orig/pwiz/data/identdata/TextWriter.hpp
++++ libpwiz-3.0.18342/pwiz/data/identdata/TextWriter.hpp
+@@ -506,7 +506,7 @@ class PWIZ_API_DECL TextWriter
+     {
+         (*this)("Enzymes: ");
+         if (!indeterminate(ezs.independent))
+-            child()("independent: ", ezs.independent);
++            child()("independent: ", (bool)ezs.independent);
+         if (!ezs.enzymes.empty())
+             child()("enzymes: ", ezs.enzymes);
+         return *this;
diff -Nru libpwiz-3.0.18342/debian/patches/series libpwiz-3.0.18342/debian/patches/series
--- libpwiz-3.0.18342/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libpwiz-3.0.18342/debian/patches/series	2020-06-08 08:34:30.000000000 +0000
@@ -0,0 +1 @@
+fix-ftbfs.patch