Date: Tuesday, January 24, 2012 @ 17:47:27
Author: eric
Revision: 147232
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
wesnoth/repos/staging-i686/
wesnoth/repos/staging-i686/PKGBUILD
(from rev 147231, wesnoth/trunk/PKGBUILD)
wesnoth/repos/staging-i686/wesnoth-1.8.6-boost-foreach.patch
(from rev 147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
wesnoth/repos/staging-i686/wesnoth-libpng-1.4.0.patch
(from rev 147231, wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
wesnoth/repos/staging-i686/wesnoth.install
(from rev 147231, wesnoth/trunk/wesnoth.install)
wesnoth/repos/staging-i686/wesnoth.tmpfiles.conf
(from rev 147231, wesnoth/trunk/wesnoth.tmpfiles.conf)
wesnoth/repos/staging-x86_64/
wesnoth/repos/staging-x86_64/PKGBUILD
(from rev 147231, wesnoth/trunk/PKGBUILD)
wesnoth/repos/staging-x86_64/wesnoth-1.8.6-boost-foreach.patch
(from rev 147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
wesnoth/repos/staging-x86_64/wesnoth-libpng-1.4.0.patch
(from rev 147231, wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
wesnoth/repos/staging-x86_64/wesnoth.install
(from rev 147231, wesnoth/trunk/wesnoth.install)
wesnoth/repos/staging-x86_64/wesnoth.tmpfiles.conf
(from rev 147231, wesnoth/trunk/wesnoth.tmpfiles.conf)
--------------------------------------------------+
staging-i686/PKGBUILD | 47 ++++++++++++++
staging-i686/wesnoth-1.8.6-boost-foreach.patch | 70 +++++++++++++++++++++
staging-i686/wesnoth-libpng-1.4.0.patch | 24 +++++++
staging-i686/wesnoth.install | 9 ++
staging-i686/wesnoth.tmpfiles.conf | 1
staging-x86_64/PKGBUILD | 47 ++++++++++++++
staging-x86_64/wesnoth-1.8.6-boost-foreach.patch | 70 +++++++++++++++++++++
staging-x86_64/wesnoth-libpng-1.4.0.patch | 24 +++++++
staging-x86_64/wesnoth.install | 9 ++
staging-x86_64/wesnoth.tmpfiles.conf | 1
10 files changed, 302 insertions(+)
Copied: wesnoth/repos/staging-i686/PKGBUILD (from rev 147231,
wesnoth/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-24 22:47:27 UTC (rev 147232)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Tobias Powalowski <tp...@archlinux.org>
+# Contributor: Jacobo Arvelo <unix4...@ya.com>
+# Contributor: Douglas Soares de Andrade <doug...@archlinux.org>
+
+pkgname=wesnoth
+pkgver=1.8.6
+pkgrel=4
+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' 'python2')
+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'
+ '3b0d2edcb45e8ecc8c790f92bdcb0087'
+ '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
+ make
+}
+
+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"
+}
Copied: wesnoth/repos/staging-i686/wesnoth-1.8.6-boost-foreach.patch (from rev
147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
===================================================================
--- staging-i686/wesnoth-1.8.6-boost-foreach.patch
(rev 0)
+++ staging-i686/wesnoth-1.8.6-boost-foreach.patch 2012-01-24 22:47:27 UTC
(rev 147232)
@@ -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;
Copied: wesnoth/repos/staging-i686/wesnoth-libpng-1.4.0.patch (from rev 147231,
wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
===================================================================
--- staging-i686/wesnoth-libpng-1.4.0.patch (rev 0)
+++ staging-i686/wesnoth-libpng-1.4.0.patch 2012-01-24 22:47:27 UTC (rev
147232)
@@ -0,0 +1,24 @@
+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");
+
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06
14:44:26.618711420 -0600
++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511
-0600
+@@ -15,6 +15,7 @@
+ #include "exploder_utils.hpp"
+ #include "game_config.hpp"
+ #include "serialization/string_utils.hpp"
++#include <zlib.h>
+ #include <png.h>
+
+ exploder_point::exploder_point(const std::string &s)
Copied: wesnoth/repos/staging-i686/wesnoth.install (from rev 147231,
wesnoth/trunk/wesnoth.install)
===================================================================
--- staging-i686/wesnoth.install (rev 0)
+++ staging-i686/wesnoth.install 2012-01-24 22:47:27 UTC (rev 147232)
@@ -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
+}
Copied: wesnoth/repos/staging-i686/wesnoth.tmpfiles.conf (from rev 147231,
wesnoth/trunk/wesnoth.tmpfiles.conf)
===================================================================
--- staging-i686/wesnoth.tmpfiles.conf (rev 0)
+++ staging-i686/wesnoth.tmpfiles.conf 2012-01-24 22:47:27 UTC (rev 147232)
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -
Copied: wesnoth/repos/staging-x86_64/PKGBUILD (from rev 147231,
wesnoth/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-24 22:47:27 UTC (rev 147232)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan de Groot <j...@archlinux.org>
+# Contributor: Tobias Powalowski <tp...@archlinux.org>
+# Contributor: Jacobo Arvelo <unix4...@ya.com>
+# Contributor: Douglas Soares de Andrade <doug...@archlinux.org>
+
+pkgname=wesnoth
+pkgver=1.8.6
+pkgrel=4
+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' 'python2')
+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'
+ '3b0d2edcb45e8ecc8c790f92bdcb0087'
+ '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
+ make
+}
+
+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"
+}
Copied: wesnoth/repos/staging-x86_64/wesnoth-1.8.6-boost-foreach.patch (from
rev 147231, wesnoth/trunk/wesnoth-1.8.6-boost-foreach.patch)
===================================================================
--- staging-x86_64/wesnoth-1.8.6-boost-foreach.patch
(rev 0)
+++ staging-x86_64/wesnoth-1.8.6-boost-foreach.patch 2012-01-24 22:47:27 UTC
(rev 147232)
@@ -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;
Copied: wesnoth/repos/staging-x86_64/wesnoth-libpng-1.4.0.patch (from rev
147231, wesnoth/trunk/wesnoth-libpng-1.4.0.patch)
===================================================================
--- staging-x86_64/wesnoth-libpng-1.4.0.patch (rev 0)
+++ staging-x86_64/wesnoth-libpng-1.4.0.patch 2012-01-24 22:47:27 UTC (rev
147232)
@@ -0,0 +1,24 @@
+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");
+
+--- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06
14:44:26.618711420 -0600
++++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511
-0600
+@@ -15,6 +15,7 @@
+ #include "exploder_utils.hpp"
+ #include "game_config.hpp"
+ #include "serialization/string_utils.hpp"
++#include <zlib.h>
+ #include <png.h>
+
+ exploder_point::exploder_point(const std::string &s)
Copied: wesnoth/repos/staging-x86_64/wesnoth.install (from rev 147231,
wesnoth/trunk/wesnoth.install)
===================================================================
--- staging-x86_64/wesnoth.install (rev 0)
+++ staging-x86_64/wesnoth.install 2012-01-24 22:47:27 UTC (rev 147232)
@@ -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
+}
Copied: wesnoth/repos/staging-x86_64/wesnoth.tmpfiles.conf (from rev 147231,
wesnoth/trunk/wesnoth.tmpfiles.conf)
===================================================================
--- staging-x86_64/wesnoth.tmpfiles.conf (rev 0)
+++ staging-x86_64/wesnoth.tmpfiles.conf 2012-01-24 22:47:27 UTC (rev
147232)
@@ -0,0 +1 @@
+D /run/wesnothd 0700 root root -
