Changes 1.10.4:

This is a bugfix release for the 1.10.x series and it is compatible with the other 1.10.x versions.

Since the release of 1.10.3 several smaller issues were reported. Most of those were fixed in this release. The fixes center around terrain transitions, campaign problems and some smaller user interface tweaks. Of course many translations received updates and should be more polished now.

4 files changed, 26 insertions, 8 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index f75f4a79e34..83a207c8900 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.78 2012/08/29 11:22:13 obache Exp $
+# $NetBSD: Makefile,v 1.79 2012/08/30 16:24:48 adam Exp $
 
-DISTNAME=	wesnoth-1.10.3
-PKGREVISION=	2
+DISTNAME=	wesnoth-1.10.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 9ee1b05fe63..205b86a1ba1 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2012/07/18 06:37:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.36 2012/08/30 16:24:48 adam Exp $
 @pkgdir var/run/wesnothd
 bin/wesnoth
 bin/wesnothd
@@ -45,6 +45,8 @@ man/sr@ijekavianlatin/man6/wesnothd.6
 man/sr@latin/man6/wesnoth.6
 man/sr@latin/man6/wesnothd.6
 man/tr/man6/wesnothd.6
+man/uk/man6/wesnoth.6
+man/uk/man6/wesnothd.6
 man/vi/man6/wesnoth.6
 man/vi/man6/wesnothd.6
 man/zh_CN/man6/wesnoth.6
@@ -11497,6 +11499,7 @@ share/wesnoth/data/tools/unit_tree/html_output.py
 share/wesnoth/data/tools/unit_tree/menu.js
 share/wesnoth/data/tools/unit_tree/overview.py
 share/wesnoth/data/tools/unit_tree/style.css
+share/wesnoth/data/tools/unit_tree/wiki_output.py
 share/wesnoth/data/tools/vim/formulaai.vim
 share/wesnoth/data/tools/wesnoth/README
 share/wesnoth/data/tools/wesnoth/__init__.py
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 416491670c1..2b30f58e963 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.45 2012/07/18 06:37:40 adam Exp $
+$NetBSD: distinfo,v 1.46 2012/08/30 16:24:48 adam Exp $
 
-SHA1 (wesnoth-1.10.3.tar.bz2) = a8992ed64617a8d569ea1557b7f2b6d25bdb805b
-RMD160 (wesnoth-1.10.3.tar.bz2) = d27f5771a2311b7ea0d0eca57491a33c8e44fb5a
-Size (wesnoth-1.10.3.tar.bz2) = 342168933 bytes
+SHA1 (wesnoth-1.10.4.tar.bz2) = f2058b997a1318fcfa3416a0542c6956c8aba111
+RMD160 (wesnoth-1.10.4.tar.bz2) = 7a99b9427fa3f9014caeb0481c1967914f16e64f
+Size (wesnoth-1.10.4.tar.bz2) = 342665460 bytes
 SHA1 (patch-CMakeLists.txt) = 1f17a95793db0d311508f1ff93f9aacedc7782f9
 SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18
 SHA1 (patch-af) = 411fda4c3f19b68cab0b0a702d2b012066e3cdb4
 SHA1 (patch-ah) = b63017ae43c4748aced31ab64dc141682e535ff2
+SHA1 (patch-src_image.cpp) = dc1f8a69a57c86f7ca6b99c45a2118b773f94fe0
diff --git a/games/wesnoth/patches/patch-src_image.cpp b/games/wesnoth/patches/patch-src_image.cpp
new file mode 100644
index 00000000000..6e8b53eda60
--- /dev/null
+++ b/games/wesnoth/patches/patch-src_image.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_image.cpp,v 1.1 2012/08/30 16:24:49 adam Exp $
+
+Fix compiling with boost-1.51.0
+
+--- src/image.cpp.orig	2012-08-29 23:53:27.000000000 +0000
++++ src/image.cpp
+@@ -349,7 +349,7 @@ size_t hash_value(const locator::value& 
+ 	using boost::hash_value;
+ 	using boost::hash_combine;
+ 
+-	size_t hash = hash_value(val.type_);
++	size_t hash = hash_value((int)val.type_);
+ 	if (val.type_ == locator::FILE || val.type_ == locator::SUB_FILE) {
+ 		hash_combine(hash, val.filename_);
+ 	}