diff options
author | root <root@rshg054.dnsready.net> | 2011-12-01 23:14:46 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-12-01 23:14:46 +0000 |
commit | 9e9ab642711f2424f828e21d14b98c45cdef2b29 (patch) | |
tree | 5c1495cfda2b453e377084bad1b20e431e119063 /testing/wesnoth | |
parent | bc0657f7159d0b01373ecb59afc426b98a172b1e (diff) |
Thu Dec 1 23:14:46 UTC 2011
Diffstat (limited to 'testing/wesnoth')
-rw-r--r-- | testing/wesnoth/PKGBUILD | 46 | ||||
-rw-r--r-- | testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch | 70 | ||||
-rw-r--r-- | testing/wesnoth/wesnoth-libpng-1.4.0.patch | 14 | ||||
-rw-r--r-- | testing/wesnoth/wesnoth.install | 9 | ||||
-rw-r--r-- | testing/wesnoth/wesnoth.tmpfiles.conf | 1 |
5 files changed, 140 insertions, 0 deletions
diff --git a/testing/wesnoth/PKGBUILD b/testing/wesnoth/PKGBUILD new file mode 100644 index 000000000..d568c820e --- /dev/null +++ b/testing/wesnoth/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 143875 2011-11-30 06:29:27Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Jacobo Arvelo <unix4all@ya.com> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=wesnoth +pkgver=1.8.6 +pkgrel=3 +pkgdesc="A turn-based strategy game on a fantasy world" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.wesnoth.org/" +depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core') +makedepends=('boost') +install=wesnoth.install +options=(!emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 + wesnoth-libpng-1.4.0.patch + wesnoth-1.8.6-boost-foreach.patch + wesnoth.tmpfiles.conf) +md5sums=('f1c3179869b01b61e253e74aeb241034' + 'ca7412ffc4682ef55ddf82d56b0e2f08' + 'dc414ab7e1334941548e9db6db9c2460' + 'b8122f5054e3895c9c054e87460869dc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/wesnoth-libpng-1.4.0.patch" + patch -Np1 -i "$srcdir/wesnoth-1.8.6-boost-foreach.patch" + ./autogen.sh + ./configure --prefix=/usr --localstatedir=/var --enable-tools \ + --enable-editor --enable-server --with-fifodir=/run/wesnothd +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install-exec + install -dm755 "$pkgdir/usr/lib/tmpfiles.d/" + install -m644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf" + + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wesnoth_addon_manager" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlindent" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmlscope" + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/wmllint" +} diff --git a/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch new file mode 100644 index 000000000..5aee3118c --- /dev/null +++ b/testing/wesnoth/wesnoth-1.8.6-boost-foreach.patch @@ -0,0 +1,70 @@ +--- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 ++++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 +@@ -238,6 +238,17 @@ void ttree_view_node::clear() + + struct ttree_view_node_implementation + { ++ template<class W, class It> ++ static W* find_at_aux(It begin, It end, ++ const tpoint& coordinate, const bool must_be_active) { ++ for (It it = begin; it != end; ++it) { ++ if(W* widget = it->find_at(coordinate, must_be_active)) { ++ return widget; ++ } ++ } ++ return NULL; ++ } ++ + template<class W> + static W* find_at( + typename tconst_duplicator<W, ttree_view_node>::type& +@@ -255,13 +266,9 @@ struct ttree_view_node_implementation + } + + typedef typename tconst_duplicator<W, ttree_view_node>::type thack; +- foreach(thack& node, tree_view_node.children_) { +- if(W* widget = node.find_at(coordinate, must_be_active)) { +- return widget; +- } +- } +- +- return NULL; ++ return find_at_aux<W>(tree_view_node.children_.begin(), ++ tree_view_node.children_.end(), ++ coordinate, must_be_active); + } + }; + +@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size + return size; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz + size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; + } + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; +@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s + + DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; + +- foreach(const ttree_view_node& node, children_) { ++ for (boost::ptr_vector<ttree_view_node>::const_iterator it ++ = children_.begin (); it != children_.end (); ++it) { ++ const ttree_view_node& node = *it; + + if(node.grid_.get_visible() == twidget::INVISIBLE) { + continue; diff --git a/testing/wesnoth/wesnoth-libpng-1.4.0.patch b/testing/wesnoth/wesnoth-libpng-1.4.0.patch new file mode 100644 index 000000000..be8adfcaa --- /dev/null +++ b/testing/wesnoth/wesnoth-libpng-1.4.0.patch @@ -0,0 +1,14 @@ +diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp +--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 ++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 +@@ -174,8 +174,8 @@ + //TODO: review whether providing NULL error handlers is something + //sensible + png_struct* png_ptr = png_create_write_struct +- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), +- png_error_ptr_NULL, png_error_ptr_NULL); ++ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), ++ NULL, NULL); + if(!png_ptr) + throw exploder_failure("Unable to initialize the png write structure"); + diff --git a/testing/wesnoth/wesnoth.install b/testing/wesnoth/wesnoth.install new file mode 100644 index 000000000..4f1e419ae --- /dev/null +++ b/testing/wesnoth/wesnoth.install @@ -0,0 +1,9 @@ +# arg 1: the new package version +post_install() { +cat << EOF +Note: +==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma" +==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth +==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output. +EOF +} diff --git a/testing/wesnoth/wesnoth.tmpfiles.conf b/testing/wesnoth/wesnoth.tmpfiles.conf new file mode 100644 index 000000000..3ec0f6013 --- /dev/null +++ b/testing/wesnoth/wesnoth.tmpfiles.conf @@ -0,0 +1 @@ +D /run/wesnothd 0700 root root - |