[133813] trunk/dports/games/wesnoth

[ryandesign at macports.org]

Revision: 133813
          https://trac.macports.org/changeset/133813
Author:   ryandesign at macports.org
Date:     2015-03-12 03:26:02 -0700 (Thu, 12 Mar 2015)
Log Message:
-----------
wesnoth: update to 1.12.1

Modified Paths:
--------------
    trunk/dports/games/wesnoth/Portfile

Added Paths:
-----------
    trunk/dports/games/wesnoth/files/patch-CMakeLists.txt

Removed Paths:
-------------
    trunk/dports/games/wesnoth/files/patch-libc++.diff

Modified: trunk/dports/games/wesnoth/Portfile
===================================================================
--- trunk/dports/games/wesnoth/Portfile	2015-03-12 08:56:57 UTC (rev 133812)
+++ trunk/dports/games/wesnoth/Portfile	2015-03-12 10:26:02 UTC (rev 133813)
@@ -5,7 +5,7 @@
 PortGroup               cmake 1.0
 
 name                    wesnoth
-version                 1.10.7
+version                 1.12.1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              games
 platforms               darwin
@@ -26,8 +26,8 @@
                         levels, and are carried over from one scenario to the \
                         next campaign.
 
-checksums               rmd160  0d4b320833957fe67a9b5967083068a9d33b5889 \
-                        sha256  8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e
+checksums               rmd160  961689d065a5f5c0076673e8028305e3dcc8e5b2 \
+                        sha256  70404764370db05e496a4e033e09c26cdc47fa6558271d803a44c4ebb7b6efe8
 
 depends_build-append    port:pkgconfig
 
@@ -48,7 +48,7 @@
                         port:zlib
 
 patchfiles              patch-cmake-FindFriBiDi.cmake.diff
-patchfiles-append       patch-libc++.diff
+patchfiles-append       patch-CMakeLists.txt
 
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/FindFriBiDi.cmake

Added: trunk/dports/games/wesnoth/files/patch-CMakeLists.txt
===================================================================
--- trunk/dports/games/wesnoth/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/dports/games/wesnoth/files/patch-CMakeLists.txt	2015-03-12 10:26:02 UTC (rev 133813)
@@ -0,0 +1,14 @@
+--- CMakeLists.txt.orig	2015-01-23 15:21:14.000000000 -0600
++++ CMakeLists.txt	2015-03-12 05:08:07.000000000 -0500
+@@ -240,11 +240,6 @@
+ ### Set strict compiler flags.
+ 
+ set(CXX_FLAGS_STRICT_COMPILATION)
+-check_compiler_has_flag(
+-	CXX_FLAGS_STRICT_COMPILATION
+-	"-Werror"
+-	HAS_COMPILER_FLAG_WERROR
+-)
+ 
+ # The current unit test code breaks strict aliasing with g++ 4.4.
+ check_compiler_has_flag(


Property changes on: trunk/dports/games/wesnoth/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Deleted: trunk/dports/games/wesnoth/files/patch-libc++.diff
===================================================================
--- trunk/dports/games/wesnoth/files/patch-libc++.diff	2015-03-12 08:56:57 UTC (rev 133812)
+++ trunk/dports/games/wesnoth/files/patch-libc++.diff	2015-03-12 10:26:02 UTC (rev 133813)
@@ -1,28 +0,0 @@
-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();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150312/76a49c89/attachment.html>