diff options
author | root <root@rshg054.dnsready.net> | 2013-08-05 02:24:00 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-08-05 02:24:00 -0700 |
commit | b3923b26c3d37257246fea13bdb1151c96cb2fe4 (patch) | |
tree | 868c0a9f4649cfc0849318696f440a10bc412d9b /community/supertux | |
parent | 639c9730319cc0ce33e34e2386f467f67d3cc458 (diff) |
Mon Aug 5 02:23:17 PDT 2013
Diffstat (limited to 'community/supertux')
-rw-r--r-- | community/supertux/PKGBUILD | 23 | ||||
-rw-r--r-- | community/supertux/supertux2-0.3.3-squirrel-gcc47.patch | 36 |
2 files changed, 5 insertions, 54 deletions
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index c063640de..39454fa29 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,33 +1,20 @@ -# $Id: PKGBUILD 94908 2013-08-01 06:55:39Z bpiotrowski $ +# $Id: PKGBUILD 95026 2013-08-03 22:26:22Z svenstaro $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Eric BĂ©langer <eric@archlinux.org> # Contributor: vande198 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=supertux -pkgver=0.3.3 -pkgrel=9 +pkgver=0.3.4 +pkgrel=1 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64') url="http://super-tux.sourceforge.net/" license=('GPL') depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew') makedepends=('cmake' 'boost' 'mesa' 'optipng') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 - supertux2-0.3.3-squirrel-gcc47.patch) -md5sums=('f3f803e629ee51a9de0b366a036e393d' - 'eb06315514be4f200428f14b927beb66') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" - sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp - sed -i '/types\.h/d' src/addon/addon_manager.cpp - - # Fix invalid PNG image to work with libpng 1.6 - optipng -quiet -force -fix data/images/creatures/flame_fish/left-0.png -} +source=(https://supertux.googlecode.com/files/supertux-${pkgver}.tar.bz2) +md5sums=('108af4c1fd985e8842a15cd819b9b157') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch deleted file mode 100644 index 16781b610..000000000 --- a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h 1970-01-01 01:00:00.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h 2012-05-01 11:59:37.000000000 +0200 -@@ -0,0 +1,8 @@ -+/* see copyright notice in squirrel.h */ -+#ifndef _SQMEM_H_ -+#define _SQMEM_H_ -+ -+void *sq_vm_malloc(SQUnsignedInteger size); -+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); -+void sq_vm_free(void *p,SQUnsignedInteger size); -+#endif //_SQMEM_H_ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h 2010-03-01 13:40:58.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h 2012-05-01 11:59:37.000000000 +0200 -@@ -136,8 +136,4 @@ - extern SQObjectPtr _minusone_; - - bool CompileTypemask(SQIntVec &res,const SQChar *typemask); -- --void *sq_vm_malloc(SQUnsignedInteger size); --void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); --void sq_vm_free(void *p,SQUnsignedInteger size); - #endif //_SQSTATE_H_ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h 2010-03-01 13:40:58.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h 2012-05-01 11:59:37.000000000 +0200 -@@ -2,6 +2,8 @@ - #ifndef _SQUTILS_H_ - #define _SQUTILS_H_ - -+#include "sqmem.h" -+ - #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;} - #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));} - #define SQ_MALLOC(__size) sq_vm_malloc((__size)); |