[arch-commits] Commit in openttd/trunk (3 files)

[Laurent Carlier]

    Date: Sunday, May 8, 2016 @ 09:02:06
  Author: lcarlier
Revision: 174283

upgpkg: openttd 1.6.0-2

hooks rebuild, add gcc6 patch from fedora

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

--------------------------+
 PKGBUILD                 |   16 ++++++++++++----
 openttd-1.5.3-gcc6.patch |   11 +++++++++++
 openttd.install          |   17 -----------------
 3 files changed, 23 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-08 04:47:32 UTC (rev 174282)
+++ PKGBUILD	2016-05-08 07:02:06 UTC (rev 174283)
@@ -3,18 +3,26 @@
 
 pkgname=openttd
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64')
 url='http://www.openttd.org'
 license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
-install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
-source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('4c12e6b516ffdee20a03ebad80dad85d137130002d6d3e123a568376fe4b4eb2')
+source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz"
+        openttd-1.5.3-gcc6.patch)
+sha256sums=('4c12e6b516ffdee20a03ebad80dad85d137130002d6d3e123a568376fe4b4eb2'
+            '3e9652e1401150c287b71595afbf268dc4379908519d7939ec4e46548026b7e9')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  # patch from fedora
+  patch -Np1 -i ../openttd-1.5.3-gcc6.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver} 
 

Added: openttd-1.5.3-gcc6.patch
===================================================================
--- openttd-1.5.3-gcc6.patch	                        (rev 0)
+++ openttd-1.5.3-gcc6.patch	2016-05-08 07:02:06 UTC (rev 174283)
@@ -0,0 +1,11 @@
+--- 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
+ 

Deleted: openttd.install
===================================================================
--- openttd.install	2016-05-08 04:47:32 UTC (rev 174282)
+++ openttd.install	2016-05-08 07:02:06 UTC (rev 174283)
@@ -1,17 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  update-desktop-database > /dev/null 2>&1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1     
-  update-desktop-database > /dev/null 2>&1
-}