[arch-commits] Commit in openttd/trunk (PKGBUILD openttd-1.5.3-gcc6.patch)

[Laurent Carlier]

    Date: Thursday, April 13, 2017 @ 08:17:42
  Author: lcarlier
Revision: 222600

upgpkg: openttd 1.7.0-1

upstream update 1.7.0

Modified:
  openttd/trunk/PKGBUILD
Deleted:
  openttd/trunk/openttd-1.5.3-gcc6.patch

--------------------------+
 PKGBUILD                 |   17 ++++-------------
 openttd-1.5.3-gcc6.patch |   11 -----------
 2 files changed, 4 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-13 08:02:20 UTC (rev 222599)
+++ PKGBUILD	2017-04-13 08:17:42 UTC (rev 222600)
@@ -2,8 +2,8 @@
 # Maintainer: Vesa Kaihlavirta <vegai at 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'
@@ -11,18 +11,9 @@
 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')
+source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
+sha256sums=('df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # patch from fedora
-  patch -Np1 -i ../openttd-1.5.3-gcc6.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver} 
 

Deleted: openttd-1.5.3-gcc6.patch
===================================================================
--- openttd-1.5.3-gcc6.patch	2017-04-13 08:02:20 UTC (rev 222599)
+++ openttd-1.5.3-gcc6.patch	2017-04-13 08:17:42 UTC (rev 222600)
@@ -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
-