git » openttd.git » commit bd1dafb

upstream update 1.7.0

author Laurent Carlier
2017-04-13 08:17:42 UTC
committer Laurent Carlier
2017-04-13 08:17:42 UTC
parent df5d8dacede26dbbae2e24e92c48b47b24af3a8e

upstream update 1.7.0

PKGBUILD +4 -13
openttd-1.5.3-gcc6.patch +0 -11

diff --git a/PKGBUILD b/PKGBUILD
index 6039fe7..67bb372 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64')
 url='http://www.openttd.org'
@@ -10,17 +10,8 @@ license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
-source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz"
-        openttd-1.5.3-gcc6.patch)
-sha256sums=('9b08996e31c3485ef8dedfa1ab65147091593f3f11bd51eb7662ce5ea41363aa'
-            '3e9652e1401150c287b71595afbf268dc4379908519d7939ec4e46548026b7e9')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # patch from fedora
-  patch -Np1 -i ../openttd-1.5.3-gcc6.patch
-}
+source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
+sha256sums=('df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0')
 
 build() {
   cd ${pkgname}-${pkgver} 
diff --git a/openttd-1.5.3-gcc6.patch b/openttd-1.5.3-gcc6.patch
deleted file mode 100644
index 65d9991..0000000
--- a/openttd-1.5.3-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openttd-1.5.3/src/safeguards.h.orig	2016-02-02 16:21:10.378533175 +0000
-+++ openttd-1.5.3/src/safeguards.h	2016-02-02 16:21:15.269555568 +0000
-@@ -21,6 +21,8 @@
- #ifndef SAFEGUARDS_H
- #define SAFEGUARDS_H
- 
-+#include <stdlib.h>
-+
- /* Use MallocT instead. */
- #define malloc    SAFEGUARD_DO_NOT_USE_THIS_METHOD
-