Update to version 1.9.3

2 files changed, 36 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c8b0605b31c..d6b4aed841e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = landeseternelles
 	pkgdesc = Landes Eternelles is a french role playing game (mmorpg), forked from Eternal Lands.
-	pkgver = 1.9.0
-	pkgrel = 6
+	pkgver = 1.9.3
+	pkgrel = 1
 	url = http://www.landes-eternelles.com
 	install = landeseternelles.install
 	arch = i686
@@ -15,14 +15,16 @@ pkgbase = landeseternelles
 	depends = libxslt
 	depends = libvorbis
 	depends = gtk2
-	source = http://landes-eternelles.com/client/1900/Client_Sources-1.9.0.tar.bz2
-	source = http://www.landes-eternelles.com/client/1900/Editeur_Sources-1.9.0.tar.bz2
-	source = http://landes-eternelles.com/client/1900/linux/LandesEternellesLinux-1.9.0.tar.bz2
+	noextract = Client_Sources-1.9.3.zip
+	noextract = Editeur_Sources-1.9.3.zip
+	source = http://landes-eternelles.com/client/1930/Client_Sources-1.9.3.zip
+	source = http://www.landes-eternelles.com/client/1930/Editeur_Sources-1.9.3.zip
+	source = http://landes-eternelles.com/client/1930/linux/LandesEternellesLinux-1.9.3.zip
 	source = landeseternelles.desktop
 	source = landeseternelles.png
-	sha256sums = e00b6b1771698cbac22502afab17b4bd8a0ece8268ec80ee7ba137236ba60010
-	sha256sums = 8cf98ab4d27fa847bc81b371fd29959b1e73e91e29ea5ed080cda0d20007e55b
-	sha256sums = 55aa2a48188fcc38d47dab3c2021439913b0ae716f9c54fb67c48e22e50700b4
+	sha256sums = e622b57d1a62a9ddf8d1574ac89f0deb482d89d6045073020f470c608b835858
+	sha256sums = ed33675c87723656544e63dabe59ad8ecf37576dacebf5a01d0ac0ad9a079390
+	sha256sums = efe94668e121a87717d850a14379797927730c9962a673cc1613e1c89addd8d0
 	sha256sums = 1357259d4232d8533d3acdf22c63a9b650472f0ca2cf9841eb03ebd6a514e3f7
 	sha256sums = f42bb2fdd8b981ca2ed5552110831e349852439b3ea0ead13f7fa328f3a30b72
 
diff --git a/PKGBUILD b/PKGBUILD
index 6df7362c4d50..a0deecf61a62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Tosh (tosh <at> t0x0sh <dot> org)
 
 pkgname=landeseternelles
-pkgver=1.9.0
-pkgrel=6
+pkgver=1.9.3
+pkgrel=1
 pkgdesc="Landes Eternelles is a french role playing game (mmorpg), forked from Eternal Lands."
 arch=('i686' 'x86_64')
 url="http://www.landes-eternelles.com"
@@ -10,28 +10,39 @@ license=(custom:'eternal_lands_license')
 depends=('sdl_net' 'sdl_image' 'cal3d' 'mesa' 'openal' 'libxslt' 'libvorbis' 'gtk2')
 install='landeseternelles.install'
 
+client_sources="Client_Sources-1.9.3"
+editeur_sources="Editeur_Sources-1.9.3"
+datas="LandesEternellesLinux-1.9.3"
+
+
 source=(
-    http://landes-eternelles.com/client/1900/Client_Sources-1.9.0.tar.bz2
-    http://www.landes-eternelles.com/client/1900/Editeur_Sources-1.9.0.tar.bz2
-    http://landes-eternelles.com/client/1900/linux/LandesEternellesLinux-1.9.0.tar.bz2
+    http://landes-eternelles.com/client/1930/$client_sources.zip
+    http://www.landes-eternelles.com/client/1930/$editeur_sources.zip
+    http://landes-eternelles.com/client/1930/linux/$datas.zip
     landeseternelles.desktop
     landeseternelles.png
 )
 
+noextract=(
+   $client_sources.zip
+   $editeur_sources.zip
+)
+
+prepare() {
+          mkdir -p client_sources editeur_sources
+          (cd client_sources && bsdtar -x -f ../$client_sources.zip)
+          (cd editeur_sources && bsdtar -x -f ../$editeur_sources.zip)
+}
+
 build() {
     cd "$srcdir/client_sources"
 
-    sed -i -r "s/__inline__//g" $srcdir/client_sources/minimap.c
-    sed -i -r "s/__inline__//g" $srcdir/client_sources/weather.c
     sed -i -r "s/abs\(last_mod_time - SDL_GetTicks\(\)\)/abs\(\(long int\) SDL_GetTicks\(\) - last_mod_time\)/" $srcdir/client_sources/item_lists.cpp
     sed -i -r "s/abs\(SDL_GetTicks\(\) - last_flash_change\)/abs\(\(long int\) SDL_GetTicks\(\) - last_flash_change\)/" $srcdir/client_sources/icon_window.cpp
 
     make -f Makefile.linux || return 1
 
     cd "$srcdir/editeur_sources"
-    sed -i -r "s/#define min/\/\/#define min/g" $srcdir/editeur_sources/global.h
-    sed -i -r "s/#define max/\/\/#define max/g" $srcdir/editeur_sources/global.h
-
     make -f Makefile.linux || return 1
 }
 
@@ -46,20 +57,20 @@ package() {
 	    cd "$srcdir/editeur_sources"
 	    install -m755 mapedit.x86_64.linux.bin $pkgdir/usr/bin/mapedit.$CARCH.linux.bin
     else
-	    cd "$srcdir/client_Sources"
+	    cd "$srcdir/client_sources"
 	    install -m755 le.x86.linux.bin $pkgdir/usr/bin/le.x86.linux.bin
 	    cd "$srcdir/editeur_Sources"
 	    install -m755 mapedit.x86.linux.bin $pkgdir/usr/bin/mapedit.x86.linux.bin
     fi
 
-    cd "$srcdir/LandesEternellesLinux"
+    cd "$srcdir/$datas"
     rm -f *.bin icon.bmp
     mv -f Licence.txt $pkgdir/usr/share/licenses/$pkgname/
     mv -f * $pkgdir/usr/share/$pkgname/
 }
 
-sha256sums=('e00b6b1771698cbac22502afab17b4bd8a0ece8268ec80ee7ba137236ba60010'
-            '8cf98ab4d27fa847bc81b371fd29959b1e73e91e29ea5ed080cda0d20007e55b'
-            '55aa2a48188fcc38d47dab3c2021439913b0ae716f9c54fb67c48e22e50700b4'
+sha256sums=('e622b57d1a62a9ddf8d1574ac89f0deb482d89d6045073020f470c608b835858'
+            'ed33675c87723656544e63dabe59ad8ecf37576dacebf5a01d0ac0ad9a079390'
+            'efe94668e121a87717d850a14379797927730c9962a673cc1613e1c89addd8d0'
             '1357259d4232d8533d3acdf22c63a9b650472f0ca2cf9841eb03ebd6a514e3f7'
             'f42bb2fdd8b981ca2ed5552110831e349852439b3ea0ead13f7fa328f3a30b72')