Bug#833776: gnash: FTBFS with boost1.61

[Gianfranco Costamagna]

control: tags -1 patch
control: tags -1 pending

> your package failed to build during a rebuild for the boost1.61
> transition using gcc-6 as a compiler.
> You can see the failed build logs at
> https://buildd.debian.org/status/logs.php?pkg=gnash&ver=0.8.11~git20160608-1%2Bb1

I took the upstream patch and uploaded (NMU) on deferred/10.

let me know if I can reschedule/cancel or whatever

debdiff attached.

cheers,

G.
-------------- next part --------------
diff -Nru gnash-0.8.11~git20160608/debian/changelog gnash-0.8.11~git20160608/debian/changelog
--- gnash-0.8.11~git20160608/debian/changelog	2016-06-09 01:39:09.000000000 +0200
+++ gnash-0.8.11~git20160608/debian/changelog	2016-08-11 14:42:04.000000000 +0200
@@ -1,3 +1,11 @@
+gnash (0.8.11~git20160608-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-boost-1.60.patch (Closes: #833776):
+    - fix build failure with upstream patch for boost 1.60
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 11 Aug 2016 14:41:14 +0200
+
 gnash (0.8.11~git20160608-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff -Nru gnash-0.8.11~git20160608/debian/patches/fix-boost-1.60.patch gnash-0.8.11~git20160608/debian/patches/fix-boost-1.60.patch
--- gnash-0.8.11~git20160608/debian/patches/fix-boost-1.60.patch	1970-01-01 01:00:00.000000000 +0100
+++ gnash-0.8.11~git20160608/debian/patches/fix-boost-1.60.patch	2016-08-11 14:41:00.000000000 +0200
@@ -0,0 +1,26 @@
+Origin: http://savannah.gnu.org/bugs/?46148
+
+diff --git i/libbase/accumulator.h w/libbase/accumulator.h
+index 694cbd2..876c669 100644
+--- i/libbase/accumulator.h
++++ w/libbase/accumulator.h
+@@ -22,6 +22,7 @@
+ 
+ #include <boost/program_options/value_semantic.hpp>
+ #include <boost/any.hpp>
++#include <boost/version.hpp>
+ #include <functional>
+ #include <vector>
+ #include <string>
+@@ -61,6 +62,11 @@ public:
+     virtual unsigned min_tokens() const { return 0; }
+     virtual unsigned max_tokens() const { return 0; }
+ 
++#if BOOST_VERSION >= 105900
++    /// There are no tokens, so this is indifferent.
++    virtual bool adjacent_tokens_only() const { return false; }
++#endif
++
+     /// Accumulating from different sources is silly.
+     virtual bool is_composing() const { return false; }
+ 
diff -Nru gnash-0.8.11~git20160608/debian/patches/series gnash-0.8.11~git20160608/debian/patches/series
--- gnash-0.8.11~git20160608/debian/patches/series	2016-06-09 01:40:26.000000000 +0200
+++ gnash-0.8.11~git20160608/debian/patches/series	2016-08-11 14:41:08.000000000 +0200
@@ -1 +1,2 @@
 00sensible
+fix-boost-1.60.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-flash-devel/attachments/20160811/8ad88899/attachment.sig>