From 125c346d752b0af24938cd2bf12fa67ba352aad1 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Tue, 8 Mar 2016 18:07:09 -0500 Subject: gnash-git-0.8.11.r22358.g9229f6f-1: updating version --- pcr/gnash-git/PKGBUILD | 17 ++++++++++------- pcr/gnash-git/build_on_new_boost.patch | 24 ++++++++++++++++++++++++ pcr/gnash-git/gnash.install | 5 +++++ pcr/gnash-git/gnash_boost.patch | 22 ---------------------- 4 files changed, 39 insertions(+), 29 deletions(-) create mode 100644 pcr/gnash-git/build_on_new_boost.patch delete mode 100644 pcr/gnash-git/gnash_boost.patch (limited to 'pcr') diff --git a/pcr/gnash-git/PKGBUILD b/pcr/gnash-git/PKGBUILD index 515d4a1b3..e8edc055f 100644 --- a/pcr/gnash-git/PKGBUILD +++ b/pcr/gnash-git/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer (Arch): Iru Cai -# Maintainer (Arch): Tim Van den Langenbergh +# Contributor (Arch): Abdel-Rahman Abdel-Rahman +# Contributor (Arch): Iru Cai +# Contributor (Arch): Tim Van den Langenbergh # Contributor (Arch): Omar Botta # Contributor (Arch): Carlos Sanchez # Contributor (Arch): Frederic Bezies @@ -7,7 +8,7 @@ pkgname=gnash-git _gitname=gnash -pkgver=0.8.11.r22311.gf0f66ce +pkgver=0.8.11.r22358.g9229f6f pkgrel=1 pkgdesc="The GNU SWF Player based on GameSWF - git development version" arch=('i686' 'x86_64') @@ -26,10 +27,10 @@ install=$_gitname.install backup=('etc/gnashpluginrc') source=('git://git.sv.gnu.org/gnash.git' 'jemalloc_gnash.patch' - 'gnash_boost.patch') + 'build_on_new_boost.patch') sha256sums=('SKIP' '422aad0cf678f8427b1601e41e6440b3526872b640b6ccd3ab93ae656a9a8c8e' - '25ca1554f4c6e06d5a3fe68c37f58c7f63cf05544f14ad0e716452f8a033a095') + '1df546e376f0a0e495f2c1a96f13e29c507dfb5f16b808696dc8c7474d833f65') pkgver() { cd $_gitname @@ -48,9 +49,11 @@ build() { cd $_gitname patch -Np1 -i "${srcdir}/jemalloc_gnash.patch" - patch -Np1 -i "${srcdir}/gnash_boost.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 new file mode 100644 index 000000000..6671d361e --- /dev/null +++ b/pcr/gnash-git/build_on_new_boost.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 + #include ++#include + #include + #include + #include +@@ -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/pcr/gnash-git/gnash.install b/pcr/gnash-git/gnash.install index 7716efc65..6678a7f8a 100644 --- a/pcr/gnash-git/gnash.install +++ b/pcr/gnash-git/gnash.install @@ -1,4 +1,5 @@ post_install() { + gconfpkg --install gnash update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -11,6 +12,10 @@ post_upgrade() { post_install } +pre_remove() { + gconfpkg --uninstall gnash +} + post_remove() { update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor diff --git a/pcr/gnash-git/gnash_boost.patch b/pcr/gnash-git/gnash_boost.patch deleted file mode 100644 index e617891a4..000000000 --- a/pcr/gnash-git/gnash_boost.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gnash.orig/libbase/accumulator.h 2016-01-09 11:08:36.983892360 -0500 -+++ gnash/libbase/accumulator.h 2016-01-09 11:10:26.775762676 -0500 -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -61,6 +62,11 @@ - 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; } - -- cgit v1.2.3