wesnoth: 1.4.5 -> 1.4.6

4 files changed, 83 insertions, 15 deletions

diff --git a/wesnoth/.footprint b/wesnoth/.footprint
index ff707b7ee..f4d2d3453 100644
--- a/wesnoth/.footprint
+++ b/wesnoth/.footprint
@@ -2285,6 +2285,7 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-arch+female.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-arch.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-light+female.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-light.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-red+female.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-red.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-silver+female.png
@@ -2293,6 +2294,7 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage-white.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-mage.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-necromancer+female.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/human-necromancer.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Kitty/undead-lich.png
 drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/portraits/Neoriceisgood/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/portraits/Neoriceisgood/dwarvish_berzerker.png
@@ -2354,6 +2356,13 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/projectiles/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fire-burst-small-6.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fire-burst-small-7.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fire-burst-small-8.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-6.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-fail-7.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-impact-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-impact-10.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/projectiles/fireball-impact-11.png
@@ -4315,6 +4324,15 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/dwarves/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/stalwart.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-attack-mace.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-attack.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-6.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-7.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-8.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-axe-9.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-defend-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-defend-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/dwarves/steelclad-defend.png
@@ -5187,6 +5205,11 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/human-magi/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-attack-staff-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-attack-staff-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage-idle-5.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/arch-mage.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/great-mage+female-attack-magic-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/human-magi/great-mage+female-attack-magic-2.png
@@ -5744,12 +5767,20 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/nagas/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter+female-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter+female.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-attack.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-defend-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-defend-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-idle-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-idle-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-idle-3.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-idle-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-idle-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter-melee-6.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/fighter.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/myrmidon+female-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/nagas/myrmidon+female-defend.png
@@ -5846,6 +5877,15 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/orcs/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-die-7.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-die-8.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-die-9.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-6.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-7.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-8.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-idle-9.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-ranged1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin-ranged2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/orcs/assassin.png
@@ -6203,6 +6243,11 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-dying-5.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-dying-6.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-dying-7.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-idle-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-idle-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-idle-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-idle-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade-idle-5.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathblade.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathknight-crossbow-attack1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/deathknight-crossbow-attack2.png
@@ -6224,9 +6269,23 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/draug.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-6.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant-dying-7.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/revenant.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack-5.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-attackb.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-defend-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-defend-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-dying-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead-skeletal/skeleton-dying-2.png
@@ -6369,9 +6428,11 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-attack-n.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-attack-s.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-attack.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-defend.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-die-1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-die-2.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-die-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer-die-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-swimmer.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-troll-attack-n.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/soulless-troll-attack-s.png
@@ -6403,6 +6464,18 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-attack1.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-attack-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-attack-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-attack-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-attack-4.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-attack-5.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-defend-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s-defend-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith-s.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/wraith.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-attack-n.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-attack-s.png
@@ -6458,6 +6531,10 @@ drwxr-xr-x	root/root	usr/share/wesnoth/data/core/images/units/undead/
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-attack-s.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-attack.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-defend.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-die-1.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-die-2.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-die-3.png
+-rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer-die-4.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-swimmer.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-troll-attack-n.png
 -rw-r--r--	root/root	usr/share/wesnoth/data/core/images/units/undead/zombie-troll-attack-s.png
diff --git a/wesnoth/.md5sum b/wesnoth/.md5sum
index e8083557b..7d6bd5d86 100644
--- a/wesnoth/.md5sum
+++ b/wesnoth/.md5sum
@@ -1 +1 @@
-09b7b76d4a4eedf502f38df9d551d827  wesnoth-1.4.5.tar.bz2
+9e92234b29f062b3779750ba3cd0a71b  wesnoth-1.4.6.tar.bz2
diff --git a/wesnoth/Pkgfile b/wesnoth/Pkgfile
index b41525d00..9d01a5238 100644
--- a/wesnoth/Pkgfile
+++ b/wesnoth/Pkgfile
@@ -5,32 +5,23 @@
 # Depends on: sdl_image sdl_mixer sdl_net freetype boost
 
 name=wesnoth
-version=1.4.5
+version=1.4.6
 release=1
-source=(http://dl.sourceforge.net/sourceforge/wesnoth/wesnoth-$version.tar.bz2)
+source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
 
 build() {
-	cd wesnoth-$version
+	cd $name-$version
 	rm po/*/*.po
 
 	sed -i \
 		-e 's/USE_NLS=yes/USE_NLS=no/' \
 		-e 's/ENABLE_NLS 1/ENABLE_NLS 0/' configure
 
-	if pkginfo -i |grep '^kdebase ' > /dev/null; then
-		local configure='--with-kde'
-	fi
-
-	if pkginfo -i |grep '^gnome ' > /dev/null; then
-		local configure='--with-gnome'
-	fi
-
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
 		--disable-nls \
-		--enable-python \
-		$configure
+		--enable-python
 
 	make
 	make DESTDIR=$PKG install
diff --git a/wesnoth/pre-install b/wesnoth/pre-install
index 4f1ac1b52..8731396fe 100755
--- a/wesnoth/pre-install
+++ b/wesnoth/pre-install
@@ -2,7 +2,7 @@
 
 . /etc/pkgmk.conf
 . Pkgfile
-OLD_VERSION='1.4.4'
+OLD_VERSION='1.4.5'
 
 [ -z "$PKGMK_WORK_DIR" ] && PKGMK_WORK_DIR="$PWD/work"
 [ -z "$PKGMK_SOURCE_DIR" ] && PKGMK_SOURCE_DIR="$PWD"