[Gsrc-commit] /srv/bzr/gsrc/trunk r975: fix ballandpaddle build

[Brandon Invergo]

------------------------------------------------------------
revno: 975
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-28 01:02:12 +0200
message:
  fix ballandpaddle build
added:
  gnu/ballandpaddle/config.mk
  gnu/ballandpaddle/files/
  gnu/ballandpaddle/files/fix-build.diff
modified:
  gnu/ballandpaddle/Makefile
  gnu/ballandpaddle/sha256sums

=== modified file 'gnu/ballandpaddle/Makefile'
--- a/gnu/ballandpaddle/Makefile        2010-08-30 14:48:19 +0000
+++ b/gnu/ballandpaddle/Makefile        2012-10-27 23:02:12 +0000
@@ -1,16 +1,22 @@
 GARNAME = ballandpaddle
 GARVERSION = 0.8.1
+HOME_URL = http://www.gnu.org/software/ballandpaddle/
+DESCRIPTION = GNU Ball and Paddle, an old-fashioned ball and paddle game
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = ballandpaddle/
-
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = SDL SDL_image SDL_mixer SDL_ttf guile gettext
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/ballandpaddle/
-DESCRIPTION = GNU Ball and Paddle, an old-fashioned ball and paddle game
+PATCHFILES = fix-build.diff
+
+BUILDDEPS = guile gettext
+LIBDEPS = libsdl libsdl_image libsdl_mixer libsdl_ttf
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-sdl-prefix=$(prefix)

=== added file 'gnu/ballandpaddle/config.mk'
--- a/gnu/ballandpaddle/config.mk       1970-01-01 00:00:00 +0000
+++ b/gnu/ballandpaddle/config.mk       2012-10-27 23:02:12 +0000
@@ -0,0 +1,4 @@
+## Configuration options for ballandpaddle ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/ballandpaddle/files'
=== added file 'gnu/ballandpaddle/files/fix-build.diff'
--- a/gnu/ballandpaddle/files/fix-build.diff    1970-01-01 00:00:00 +0000
+++ b/gnu/ballandpaddle/files/fix-build.diff    2012-10-27 23:02:12 +0000
@@ -0,0 +1,11 @@
+diff -x config.log -x config.status -ru 
tmp/ballandpaddle-0.8.1/src/settingsmanager.cpp 
work/ballandpaddle-0.8.1/src/settingsmanager.cpp
+--- work/ballandpaddle-0.8.1/src/settingsmanager.cpp   2009-07-08 
00:13:16.000000000 +0000
++++ work/ballandpaddle-0.8.1/src/settingsmanager.cpp   2012-10-27 
22:56:02.708067457 +0000
+@@ -17,6 +17,7 @@
+  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  **/
+ 
++#include <cstdlib>
+ #include "settingsmanager.h"
+ 
+ SettingsManager::SettingsManager ()

=== modified file 'gnu/ballandpaddle/sha256sums'
--- a/gnu/ballandpaddle/sha256sums      2010-06-11 09:29:17 +0000
+++ b/gnu/ballandpaddle/sha256sums      2012-10-27 23:02:12 +0000
@@ -1,2 +1,3 @@
 de82d17ab032e9a997eb0537820053d6a84661b283df1be7724756d054f3f77d  
download/ballandpaddle-0.8.1.tar.gz
+6609e26b02f1ed8d861922f28ff2e0de537881d67db9ccc1407a3f62ec8d5957  
download/fix-build.diff
 9833e6f8d5c3de78e8d7b6e569ac4053b4cae5aa62707065ccaf79cd8febd288  
download/ballandpaddle-0.8.1.tar.gz.sig