wesnoth: 1.8.2 -> 1.8.4

(cherry picked from commit 73599fba1628faf6191c957ae5e131b6717b807c)

3 files changed, 23 insertions, 4 deletions

diff --git a/wesnoth/.footprint b/wesnoth/.footprint
index 23fbee822..0e8936a58 100644
--- a/wesnoth/.footprint
+++ b/wesnoth/.footprint
@@ -87,6 +87,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@ijekavianlatin/an-orcish-incursion-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/sr@latin/an-orcish-incursion-map--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/images/l10n/zh_CN/an-orcish-incursion-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/1_Defend_the_forest.map
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/An_Orcish_Incursion/maps/2_Assassins.map
@@ -150,7 +152,6 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/s
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/httt_story3.jpg
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/garard-large.png
--rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/lionel-large.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/sagus.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/story/portraits/young_delfador-large.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Delfadors_Memoirs/images/terrain/
@@ -256,6 +257,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/imag
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/it/descent-into-darkness--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/lt/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/lt/descent-into-darkness--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/l10n/zh_CN/descent-into-darkness--overlay.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/makeshift-altar.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/misc/weakened-ice.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Descent_Into_Darkness/images/portraits/
@@ -387,6 +390,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l1
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@ijekavianlatin/eastern-invasion-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/sr@latin/eastern-invasion-map--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/l10n/zh_CN/eastern-invasion-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/dacyn.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Eastern_Invasion/images/portraits/gweddry.png
@@ -672,6 +677,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@ijekavianlatin/legend-of-wesmere-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/sr@latin/legend-of-wesmere-map--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/l10n/zh_CN/legend-of-wesmere-map--overlay.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/legend-of-wesmere-map.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Legend_of_Wesmere/images/portraits/aldar.png
@@ -799,6 +806,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/s
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@ijekavianlatin/liberty-map--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/sr@latin/liberty-map--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/l10n/zh_CN/liberty-map--overlay.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/maps/liberty-map.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/portraits/
 -rw-r--r--	root/root	usr/share/wesnoth/data/campaigns/Liberty/images/portraits/p_baldras.png
@@ -2708,6 +2717,10 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/help/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/sr@latin/hpxp.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/sr@latin/recruit.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/sr@latin/tooltip.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/help/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/zh_CN/hpxp.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/zh_CN/recruit.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/l10n/zh_CN/tooltip.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/moving1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/moving2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/help/open_section.png
@@ -2883,6 +2896,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/maps/l10n/sr@ijekavianla
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/l10n/sr@ijekavianlatin/wesnoth--overlay.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/maps/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/l10n/sr@latin/wesnoth--overlay.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/maps/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/l10n/zh_CN/wesnoth--overlay.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/maps/wesnoth.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/misc/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/blank-hex.png
@@ -2909,6 +2924,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/misc/l10n/sr/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/l10n/sr/logo.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/misc/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/l10n/sr@latin/logo.png
+drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/misc/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/l10n/zh_CN/logo.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/laurel.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/logo.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/misc/loyal-icon.png
@@ -9583,6 +9600,8 @@ drwxr-xr-x	root/root	usr/share/wesnoth/images/misc/l10n/sr/
 -rw-r--r--	root/root	usr/share/wesnoth/images/misc/l10n/sr/logo.png
 drwxr-xr-x	root/root	usr/share/wesnoth/images/misc/l10n/sr@latin/
 -rw-r--r--	root/root	usr/share/wesnoth/images/misc/l10n/sr@latin/logo.png
+drwxr-xr-x	root/root	usr/share/wesnoth/images/misc/l10n/zh_CN/
+-rw-r--r--	root/root	usr/share/wesnoth/images/misc/l10n/zh_CN/logo.png
 -rw-r--r--	root/root	usr/share/wesnoth/images/misc/leader-crown.png
 -rw-r--r--	root/root	usr/share/wesnoth/images/misc/leader-expendable.png
 -rw-r--r--	root/root	usr/share/wesnoth/images/misc/lobby.png
diff --git a/wesnoth/.md5sum b/wesnoth/.md5sum
index 00a46ca16..beb01dbc2 100644
--- a/wesnoth/.md5sum
+++ b/wesnoth/.md5sum
@@ -1 +1 @@
-5dd150057da9f5048826f16452ab0346  wesnoth-1.8.2.tar.bz2
+2dce83f835ecce1d505ea60e46b7356f  wesnoth-1.8.4.tar.bz2
diff --git a/wesnoth/Pkgfile b/wesnoth/Pkgfile
index 743a6c7c1..8b15117f3 100644
--- a/wesnoth/Pkgfile
+++ b/wesnoth/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://www.wesnoth.org/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Danny Rawlins, monster dot romster at gmail dot com
-# Depends on: boost cmake pango sdl_image sdl_mixer sdl_net sdl_ttf
+# Depends on: boost cmake pango sdl_image sdl_mixer sdl_net sdl_ttf lua
 
 name=wesnoth
-version=1.8.2
+version=1.8.4
 release=1
 source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)