www-plugins/gnash: Add patch for dev-libs/boost-1.60

Gentoo-Bug: 579142

Package-Manager: portage-2.2.28

diff --git a/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
new file mode 100644 (file)
index 0000000..6671d36
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.10_p20150316-boost-1.60.patch
@@ -0,0 +1,24 @@
+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 --git a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
index a1747f939b9cf06b2f057eb90461125d028d677f..441d7ba281323a337eb24906bed61ae7f1f7115b 100644 (file)
--- a/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10_p20150316.ebuild
@@ -143,6 +143,10 @@ src_prepare() {
        # Fix libamf includes
        epatch "${FILESDIR}"/${PN}-0.8.10-amf-include.patch
 
+       # Fix new adjacent_tokens_only() in >=boost-1.59 (bug 579142)
+       # See https://savannah.gnu.org/bugs/?46148
+       epatch "${FILESDIR}"/${P}-boost-1.60.patch
+
        eautoreconf
 }
 src_configure() {