diff options
| author | joerg <joerg@pkgsrc.org> | 2013-06-13 21:41:48 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-06-13 21:41:48 +0000 |
| commit | fed51c1bee26dc527ef6b06a94461a2139787581 (patch) | |
| tree | 4cd91d3fc15a3c7eae9cdf90784ec818ae1b2073 /games/wesnoth | |
| parent | c11993790aa06c936ff7261fe0ee29bd0b1aade8 (diff) | |
| download | pkgsrc-fed51c1bee26dc527ef6b06a94461a2139787581.tar.gz | |
The key argument of std::map must not be const as it can't be assigned
internally otherwise.
Diffstat (limited to 'games/wesnoth')
| -rw-r--r-- | games/wesnoth/distinfo | 4 | ||||
| -rw-r--r-- | games/wesnoth/patches/patch-src_construct__dialog.hpp | 18 | ||||
| -rw-r--r-- | games/wesnoth/patches/patch-src_filechooser.cpp | 13 |
3 files changed, 34 insertions, 1 deletions
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 44b20793fb8..0056c8eb373 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.48 2012/11/20 07:47:32 adam Exp $ +$NetBSD: distinfo,v 1.49 2013/06/13 21:41:48 joerg Exp $ SHA1 (wesnoth-1.10.5.tar.bz2) = 13761982c63ef776fa72044d5391ca4ae970a25a RMD160 (wesnoth-1.10.5.tar.bz2) = 39788ebb7e77a948161f02a1620d2fa283fa6051 @@ -7,3 +7,5 @@ SHA1 (patch-CMakeLists.txt) = 1f17a95793db0d311508f1ff93f9aacedc7782f9 SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18 SHA1 (patch-af) = 411fda4c3f19b68cab0b0a702d2b012066e3cdb4 SHA1 (patch-ah) = b63017ae43c4748aced31ab64dc141682e535ff2 +SHA1 (patch-src_construct__dialog.hpp) = 9c317fd98cffd5dd9948bdf7c08de1182321a269 +SHA1 (patch-src_filechooser.cpp) = dd5ab8a45a72616d7678f3d7b6783a094c94bce1 diff --git a/games/wesnoth/patches/patch-src_construct__dialog.hpp b/games/wesnoth/patches/patch-src_construct__dialog.hpp new file mode 100644 index 00000000000..360004da47b --- /dev/null +++ b/games/wesnoth/patches/patch-src_construct__dialog.hpp @@ -0,0 +1,18 @@ +$NetBSD: patch-src_construct__dialog.hpp,v 1.1 2013/06/13 21:41:48 joerg Exp $ + +--- src/construct_dialog.hpp.orig 2013-06-13 20:18:13.000000000 +0000 ++++ src/construct_dialog.hpp +@@ -190,11 +190,11 @@ public: + int x, y; + SDL_Rect interior, message, textbox; + unsigned int menu_width; +- std::map<preview_pane *const, SDL_Rect > panes; ++ std::map<preview_pane *, SDL_Rect > panes; + int label_x, label_y; + int menu_x, menu_y, menu_height; + int image_x, image_y, caption_x, caption_y; +- std::map<dialog_button *const, std::pair<int,int> > buttons; ++ std::map<dialog_button *, std::pair<int,int> > buttons; + //use get_frame().get_layout() to check frame dimensions + }; + typedef dialog_frame::style style; diff --git a/games/wesnoth/patches/patch-src_filechooser.cpp b/games/wesnoth/patches/patch-src_filechooser.cpp new file mode 100644 index 00000000000..ee51e4296f2 --- /dev/null +++ b/games/wesnoth/patches/patch-src_filechooser.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_filechooser.cpp,v 1.1 2013/06/13 21:41:48 joerg Exp $ + +--- src/filechooser.cpp.orig 2013-06-13 20:21:52.000000000 +0000 ++++ src/filechooser.cpp +@@ -96,7 +96,7 @@ gui::dialog::dimension_measurements file + //shift the extra buttons up + if (show_directory_buttons_) + { +- std::map<gui::dialog_button *const, std::pair<int,int> >::iterator i; ++ std::map<gui::dialog_button *, std::pair<int,int> >::iterator i; + for(i = dim.buttons.begin(); i != dim.buttons.end(); ++i) + { + const int btn_h = i->first->height(); |