diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | build_on_new_boost.patch | 24 |
3 files changed, 6 insertions, 32 deletions
@@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Mon Aug 15 15:09:50 UTC 2016 pkgbase = gnash-git pkgdesc = The GNU SWF Player based on GameSWF - git development version - pkgver = 0.8.11.r22358.g9229f6f - pkgrel = 2 + pkgver = 0.8.11.r22377.g2b3bded + pkgrel = 1 url = http://www.gnu.org/software/gnash/ install = gnash.install arch = i686 @@ -45,10 +47,8 @@ pkgbase = gnash-git backup = etc/gnashpluginrc source = git://git.sv.gnu.org/gnash.git source = jemalloc_gnash.patch - source = build_on_new_boost.patch sha256sums = SKIP sha256sums = 422aad0cf678f8427b1601e41e6440b3526872b640b6ccd3ab93ae656a9a8c8e - sha256sums = 1df546e376f0a0e495f2c1a96f13e29c507dfb5f16b808696dc8c7474d833f65 pkgname = gnash-git @@ -25,11 +25,9 @@ options=('!emptydirs') install=$_gitname.install backup=('etc/gnashpluginrc') source=('git://git.sv.gnu.org/gnash.git' - 'jemalloc_gnash.patch' - 'build_on_new_boost.patch') + 'jemalloc_gnash.patch') sha256sums=('SKIP' - '422aad0cf678f8427b1601e41e6440b3526872b640b6ccd3ab93ae656a9a8c8e' - '1df546e376f0a0e495f2c1a96f13e29c507dfb5f16b808696dc8c7474d833f65') + '422aad0cf678f8427b1601e41e6440b3526872b640b6ccd3ab93ae656a9a8c8e') pkgver() { cd $_gitname diff --git a/build_on_new_boost.patch b/build_on_new_boost.patch deleted file mode 100644 index 6671d361e325..000000000000 --- a/build_on_new_boost.patch +++ /dev/null @@ -1,24 +0,0 @@ -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; } - |