diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-04-19 16:02:29 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-04-19 16:02:29 +0000 |
| commit | 451040c2996d4d338559126a17fd7e07ff4c52dc (patch) | |
| tree | 9ff6d009c8ff8c201db76916a335f0d204d864ea /pkgs/games/globulation/header-order.patch | |
| parent | 989b65cf5b6c21510800025cceee9e7199d3a49a (diff) | |
| download | nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar.gz nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar.bz2 nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar.lz nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar.xz nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.tar.zst nixpkgs-451040c2996d4d338559126a17fd7e07ff4c52dc.zip | |
Adding globulation
svn path=/nixpkgs/trunk/; revision=26892
Diffstat (limited to 'pkgs/games/globulation/header-order.patch')
| -rw-r--r-- | pkgs/games/globulation/header-order.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/games/globulation/header-order.patch b/pkgs/games/globulation/header-order.patch new file mode 100644 index 00000000000..6c8dd922c25 --- /dev/null +++ b/pkgs/games/globulation/header-order.patch @@ -0,0 +1,23 @@ +With gcc 4.4, compilation of libgag/src/TextStream.cpp fails with the error: +'class GAGCore::StreamBackend' has no member named 'getc'. Reordering +#include's solves the problem. + +Patch from Debian. + +Index: glob2-0.9.4.1/libgag/src/TextStream.cpp +=================================================================== +--- glob2-0.9.4.1.orig/libgag/src/TextStream.cpp 2009-06-27 20:19:38.000000000 +0400 ++++ glob2-0.9.4.1/libgag/src/TextStream.cpp 2009-06-27 20:20:22.000000000 +0400 +@@ -17,11 +17,11 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +-#include <TextStream.h> + #include <assert.h> + #include <fstream> + #include <iostream> + #include <stack> ++#include <TextStream.h> + #ifdef WIN32 + #define snprintf _snprintf + #define vsnprintf _vsnprintf |