summaryrefslogtreecommitdiff
path: root/pcr
diff options
context:
space:
mode:
Diffstat (limited to 'pcr')
-rw-r--r--pcr/gnash-git/PKGBUILD11
-rw-r--r--pcr/gnash-git/build_on_new_boost.patch24
2 files changed, 3 insertions, 32 deletions
diff --git a/pcr/gnash-git/PKGBUILD b/pcr/gnash-git/PKGBUILD
index e8edc055f..75ea7f88b 100644
--- a/pcr/gnash-git/PKGBUILD
+++ b/pcr/gnash-git/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=gnash-git
_gitname=gnash
-pkgver=0.8.11.r22358.g9229f6f
+pkgver=0.8.11.r22377.g2b3bded
pkgrel=1
pkgdesc="The GNU SWF Player based on GameSWF - git development version"
arch=('i686' 'x86_64')
@@ -26,11 +26,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
@@ -51,9 +49,6 @@ build() {
patch -Np1 -i "${srcdir}/jemalloc_gnash.patch"
sed -i 's#${JEMALLOC_CONFIG} --cxxflags#${JEMALLOC_CONFIG} --cflags#g' configure
- # https://savannah.gnu.org/bugs/?46148
- patch -Np1 -i "${srcdir}/build_on_new_boost.patch"
-
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/pcr/gnash-git/build_on_new_boost.patch b/pcr/gnash-git/build_on_new_boost.patch
deleted file mode 100644
index 6671d361e..000000000
--- a/pcr/gnash-git/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; }
-