diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2006-01-14 04:53:16 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2006-01-14 04:53:16 +0000 |
| commit | 0ea9b340c8a05871cb79ce5eb46b279a9623e93e (patch) | |
| tree | 7627d6d43b1873ca5260e9f80a47638d22599040 /dev-games/clanlib/files | |
| parent | Add patch by Stefan Vunckx <stefan.vunckx AT skynet DOT be> to fix compilatio... (diff) | |
| download | historical-0ea9b340c8a05871cb79ce5eb46b279a9623e93e.tar.gz historical-0ea9b340c8a05871cb79ce5eb46b279a9623e93e.tar.bz2 historical-0ea9b340c8a05871cb79ce5eb46b279a9623e93e.zip | |
Add patch by Kristiaan Lenaerts <kristiaan.lenaerts AT gmail DOT com> to fix compilation with gcc-4.1; bug #115847
Package-Manager: paludis-0.1.0 svn 68:104M/
Diffstat (limited to 'dev-games/clanlib/files')
| -rw-r--r-- | dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch | 56 | ||||
| -rw-r--r-- | dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch | 37 |
2 files changed, 93 insertions, 0 deletions
diff --git a/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch b/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch new file mode 100644 index 000000000000..b9acb24f41fb --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.6.5-gcc41.patch @@ -0,0 +1,56 @@ +--- Sources/GUI/messagebox_generic.h.old 2005-12-05 10:53:26.000000000 +0100 ++++ Sources/GUI/messagebox_generic.h 2005-12-05 10:53:56.000000000 +0100 +@@ -26,7 +26,7 @@ + const std::string &button2, + const std::string &button3); + +- CL_MessageBox_Generic::~CL_MessageBox_Generic(); ++ ~CL_MessageBox_Generic(); + + void set_text(const std::string &text); + +--- Sources/SmallJPEG/jpgd/jpegdecoder.h.old 2005-12-05 10:58:53.000000000 +0100 ++++ Sources/SmallJPEG/jpgd/jpegdecoder.h 2005-12-05 11:00:50.000000000 +0100 +@@ -493,26 +493,26 @@ + + void find_eoi(void); + //------------------ +- /*inline*/ uint jpeg_decoder::rol(uint i, uchar j); +- /*inline*/ uint jpeg_decoder::get_char(void); +- /*inline*/ uint jpeg_decoder::get_char(bool *Ppadding_flag); +- /*inline*/ void jpeg_decoder::stuff_char(uchar q); +- /*inline*/ uchar jpeg_decoder::get_octet(void); +- /*inline*/ uint jpeg_decoder::get_bits_1(int num_bits); +- /*inline*/ uint jpeg_decoder::get_bits_2(int numbits); +- /*inline*/ int jpeg_decoder::huff_decode(Phuff_tables_t Ph); ++ /*inline*/ uint rol(uint i, uchar j); ++ /*inline*/ uint get_char(void); ++ /*inline*/ uint get_char(bool *Ppadding_flag); ++ /*inline*/ void stuff_char(uchar q); ++ /*inline*/ uchar get_octet(void); ++ /*inline*/ uint get_bits_1(int num_bits); ++ /*inline*/ uint get_bits_2(int numbits); ++ /*inline*/ int huff_decode(Phuff_tables_t Ph); + #ifdef SUPPORT_X86ASM +- /*inline*/ uint jpeg_decoder::huff_extend(uint i, int c); ++ /*inline*/ uint huff_extend(uint i, int c); + #endif +- /*inline*/ uchar jpeg_decoder::clamp(int i); ++ /*inline*/ uchar clamp(int i); + + #ifdef SUPPORT_MMX +- /*inline*/ uint jpeg_decoder::get_high_byte_mmx(void); +- /*inline*/ uint jpeg_decoder::get_high_word_mmx(void); +- /*inline*/ void jpeg_decoder::get_bits_2_mmx_init(void); +- /*inline*/ void jpeg_decoder::get_bits_2_mmx_deinit(void); +- /*inline*/ uint jpeg_decoder::get_bits_2_mmx(int numbits); +- /*inline*/ int jpeg_decoder::huff_decode_mmx(Phuff_tables_t Ph); ++ /*inline*/ uint get_high_byte_mmx(void); ++ /*inline*/ uint get_high_word_mmx(void); ++ /*inline*/ void get_bits_2_mmx_init(void); ++ /*inline*/ void get_bits_2_mmx_deinit(void); ++ /*inline*/ uint get_bits_2_mmx(int numbits); ++ /*inline*/ int huff_decode_mmx(Phuff_tables_t Ph); + #endif + //------------------ + int image_x_size; diff --git a/dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch b/dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch new file mode 100644 index 000000000000..7dc4ca303f74 --- /dev/null +++ b/dev-games/clanlib/files/clanlib-0.7.8-gcc41.patch @@ -0,0 +1,37 @@ +diff -ur ClanLib-0.7.8-orig/Sources/API/Display/Collision/collision_outline.h ClanLib-0.7.8/Sources/API/Display/Collision/collision_outline.h +--- ClanLib-0.7.8-orig/Sources/API/Display/Collision/collision_outline.h 2005-12-18 03:11:10.000000000 -0500 ++++ ClanLib-0.7.8/Sources/API/Display/Collision/collision_outline.h 2005-12-18 03:12:20.000000000 -0500 +@@ -104,7 +104,7 @@ + const std::vector<CL_Pointf> &get_collision_points() const; + + //: Return the normal vectors of the other outline, at the points of collision. +- const std::vector<CL_Pointf> &CL_CollisionOutline::get_collision_normals() const; ++ const std::vector<CL_Pointf> &get_collision_normals() const; + + //! Operations: + public: +diff -ur ClanLib-0.7.8-orig/Sources/GUI/inputdialog_generic.h ClanLib-0.7.8/Sources/GUI/inputdialog_generic.h +--- ClanLib-0.7.8-orig/Sources/GUI/inputdialog_generic.h 2005-12-18 03:11:13.000000000 -0500 ++++ ClanLib-0.7.8/Sources/GUI/inputdialog_generic.h 2005-12-18 03:17:00.000000000 -0500 +@@ -37,7 +37,7 @@ + const std::string &button2, + const std::string &button3); + +- CL_InputDialog_Generic::~CL_InputDialog_Generic(); ++ ~CL_InputDialog_Generic(); + + CL_InputDialog *inputdialog; + +diff -ur ClanLib-0.7.8-orig/Sources/GUI/messagebox_generic.h ClanLib-0.7.8/Sources/GUI/messagebox_generic.h +--- ClanLib-0.7.8-orig/Sources/GUI/messagebox_generic.h 2005-12-18 03:11:13.000000000 -0500 ++++ ClanLib-0.7.8/Sources/GUI/messagebox_generic.h 2005-12-18 03:20:26.000000000 -0500 +@@ -31,7 +31,7 @@ + const std::string &button2, + const std::string &button3); + +- CL_MessageBox_Generic::~CL_MessageBox_Generic(); ++ ~CL_MessageBox_Generic(); + + std::string text; + + |