summaryrefslogtreecommitdiff
path: root/community/wesnoth
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-02-15 20:35:57 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-02-15 20:35:57 +0000
commit1ffabe284d9f5a4ac055941d9817af71be1e5b54 (patch)
tree2b816cb3cc40a5f3053c8371de5613041272e298 /community/wesnoth
parent650a87f5a67f6e71d4a56e52139a718d86ebbb46 (diff)
Wed Feb 15 20:35:56 UTC 2012
Diffstat (limited to 'community/wesnoth')
-rw-r--r--community/wesnoth/wesnoth-1.8.6-boost-foreach.patch70
-rw-r--r--community/wesnoth/wesnoth-libpng-1.4.0.patch24
2 files changed, 0 insertions, 94 deletions
diff --git a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch
deleted file mode 100644
index 5aee3118c..000000000
--- a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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/community/wesnoth/wesnoth-libpng-1.4.0.patch b/community/wesnoth/wesnoth-libpng-1.4.0.patch
deleted file mode 100644
index 338f467af..000000000
--- a/community/wesnoth/wesnoth-libpng-1.4.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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)