Use patch instead of sed to fix client_sources

3 files changed, 30 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b4aed841e0..81fcde4443a2 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.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.landes-eternelles.com
 	install = landeseternelles.install
 	arch = i686
@@ -22,11 +22,13 @@ pkgbase = landeseternelles
 	source = http://landes-eternelles.com/client/1930/linux/LandesEternellesLinux-1.9.3.zip
 	source = landeseternelles.desktop
 	source = landeseternelles.png
+	source = client_sources.patch
 	sha256sums = e622b57d1a62a9ddf8d1574ac89f0deb482d89d6045073020f470c608b835858
 	sha256sums = ed33675c87723656544e63dabe59ad8ecf37576dacebf5a01d0ac0ad9a079390
 	sha256sums = efe94668e121a87717d850a14379797927730c9962a673cc1613e1c89addd8d0
 	sha256sums = 1357259d4232d8533d3acdf22c63a9b650472f0ca2cf9841eb03ebd6a514e3f7
 	sha256sums = f42bb2fdd8b981ca2ed5552110831e349852439b3ea0ead13f7fa328f3a30b72
+	sha256sums = 8a775a31c459c5a3e8f1984e610db7abba395504e51ab28be173a263dc9a3f4b
 
 pkgname = landeseternelles
 
diff --git a/PKGBUILD b/PKGBUILD
index a0deecf61a62..d0c79bcd00cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=landeseternelles
 pkgver=1.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Landes Eternelles is a french role playing game (mmorpg), forked from Eternal Lands."
 arch=('i686' 'x86_64')
 url="http://www.landes-eternelles.com"
@@ -21,6 +21,7 @@ source=(
     http://landes-eternelles.com/client/1930/linux/$datas.zip
     landeseternelles.desktop
     landeseternelles.png
+    client_sources.patch
 )
 
 noextract=(
@@ -36,10 +37,7 @@ prepare() {
 
 build() {
     cd "$srcdir/client_sources"
-
-    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
-
+    patch < ../client_sources.patch
     make -f Makefile.linux || return 1
 
     cd "$srcdir/editeur_sources"
@@ -73,4 +71,5 @@ sha256sums=('e622b57d1a62a9ddf8d1574ac89f0deb482d89d6045073020f470c608b835858'
             'ed33675c87723656544e63dabe59ad8ecf37576dacebf5a01d0ac0ad9a079390'
             'efe94668e121a87717d850a14379797927730c9962a673cc1613e1c89addd8d0'
             '1357259d4232d8533d3acdf22c63a9b650472f0ca2cf9841eb03ebd6a514e3f7'
-            'f42bb2fdd8b981ca2ed5552110831e349852439b3ea0ead13f7fa328f3a30b72')
+            'f42bb2fdd8b981ca2ed5552110831e349852439b3ea0ead13f7fa328f3a30b72'
+            '8a775a31c459c5a3e8f1984e610db7abba395504e51ab28be173a263dc9a3f4b')
diff --git a/client_sources.patch b/client_sources.patch
new file mode 100644
index 000000000000..35554280835d
--- /dev/null
+++ b/client_sources.patch
@@ -0,0 +1,22 @@
+--- icon_window.cpp	2018-10-23 23:55:36.000000000 +0200
++++ icon_window.cpp	2018-12-14 23:25:30.710693140 +0100
+@@ -374,7 +374,7 @@
+ 		size_t index = (has_highlight)? 1: 0;
+ 		if (flashing)
+ 		{
+-			if (abs(SDL_GetTicks() - last_flash_change) > 250)
++			if (abs((long int) SDL_GetTicks() - last_flash_change) > 250)
+ 			{
+ 				last_flash_change = SDL_GetTicks();
+ 				flashing--;
+
+--- item_lists.cpp	2018-10-23 23:55:38.000000000 +0200
++++ item_lists.cpp	2018-12-14 23:25:30.704026455 +0100
+@@ -788,6 +788,6 @@
+ 	{
+ 		if (!last_mod_time)
+ 			return;
+-		if (force || (last_mod_time && abs(last_mod_time - SDL_GetTicks()) > 5000))
++		if (force || (last_mod_time && abs((long int) SDL_GetTicks() - last_mod_time) > 5000))
+ 			save();
+ 	}