Updated to 1.6.0

6 files changed, 104 insertions, 67 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7e5bc31..d9e1524 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,17 @@
 # AUR version uses /opt
 # AUR version uses http
 # AUR version uses debug build
-# AUR version lacks glext patch
 # AUR version does not use -O3
 # AUR version lacks offline patch
 # AUR version lacks DLC
 
 pkgname=tome4
-pkgver=1.5.10
-pkgrel=4
-_ashesver=1.0.6
-_orcsver=1.0.4
-_cultsver=1.0.1
+pkgver=1.6.0
+pkgrel=1
+_offlinever=1.6
+_ashesver=1.0.7
+_orcsver=1.0.5
+_cultsver=1.0.3
 pkgdesc="An open-source, single-player, role-playing roguelike game set in the world of Eyal."
 pkgdesc+="Includes DLC and offline patch."
 arch=('i686' 'x86_64')
@@ -26,24 +26,22 @@ depends=(glu openal libvorbis sdl2_ttf sdl2_image)
 makedepends=(premake zip unzip)
 options=(!makeflags emptydirs)
 source=("${url}dl/t-engine/t-engine4-src-${pkgver}.tar.bz2"
-	sdl2-path-fix.patch
-	glext-include-removal.patch
-	O3-support.patch
-	offline-donator.patch
-	ashes-urhrok_${_ashesver}.teaac
-	orcs_${_orcsver}.teaac
-	cults_${_cultsver}.teaac
-	tome4
-	tome4.desktop)
+  sdl2-path-fix.patch
+  O3-support.patch
+  offline-donator_${_offlinever}.patch
+  ashes-urhrok_${_ashesver}.teaac
+  orcs_${_orcsver}.teaac
+  cults_${_cultsver}.teaac
+  tome4
+  tome4.desktop)
 conflicts=('tome4-beta' 'tome4-git' 'tome4-nomusic')
-sha512sums=('852ead36d705fe1cee834f33a3cbaf7841d991bc03fdedd0740e7c5ddbd9979f4fdcdd2bf951bf4d666229f65b2010c385128bf07717c05b1b0b91319cbff32e'
-            'bbe96647c738eea46e52ed26c0d404f0daf14c6c367d005a23c88026665ed2eba207fd99ef81e14e4cd740108360d3be176158585790d8c55389e3ffdf160e29'
-            '22344a867a06ec9d1739acbbf3e5ac20d9e17ed7bcfc28bdb873e0f3ba4953d7639ebb27a7513776bc2078276207c3ebbec1b15e96cb5ea3e2638bd345863439'
+sha512sums=('b36ebdb7cf5c77a6e3c27a51c6282c5dec47fd8c27463c514b83f4b6f98300fe976ebb1618fc208146ff0287049bb91865876ab14cef3b4ad8198975cbea688e'
+            '9d4533581e6dea76a68ed8feb5aded7d02562ce3303c5c8a59f041a2b52f49bb3aa215d3f2ba3e31af85c62655ba1494d1e0f626bcbb618a90f053fd1f364a48'
             '790dce2ee4f42f0bdb536eed464f2f9849039852249deb1de06f2e71e2938cb70380ad6b617900b4b159f60060a4163a37583e3c1639578b090cc77621243477'
-            '8847d6ed5a505ae4dd4399d88e3e2a839afdf589895662ab61f0fec0b475130a9088489f5dab5b5e7ce8e79968771227fd73abf5c71521da559d4187f200e3c7'
-            '842b0de3a6d98f9cb575404e2a11799c5117e96d957289f7336c6c8e92df665e9c6affc30653a3a1f4e3618efde9a3168a08e0c2989380f1fd170cc243568fd1'
-            '709da5f7083800172d64d1a7beb187887e108f929bc47209db178fc2ea58fe5021b711239a8713719c68431def56a53c9521fecb0a528f820318344fb3ef30ea'
-            'd23ee192c4cc3ca53dbbed41815f867927e027d7c8b3a71d136a977ef92e1b56214e6da1e24ef3b7a5ac0ebd4e61fdafff32dba0060bd1b9f1d8c430f206ea05'
+            '9f19607d542bfed80570875f22211e9cda3576c62e1cdd426576b8d3832e7b9af2e86135ee0c25942772fbe1f10bdb63d62cd37a59f31a424518cdfd9097d536'
+            '2e47706326f443838f265b9345a53b2b7ae548c0277da14725dae414187760c5d92eb38ff3b851cb31ac8794f8cc38631cd5c70b8ff4b9acd66eeb9d29a18870'
+            '3181815df9463f32e1592643c7c62dd39485a982b65d0fb40fac94e62233a0fd72d325bc0d088e2efb2a6837dad6377777db0c242d680c00a1714ca59c4950f9'
+            'd66c85168e8ed7fcb79dea78ddf0213ff8d473cd278ce6ea07f6b4f4eb2b98d6bec8b7683e1957404441b1c94cc74d0df816ce9e77a2a192a5449aacff982bab'
             '521e99b07082d6379606541f625f68fa666610e1c3f27e5e4803cc44bc16e60f28824792d1b13e477a08176f609288e693be3d92ba60cb4fea343f11854fe466'
             '94ed400247d4137fc4f6e770e724a47a028a2fafff15c38ba952d828db4d3890e13ae2c51b8cf9e070b545ba07e5c183b44c15886480b1e06d3c94a2826e5c73')
 
@@ -52,14 +50,14 @@ sha512sums=('852ead36d705fe1cee834f33a3cbaf7841d991bc03fdedd0740e7c5ddbd9979f4fd
 # 1. Patch the game.
 ###############################################################################
 prepare() {
-	cd "$srcdir"/t-engine4-src-${pkgver}
-	patch -p1 -i "${srcdir}/sdl2-path-fix.patch"
-	patch -p1 -i "${srcdir}/glext-include-removal.patch"
-	patch -p1 -i "${srcdir}/O3-support.patch"
-	patch -p1 -i "${srcdir}/offline-donator.patch"
-	cp "${srcdir}/ashes-urhrok_${_ashesver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/ashes-urhrok.teaac"
-	cp "${srcdir}/orcs_${_orcsver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/orcs.teaac"
-	cp "${srcdir}/cults_${_cultsver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/cults.teaac"
+  cd t-engine4-src-${pkgver}
+
+  patch -p1 -i "${srcdir}/sdl2-path-fix.patch"
+  patch -p1 -i "${srcdir}/O3-support.patch"
+  patch -p1 -i "${srcdir}/offline-donator_${_offlinever}.patch"
+  cp "${srcdir}/ashes-urhrok_${_ashesver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/ashes-urhrok.teaac"
+  cp "${srcdir}/orcs_${_orcsver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/orcs.teaac"
+  cp "${srcdir}/cults_${_cultsver}.teaac" "${srcdir}/t-engine4-src-${pkgver}/game/addons/cults.teaac"
 
 }
 
@@ -67,34 +65,37 @@ prepare() {
 # 2. Build the game engine from source.
 ###############################################################################
 build() {
-	cd t-engine4-src-${pkgver}
-	premake4 gmake
-	make -j4 config=release
+  cd t-engine4-src-${pkgver}
+
+  premake4 gmake
+    export CFLAGS="$CFLAGS -fstack-protector-all -fPIE"
+    export CXXFLAGS="$CXXFLAGS -fstack-protector-all -fPIE"
+    export LDFLAGS="$LDFLAGS,-pie"
+  make -j4 config=release
 }
 
 ###############################################################################
 # 3. Create the package. Copy all that shall be installed into the package dir.
 ###############################################################################
 package() {
-	# Extract and install the icon.
-	unzip -oj -qq "${srcdir}/t-engine4-src-${pkgver}/game/engines/te4-${pkgver}.teae" \
-		"data/gfx/te4-icon.png" -d "${srcdir}"
-	install -Dm644 "${srcdir}/te4-icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-	
-	# Install the documents.
-	install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/CONTRIBUTING" "${pkgdir}/usr/share/doc/${pkgname}/CONTRIBUTING"
-	install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/CREDITS" "${pkgdir}/usr/share/doc/${pkgname}/CREDITS"
-	
-	# Install the custom license into standard location.
-	install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-	install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/COPYING-MEDIA" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-MEDIA"
+  # Extract and install the icon.
+  unzip -oj -qq "${srcdir}/t-engine4-src-${pkgver}/game/engines/te4-${pkgver}.teae" "data/gfx/te4-icon.png" -d "${srcdir}"
+  install -Dm644 "${srcdir}/te4-icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  
+  # Install the documents.
+  install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/CONTRIBUTING" "${pkgdir}/usr/share/doc/${pkgname}/CONTRIBUTING"
+  install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/CREDITS" "${pkgdir}/usr/share/doc/${pkgname}/CREDITS"
+  
+  # Install the custom license into standard location.
+  install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -Dm644 "${srcdir}/t-engine4-src-${pkgver}/COPYING-MEDIA" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-MEDIA"
 
-	# Install the game executable, and the launcher.
-	install -Dm755 "${srcdir}/t-engine4-src-${pkgver}/t-engine" "${pkgdir}/usr/lib/${pkgname}/t-engine"
-	install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	
-	# Install the game data.
-	cp -r "${srcdir}/t-engine4-src-${pkgver}/bootstrap" "${pkgdir}/usr/lib/${pkgname}/"
-	cp -r "${srcdir}/t-engine4-src-${pkgver}/game" "${pkgdir}/usr/lib/${pkgname}/"
+  # Install the game executable, and the launcher.
+  install -Dm755 "${srcdir}/t-engine4-src-${pkgver}/t-engine" "${pkgdir}/usr/lib/${pkgname}/t-engine"
+  install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  
+  # Install the game data.
+  cp -r "${srcdir}/t-engine4-src-${pkgver}/bootstrap" "${pkgdir}/usr/lib/${pkgname}/"
+  cp -r "${srcdir}/t-engine4-src-${pkgver}/game" "${pkgdir}/usr/lib/${pkgname}/"
 }
diff --git a/glext-include-removal.patch b/glext-include-removal.patch
deleted file mode 100644
index 0ae15c5..0000000
--- a/glext-include-removal.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/tgl.h
-+++ b/src/tgl.h
-@@ -9,7 +9,6 @@ #endif
- #include <GL/gl.h>
- #include <GL/glu.h>
- #ifndef _WIN32
--#include <GL/glext.h>
- #endif
- #endif
- 
diff --git a/offline-donator.patch b/offline-donator_1.5.patch
index e724540..e724540 100644
--- a/offline-donator.patch
+++ b/offline-donator_1.5.patch
diff --git a/offline-donator_1.6.patch b/offline-donator_1.6.patch
new file mode 100644
index 0000000..3e4d742
--- /dev/null
+++ b/offline-donator_1.6.patch
@@ -0,0 +1,47 @@
+--- a/game/loader/init.lua
++++ b/game/loader/init.lua
+@@ -214,4 +214,4 @@
+ 
+ 
+ -- RUN engine RUN !!
+-dofile("/engine/init.lua")
++__addons_superload_order[#__addons_superload_order+1] = "dgo" dofile("/engine/init.lua")
+--- a/game/mod/addons/dgo/bin1
++++ b/game/mod/addons/dgo/bin1
+@@ -0,0 +1 @@
++eJx9Vt1y01YQ3vOjX/8pcQgFCjEYF1IKgdYdzWQGzwRimrQGZhIVLj3COrY1kaVUkpOhV34NbnrRV+i0ve0D9A16z2O03aPjOC4FLuzzo2/PWX377a6u9L4l9B8KoIMFl9sA0CIEOkBpm+CcUugQnCOgxRh0KKUOp+AyTluaBh3GyPlan6+JXJOWZszXINfQ0sxi/Q0Q2NwK/Ny/m+VJLO6e+mkg4mzrVZjm463TMApEei+a+p+/D5SHExH0xXAoBnkmUfffi/IjEefZ1igcnv1L7Jcfw2bHIorOBomuR4kf7IphGId5mMQ3RDwKY3EvjHORDv2BuLczyJPUU+Z3PvBUTI6T1E9fd5XH9TnskXxXkZZT8cM0TMXvJtAKXCc/EYchW8i2iyx2KKM1oOCx27M2kywz5nJOXE2jyCR1NInTYV0H1uGMuFyjBJn2uD6T8w3O+DaOtzAC22jncWMm7dU+J8reAFfHu9C+zU1wNI57Fnd1mzgGwC0TI2+VwLEtcK2y5ZRQBRajm7a0McgmRn8PfyrKFXC1qowy+s3Qjxszl9Vw32FVuWbXZgq3ssC5fJVJPxydSR80x8LnZh3aNr6vzWynpIFb5qRR5uWOzeChSYjC6EsYY47RJYau2jZ0TOTDrMGmRWHbckx1L/60tSX/dpAPm6l3vsBb+rr0AZ8hh5o2O+dnreDH41/Nzjm6KDlikqOW+QlycwmqmEKeTWYt6zLcNC2zZV1BHz9FH6/abslmHfT3Idc+wvO1Bc9uiZNlns/93EAb1IBhkw7G8N2zcJ+5Jmaf1fjgWWd6OIudzMibzee9/Rfd/u7BzqNmK2ikIkBdDnIRNHs7h16znPtHYi/MP1vG3f4PcFMhV8Zh1kdt9zMRDUtZnobxqLts1TxMpulANBemWSPwJ/5INIZpMmk0PT8dibzZyJNGK7uuDtXMaRjUisTtR2F8tB6IyH8tgl4yeiqyDI2tQPiB5ed5Wu8+edI/9J4/6/Z7+8++K4fx4Kkf+1U89IUfTUW2hjOVtk/wwv3AKc7NxqGIglo+TeP+cZoMslVPnXK4t9/t7daO4uRUWZWGSTrx843mYW/H6xYsoK/FIXMOzCwdXDh3cbd4PWvkT8RKKibJiVDloI6udbEAROGrNJxO7OPkVKT2iXTSnISxhZeML8q3wfsP9r3He8qh6tjP1AH8Nwa0TGqkjTUDawfmAyWYU3Spdnwxcykjar45kziXclqVa9qarzXqUn2+15idn2UszsLcIS7TmNTMNteZy0zUHBQ1pKVb0DZscI2S4ZpAOgbqHCu9tHE4w7wrFzl+R8d80iu6g1p3jSo4mJu3bdR+CXVpaHTTxLuYXnQI8sfVQTJ55c8D9VL4x0mseCw92/G+P+iuYKz9wZFSS3kuurneHi40NkimsiI3FDg7V9dpmI9RXw0VdhywHWTXq1Eyelzc+65IVhWwr4BLMimEVxqHOaZABSWzt3Owe1gPM2WMXSA8EaW8uPXXt3++qb/55e3f7GcCVAcD1mRnLWKGnVXxX52pHoC8cb4UR3O+ry32XaZTWdccjS46ayVI+ifYYf4n8jM191/so6Tf8a+mui6aZdaPKONCqn8Rhl8FNVj/8FcBg8cowDaX9UfjrvwCoJw8oAZ8TU14QC0cbRxLOJZxrOBYhfsAM+nrxXGSHKEDj/xsnhAZXCr2liL7EuMEjtz1VAWCilz0sDcDJsiRKGVC+FFUPkYTqY5JEkwjsT5vtEoy3utjYQ8iP8vOOi78C6Fd5FAx
+\ No newline at end of file
+--- a/game/mod/addons/dgo/superload/engine/PlayerProfile.lua
++++ b/game/mod/addons/dgo/superload/engine/PlayerProfile.lua
+@@ -0,0 +1,31 @@
++-- ToME - Tales of Maj'Eyal
++-- Copyright (C) 2009, 2010, 2011, 2012 Nicolas Casalini
++--
++-- This program is free software: you can redistribute it and/or modify
++-- it under the terms of the GNU General Public License as published by
++-- the Free Software Foundation, either version 3 of the License, or
++-- (at your option) any later version.
++--
++-- This program is distributed in the hope that it will be useful,
++-- but WITHOUT ANY WARRANTY; without even the implied warranty of
++-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++-- GNU General Public License for more details.
++--
++-- You should have received a copy of the GNU General Public License
++-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
++--
++-- Nicolas Casalini "DarkGod"
++-- darkgod@te4.org
++
++
++local _M = loadPrevious(...)
++
++function _M:isDonator(s)
++	return 6
++end
++
++function _M:canMTXN()
++	return false
++end
++
++return _M
diff --git a/offline-item-storage-hack.patch b/offline-item-storage-hack.patch
index 8d82bc1..daca747 100644
--- a/offline-item-storage-hack.patch
+++ b/offline-item-storage-hack.patch
@@ -73,6 +73,6 @@
  
 -	local txt = Textzone.new{width=math.floor(self.iw - 10), auto_height=true, text=[[Retrieve an item from the vault. When you place an item in the vault the paradox energies around it are so powerful you must wait one hour before retrieving it.
 +	local txt = Textzone.new{width=math.floor(self.iw - 10), auto_height=true, text=[[Retrieve an item from the vault.
- 	#CRIMSON#Warning: while you *can* retrieve items made with previous versions of the game, no guaranty is given that the universe (or your character) will not explode.]]}
+ 	#CRIMSON#Warning: while you *can* retrieve items made with previous versions of the game, no guarantee is given that the universe (or your character) will not explode.]]}
  
  	self.c_list = ListColumns.new{width=math.floor(self.iw - 10), height=self.ih - 10 - txt.h - 20, scrollbar=true, sortable=true, columns={
diff --git a/sdl2-path-fix.patch b/sdl2-path-fix.patch
index 3831dfb..541de1f 100644
--- a/sdl2-path-fix.patch
+++ b/sdl2-path-fix.patch
@@ -1,6 +1,5 @@
-diff -Naur orig/premake4.lua new/premake4.lua
---- orig/premake4.lua	2014-05-19 10:42:14.000000000 +0200
-+++ new/premake4.lua	2015-12-03 22:09:15.687935809 +0100
+--- orig/premake4.lua
++++ new/premake4.lua
 @@ -30,7 +30,7 @@
  		}
  	else