Revision: 117359 https://trac.macports.org/changeset/117359 Author: ryandesign@macports.org Date: 2014-02-23 15:31:33 -0800 (Sun, 23 Feb 2014) Log Message: ----------- wesnoth: fix build with libc++ Modified Paths: -------------- trunk/dports/games/wesnoth/Portfile Added Paths: ----------- trunk/dports/games/wesnoth/files/patch-libc++.diff Modified: trunk/dports/games/wesnoth/Portfile =================================================================== --- trunk/dports/games/wesnoth/Portfile 2014-02-23 23:16:57 UTC (rev 117358) +++ trunk/dports/games/wesnoth/Portfile 2014-02-23 23:31:33 UTC (rev 117359) @@ -48,6 +48,7 @@ port:zlib patchfiles patch-cmake-FindFriBiDi.cmake.diff +patchfiles-append patch-libc++.diff post-patch { reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/FindFriBiDi.cmake Added: trunk/dports/games/wesnoth/files/patch-libc++.diff =================================================================== --- trunk/dports/games/wesnoth/files/patch-libc++.diff (rev 0) +++ trunk/dports/games/wesnoth/files/patch-libc++.diff 2014-02-23 23:31:33 UTC (rev 117359) @@ -0,0 +1,28 @@ +https://gna.org/bugs/?21303 +--- src/construct_dialog.hpp.orig ++++ src/construct_dialog.hpp +@@ -190,11 +190,11 @@ class dialog { + 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; +--- src/filechooser.cpp.orig ++++ src/filechooser.cpp +@@ -96,7 +96,7 @@ int show_file_chooser_dialog_save(display &disp, std::string &filename, + //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();