[102135] trunk/dports/games/widelands

[jeremyhu at macports.org]

Revision: 102135
          https://trac.macports.org/changeset/102135
Author:   jeremyhu at macports.org
Date:     2013-01-28 01:05:18 -0800 (Mon, 28 Jan 2013)
Log Message:
-----------
widelands: Pull in upstream fix for clang crash

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

Added Paths:
-----------
    trunk/dports/games/widelands/files/
    trunk/dports/games/widelands/files/clang.patch

Modified: trunk/dports/games/widelands/Portfile
===================================================================
--- trunk/dports/games/widelands/Portfile	2013-01-28 09:04:34 UTC (rev 102134)
+++ trunk/dports/games/widelands/Portfile	2013-01-28 09:05:18 UTC (rev 102135)
@@ -6,7 +6,7 @@
 
 name                widelands
 version             build17
-revision            2
+revision            3
 categories          games
 platforms           darwin
 maintainers         nomaintainer
@@ -41,10 +41,9 @@
                     port:glew \
                     port:lua
 
-# https://bugs.launchpad.net/widelands/+bug/744595
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+# https://code.launchpad.net/~peter.waller/widelands/fix-clang-crashes/+merge/103991
+patchfiles          clang.patch
+patch.dir           ${worksrcpath}/..
 
 configure.args      ../ \
                     -DCMAKE_INSTALL_PREFIX:PATH="${applications_dir}/Widelands.app/Contents/MacOS"

Added: trunk/dports/games/widelands/files/clang.patch
===================================================================
--- trunk/dports/games/widelands/files/clang.patch	                        (rev 0)
+++ trunk/dports/games/widelands/files/clang.patch	2013-01-28 09:05:18 UTC (rev 102135)
@@ -0,0 +1,96 @@
+--- src/economy/idleworkersupply.h	2012-02-15 21:25:34 +0000
++++ src/economy/idleworkersupply.h	2012-04-28 17:49:28 +0000
+@@ -43,8 +43,7 @@
+ 	virtual void send_to_storage(Game &, Warehouse * wh);
+ 
+ 	virtual uint32_t nr_supplies(Game const &, Request const &) const;
+-	virtual WareInstance & launch_item(Game &, Request const &)
+-		__attribute__ ((noreturn));
++	virtual WareInstance & launch_item(Game &, Request const &);
+ 	virtual Worker & launch_worker(Game &, Request const &);
+ 
+ private:
+
+--- src/economy/ware_instance.cc	2012-02-15 21:25:34 +0000
++++ src/economy/ware_instance.cc	2012-04-28 17:49:28 +0000
+@@ -60,8 +60,7 @@
+ 
+ 	virtual uint32_t nr_supplies(Game const &, Request const &) const;
+ 	virtual WareInstance & launch_item(Game &, Request const &);
+-	virtual Worker & launch_worker(Game &, Request const &)
+-		__attribute__ ((noreturn));
++	virtual Worker & launch_worker(Game &, Request const &);
+ 
+ private:
+ 	WareInstance & m_ware;
+
+--- src/io/filesystem/zip_filesystem.h	2012-02-15 21:25:34 +0000
++++ src/io/filesystem/zip_filesystem.h	2012-04-28 17:49:28 +0000
+@@ -58,17 +58,15 @@
+ 	virtual void   MakeDirectory      (std::string const & dirname);
+ 
+ 	virtual StreamRead  * OpenStreamRead
+-		(const std::string & fname) __attribute__ ((noreturn));
++		(const std::string & fname);
+ 	virtual StreamWrite * OpenStreamWrite
+-		(const std::string & fname) __attribute__ ((noreturn));
++		(const std::string & fname);
+ 
+ 	virtual FileSystem &   MakeSubFileSystem(std::string const & dirname);
+ 	virtual FileSystem & CreateSubFileSystem
+ 		(std::string const & dirname, Type);
+-	virtual void Unlink(std::string const & filename)
+-		__attribute__ ((noreturn));
+-	virtual void Rename(std::string const &, std::string const &)
+-		__attribute__ ((noreturn));
++	virtual void Unlink(std::string const & filename);
++	virtual void Rename(std::string const &, std::string const &);
+ 
+ 	virtual unsigned long long DiskSpace();
+ 
+
+--- src/io/streamread.h	2012-02-15 21:25:34 +0000
++++ src/io/streamread.h	2012-04-28 17:49:28 +0000
+@@ -71,7 +71,7 @@
+ 	int32_t Signed32();
+ 	uint32_t Unsigned32();
+ 	std::string String();
+-	__attribute__((noreturn)) virtual char const * CString() {throw;}
++	virtual char const * CString() {throw;}
+ 
+ 	///  Base of all exceptions that are caused by errors in the data that is
+ 	///  read.
+
+--- src/logic/building.h	2012-02-15 21:25:34 +0000
++++ src/logic/building.h	2012-04-28 17:49:28 +0000
+@@ -178,7 +178,7 @@
+ 	virtual std::string get_statistics_string();
+ 
+ 	/// \returns the queue for a ware type or \throws _wexception.
+-	virtual WaresQueue & waresqueue(Ware_Index) __attribute__ ((noreturn));
++	virtual WaresQueue & waresqueue(Ware_Index);
+ 
+ 	virtual bool burn_on_destroy();
+ 	virtual void destroy(Editor_Game_Base &);
+@@ -187,8 +187,7 @@
+ 	void hide_options();
+ 
+ 	virtual bool fetch_from_flag(Game &);
+-	virtual bool get_building_work(Game &, Worker &, bool success)
+-		__attribute__ ((noreturn));
++	virtual bool get_building_work(Game &, Worker &, bool success);
+ 
+ 	bool leave_check_and_wait(Game &, Worker &);
+ 	void leave_skip(Game &, Worker &);
+
+--- src/wlapplication.cc	2012-04-26 11:02:10 +0000
++++ src/wlapplication.cc	2012-04-28 17:49:28 +0000
+@@ -2131,7 +2131,7 @@
+ 		}
+ 	}
+ 
+-	__attribute__((noreturn)) void sendPlayerCommand(Widelands::PlayerCommand &)
++	void sendPlayerCommand(Widelands::PlayerCommand &)
+ 	{
+ 		throw wexception("Trying to send a player command during replay");
+ 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130128/b0cec9ab/attachment-0001.html>