[arch-commits] Commit in openttd/repos (8 files)
Laurent Carlier
lcarlier at archlinux.org
Sun May 8 08:51:49 UTC 2016
Date: Sunday, May 8, 2016 @ 10:51:49
Author: lcarlier
Revision: 174284
archrelease: copy trunk to community-i686, community-x86_64
Added:
openttd/repos/community-i686/PKGBUILD
(from rev 174283, openttd/trunk/PKGBUILD)
openttd/repos/community-i686/openttd-1.5.3-gcc6.patch
(from rev 174283, openttd/trunk/openttd-1.5.3-gcc6.patch)
openttd/repos/community-x86_64/PKGBUILD
(from rev 174283, openttd/trunk/PKGBUILD)
openttd/repos/community-x86_64/openttd-1.5.3-gcc6.patch
(from rev 174283, openttd/trunk/openttd-1.5.3-gcc6.patch)
Deleted:
openttd/repos/community-i686/PKGBUILD
openttd/repos/community-i686/openttd.install
openttd/repos/community-x86_64/PKGBUILD
openttd/repos/community-x86_64/openttd.install
-------------------------------------------+
/PKGBUILD | 92 ++++++++++++++++++++++++++++
community-i686/PKGBUILD | 38 -----------
community-i686/openttd-1.5.3-gcc6.patch | 11 +++
community-i686/openttd.install | 17 -----
community-x86_64/PKGBUILD | 38 -----------
community-x86_64/openttd-1.5.3-gcc6.patch | 11 +++
community-x86_64/openttd.install | 17 -----
7 files changed, 114 insertions(+), 110 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-05-08 07:02:06 UTC (rev 174283)
+++ community-i686/PKGBUILD 2016-05-08 08:51:49 UTC (rev 174284)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-
-pkgname=openttd
-pkgver=1.6.0
-pkgrel=1
-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')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure \
- --prefix-dir=/usr \
- --binary-name=${pkgname} \
- --binary-dir=bin \
- --data-dir=share/${pkgname} \
- --install-dir=${pkgdir} \
- --doc-dir=share/doc/${pkgname} \
- --menu-name="OpenTTD" \
- --personal-dir=.${pkgname}
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make install
-}
Copied: openttd/repos/community-i686/PKGBUILD (from rev 174283, openttd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-08 08:51:49 UTC (rev 174284)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgname=openttd
+pkgver=1.6.0
+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')
+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=('4c12e6b516ffdee20a03ebad80dad85d137130002d6d3e123a568376fe4b4eb2'
+ '3e9652e1401150c287b71595afbf268dc4379908519d7939ec4e46548026b7e9')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # patch from fedora
+ patch -Np1 -i ../openttd-1.5.3-gcc6.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure \
+ --prefix-dir=/usr \
+ --binary-name=${pkgname} \
+ --binary-dir=bin \
+ --data-dir=share/${pkgname} \
+ --install-dir=${pkgdir} \
+ --doc-dir=share/doc/${pkgname} \
+ --menu-name="OpenTTD" \
+ --personal-dir=.${pkgname}
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make install
+}
Copied: openttd/repos/community-i686/openttd-1.5.3-gcc6.patch (from rev 174283, openttd/trunk/openttd-1.5.3-gcc6.patch)
===================================================================
--- community-i686/openttd-1.5.3-gcc6.patch (rev 0)
+++ community-i686/openttd-1.5.3-gcc6.patch 2016-05-08 08:51:49 UTC (rev 174284)
@@ -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: community-i686/openttd.install
===================================================================
--- community-i686/openttd.install 2016-05-08 07:02:06 UTC (rev 174283)
+++ community-i686/openttd.install 2016-05-08 08:51:49 UTC (rev 174284)
@@ -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
-}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-05-08 07:02:06 UTC (rev 174283)
+++ community-x86_64/PKGBUILD 2016-05-08 08:51:49 UTC (rev 174284)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-
-pkgname=openttd
-pkgver=1.6.0
-pkgrel=1
-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')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ./configure \
- --prefix-dir=/usr \
- --binary-name=${pkgname} \
- --binary-dir=bin \
- --data-dir=share/${pkgname} \
- --install-dir=${pkgdir} \
- --doc-dir=share/doc/${pkgname} \
- --menu-name="OpenTTD" \
- --personal-dir=.${pkgname}
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make install
-}
Copied: openttd/repos/community-x86_64/PKGBUILD (from rev 174283, openttd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-08 08:51:49 UTC (rev 174284)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgname=openttd
+pkgver=1.6.0
+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')
+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=('4c12e6b516ffdee20a03ebad80dad85d137130002d6d3e123a568376fe4b4eb2'
+ '3e9652e1401150c287b71595afbf268dc4379908519d7939ec4e46548026b7e9')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # patch from fedora
+ patch -Np1 -i ../openttd-1.5.3-gcc6.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ ./configure \
+ --prefix-dir=/usr \
+ --binary-name=${pkgname} \
+ --binary-dir=bin \
+ --data-dir=share/${pkgname} \
+ --install-dir=${pkgdir} \
+ --doc-dir=share/doc/${pkgname} \
+ --menu-name="OpenTTD" \
+ --personal-dir=.${pkgname}
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make install
+}
Copied: openttd/repos/community-x86_64/openttd-1.5.3-gcc6.patch (from rev 174283, openttd/trunk/openttd-1.5.3-gcc6.patch)
===================================================================
--- community-x86_64/openttd-1.5.3-gcc6.patch (rev 0)
+++ community-x86_64/openttd-1.5.3-gcc6.patch 2016-05-08 08:51:49 UTC (rev 174284)
@@ -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: community-x86_64/openttd.install
===================================================================
--- community-x86_64/openttd.install 2016-05-08 07:02:06 UTC (rev 174283)
+++ community-x86_64/openttd.install 2016-05-08 08:51:49 UTC (rev 174284)
@@ -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
-}
More information about the arch-commits
mailing list