wok-stable rev 4718

pingus: fix build gcc4 and scons.
author erjo@localhost
date Tue Jan 05 13:23:23 2010 +0100 (2010-01-05)
parents 031f6e973842
children 7fd0a3f6eb9c
files pingus/receipt pingus/stuff/pingus-0.7.2_gcc4.u
line diff
     1.1 --- a/pingus/receipt	Tue Jan 05 11:56:30 2010 +0100
     1.2 +++ b/pingus/receipt	Tue Jan 05 13:23:23 2010 +0100
     1.3 @@ -24,6 +24,12 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 +	
     1.8 +	# Fix scons and gcc build bug.
     1.9 +	if [ ! -f patch.done ]; then
    1.10 +		patch -p1 -i ../stuff/pingus-0.7.2_gcc4.u && touch patch.done
    1.11 +	fi
    1.12 +		
    1.13  	scons
    1.14  
    1.15  	# the script install.sh uses cp --parents which is not implemented in busybox
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/pingus/stuff/pingus-0.7.2_gcc4.u	Tue Jan 05 13:23:23 2010 +0100
     2.3 @@ -0,0 +1,49 @@
     2.4 +--- pingus-0.7.2-ori/SConstruct	Tue Oct 30 10:23:37 2007
     2.5 ++++ pingus-0.7.2/SConstruct	Tue Jan  5 13:09:07 2010
     2.6 +@@ -333,7 +333,7 @@
     2.7 + SpaceListOption = _SpaceListOptionClass()
     2.8 + 
     2.9 + def DefineOptions(filename, args):
    2.10 +-   opts = Options(filename, args)
    2.11 ++   opts = Variables(filename, args)
    2.12 +    opts.Add('CC', 'C Compiler', 'gcc')
    2.13 +    opts.Add('CXX', 'C++ Compiler', 'g++')
    2.14 + #   opts.Add('debug', 'Build with debugging options', 0)
    2.15 +@@ -347,11 +347,11 @@
    2.16 +    opts.Add('CCFLAGS',    'C Compiler flags', [])
    2.17 +    opts.Add('LINKFLAGS',  'Linker Compiler flags', [])
    2.18 + 
    2.19 +-   opts.Add(BoolOption('with_xinput',        'Build with Xinput support', False))
    2.20 +-   opts.Add(BoolOption('with_linuxusbmouse', 'Build with Linux USB mouse support', True))
    2.21 +-   opts.Add(BoolOption('with_linuxevdev',    'Build with Linux evdev support', True))
    2.22 +-   opts.Add(BoolOption('with_wiimote',       'Build with Wiimote support', False))
    2.23 +-   opts.Add(BoolOption('ignore_errors',      'Ignore any fatal configuration errors', False))
    2.24 ++   opts.Add(BoolVariable('with_xinput',        'Build with Xinput support', False))
    2.25 ++   opts.Add(BoolVariable('with_linuxusbmouse', 'Build with Linux USB mouse support', True))
    2.26 ++   opts.Add(BoolVariable('with_linuxevdev',    'Build with Linux evdev support', True))
    2.27 ++   opts.Add(BoolVariable('with_wiimote',       'Build with Wiimote support', False))
    2.28 ++   opts.Add(BoolVariable('ignore_errors',      'Ignore any fatal configuration errors', False))
    2.29 +    opts.Add('optional_sources', 'Additional source files', [])
    2.30 +    return opts
    2.31 + 
    2.32 +--- pingus-0.7.2-ori/src/input/evdev_device.cpp	Mon Oct  1 19:24:54 2007
    2.33 ++++ pingus-0.7.2/src/input/evdev_device.cpp	Tue Jan  5 13:10:57 2010
    2.34 +@@ -24,6 +24,8 @@
    2.35 + #include <unistd.h>
    2.36 + #include <stdexcept>
    2.37 + #include <iostream>
    2.38 ++#include <cstdio>
    2.39 ++#include <cstring>
    2.40 + #include <errno.h>
    2.41 + 
    2.42 + #include "evdev_device.hpp"
    2.43 +--- pingus-0.7.2-ori/src/tinygettext/po_file_reader.cpp	Thu Oct 18 19:54:01 2007
    2.44 ++++ pingus-0.7.2/src/tinygettext/po_file_reader.cpp	Tue Jan  5 13:10:31 2010
    2.45 +@@ -24,6 +24,7 @@
    2.46 + #include <sstream>
    2.47 + #include <stdexcept>
    2.48 + #include <string.h>
    2.49 ++#include <cstdio> 
    2.50 + #include "iconv.hpp"
    2.51 + #include "po_file_reader.hpp"
    2.52 +