hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

games/supertux2: Included several build-fix patches 

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Robby Workman 2012-09-08 23:38:19 -05:00
parent 8a1a0fb2e3
commit 5061507edc
4 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/supertux2/remove-curl-types_h-usage.patch Normal file
View File

@ -0,0 +1,11 @@
diff -Nur supertux-0.3.3.orig/src/addon/addon_manager.cpp supertux-0.3.3/src/addon/addon_manager.cpp
--- supertux-0.3.3.orig/src/addon/addon_manager.cpp 2010-03-01 06:40:58.000000000 -0600
+++ supertux-0.3.3/src/addon/addon_manager.cpp 2012-09-08 23:24:07.209851421 -0500
@@ -29,7 +29,6 @@
#ifdef HAVE_LIBCURL
# include <curl/curl.h>
# include <curl/easy.h>
-# include <curl/types.h>
#endif
#include "addon/addon.hpp"

13
games/supertux2/supertux2-0.3.3-gcc46.patch Normal file
View File

@ -0,0 +1,13 @@
Description: Add missing header. Fixes FTBFS with gcc 4.6.
Author: Ilya Barygin <barygin@gmail.com>
Bug-Ubuntu: https://launchpad.net/bugs/832874
--- supertux-0.3.3.orig/src/supertux/screen_manager.hpp
+++ supertux-0.3.3/src/supertux/screen_manager.hpp
@@ -18,6 +18,7 @@
#define HEADER_SUPERTUX_SUPERTUX_MAINLOOP_HPP
#include <memory>
+#include <cstring>
#include "scripting/thread_queue.hpp"

36
games/supertux2/supertux2-0.3.3-squirrel-gcc47.patch Normal file
View File

@ -0,0 +1,36 @@
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));

6
games/supertux2/supertux2.SlackBuild
View File

@ -24,7 +24,7 @@
PRGNAM=supertux2
VERSION=${VERSION:-0.3.3}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCNAM=supertux
@ -71,6 +71,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
patch -p1 < $CWD/remove-curl-types_h-usage.patch
patch -p1 < $CWD/supertux2-0.3.3-gcc46.patch
patch -p1 < $CWD/supertux2-0.3.3-squirrel-gcc47.patch
mkdir -p build
cd build
cmake \