| 1 |
tupone 12/10/30 15:07:24 |
| 2 |
|
| 3 |
Added: asc-2.5.0.0-gcc47.patch |
| 4 |
Log: |
| 5 |
Fix build with gcc-4.7 Bug #423377 |
| 6 |
|
| 7 |
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 games-strategy/asc/files/asc-2.5.0.0-gcc47.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: asc-2.5.0.0-gcc47.patch |
| 16 |
=================================================================== |
| 17 |
--- source/graphics/drawing.h.old 2012-10-30 10:33:47.617844756 +0100 |
| 18 |
+++ source/graphics/drawing.h 2012-10-30 10:46:23.444784874 +0100 |
| 19 |
@@ -169,7 +169,7 @@ |
| 20 |
PixelType* pix = (PixelType*)( surf.pixels() ); |
| 21 |
pix += pos.y * surf.pitch()/pixelsize + pos.x; |
| 22 |
|
| 23 |
- assign ( src, pix ); |
| 24 |
+ this->assign ( src, pix ); |
| 25 |
}; |
| 26 |
}; |
| 27 |
|
| 28 |
--- source/graphics/blitter.h.old 2012-10-30 12:21:14.767021349 +0100 |
| 29 |
+++ source/graphics/blitter.h 2012-10-30 12:22:18.492472029 +0100 |
| 30 |
@@ -928,6 +928,7 @@ |
| 31 |
; |
| 32 |
}; |
| 33 |
|
| 34 |
+#include "drawing.h" |
| 35 |
|
| 36 |
|
| 37 |
extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; |
| 38 |
--- source/itemrepository.cpp.old 2012-10-30 10:32:06.771697823 +0100 |
| 39 |
+++ source/itemrepository.cpp 2012-10-30 12:23:42.973448933 +0100 |
| 40 |
@@ -88,7 +88,7 @@ |
| 41 |
t->filename = fileName; |
| 42 |
t->location = location; |
| 43 |
t->archive = prc.getArchive(); |
| 44 |
- add ( t ); |
| 45 |
+ this->add ( t ); |
| 46 |
} |
| 47 |
|
| 48 |
|
| 49 |
@@ -110,7 +110,7 @@ |
| 50 |
t->archive = stream.readString(); |
| 51 |
dataLoaderTicker(); |
| 52 |
|
| 53 |
- add ( t ); |
| 54 |
+ this->add ( t ); |
| 55 |
// add ( T::newFromStream(stream )); |
| 56 |
} |
| 57 |
} |
Archives