diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
commit | 9b5c97532f512463af83f0daac1e9db22c3307c2 (patch) | |
tree | 582f514a154dea23be340cca8abe44a0bf95f132 /community-staging/supertux | |
parent | f8ec57e91051f85129d837252605854c888567d0 (diff) | |
parent | 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/cegui/PKGBUILD
community-staging/darktable/PKGBUILD
community-staging/freewrl/PKGBUILD
community-staging/gource/PKGBUILD
community-staging/openimageio/PKGBUILD
community-staging/rss-glx/PKGBUILD
community-staging/spring/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community/astromenace/PKGBUILD
extra/di/PKGBUILD
staging/opencv/PKGBUILD
testing/cairo/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/seahorse/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'community-staging/supertux')
-rw-r--r-- | community-staging/supertux/PKGBUILD | 35 | ||||
-rw-r--r-- | community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch | 36 |
2 files changed, 0 insertions, 71 deletions
diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD deleted file mode 100644 index a8e7d7245..000000000 --- a/community-staging/supertux/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 78608 2012-10-22 02:52:34Z ebelanger $ -# 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=7 -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') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 - supertux2-0.3.3-squirrel-gcc47.patch) -md5sums=('f3f803e629ee51a9de0b366a036e393d' - 'eb06315514be4f200428f14b927beb66') - -build() { - 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 - cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch deleted file mode 100644 index 16781b610..000000000 --- a/community-staging/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)); |