diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2016-04-17 10:24:58 +0200 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2016-04-17 10:25:34 +0200 |
| commit | dbae5dff6178aac6872743824f765be3d2564d86 (patch) | |
| tree | a4b37998a40a58a3477f31650dcb23e6cf60b93f /dev-games/crystalspace/files | |
| parent | dev-ruby/activesupport: add ruby23 (diff) | |
| download | gentoo-dbae5dff6178aac6872743824f765be3d2564d86.tar.gz gentoo-dbae5dff6178aac6872743824f765be3d2564d86.tar.bz2 gentoo-dbae5dff6178aac6872743824f765be3d2564d86.zip | |
dev-games/crystalspace: Fix build with gcc-5
Package-Manager: portage-2.2.26
Diffstat (limited to 'dev-games/crystalspace/files')
| -rw-r--r-- | dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch new file mode 100644 index 000000000000..341b33d88850 --- /dev/null +++ b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch @@ -0,0 +1,53 @@ +--- include/csgfx/imagememory.h.old 2016-04-17 09:09:31.497152401 +0200 ++++ include/csgfx/imagememory.h 2016-04-17 09:12:13.838355158 +0200 +@@ -179,8 +179,8 @@ + /// Get a pointer to the alpha data that can be changed. + uint8* GetAlphaPtr (); + +- virtual const void* GetImageData () { return GetImagePtr (); } +- virtual int GetWidth () const { return Width; } ++ virtual const void* GetImageData (); ++ virtual int GetWidth () const; + virtual int GetHeight () const { return Height; } + virtual int GetDepth () const { return Depth; } + +--- libs/csgfx/imagememory.cpp.old 2016-04-17 09:07:19.555451540 +0200 ++++ libs/csgfx/imagememory.cpp 2016-04-17 09:13:09.339398463 +0200 +@@ -208,6 +208,23 @@ + EnsureImage(); + return (void*)databuf->GetData (); + } ++ ++const void* csImageMemory::GetImageData () ++{ ++ return GetImagePtr (); ++} ++ ++int csImageMemory::GetWidth () const ++{ ++ return Width; ++} ++ ++void csImageBase::SetName (const char* iName) ++{ ++ cs_free (fName); ++ fName = CS::StrDup (iName); ++} ++ + csRGBpixel* csImageMemory::GetPalettePtr () + { + EnsureImage(); +--- include/csgfx/imagebase.h.old 2016-04-17 09:59:09.211101864 +0200 ++++ include/csgfx/imagebase.h 2016-04-17 09:59:20.041919599 +0200 +@@ -61,10 +61,7 @@ + // Most images are 2D, so provide a sensible default + virtual int GetDepth () const { return 1; } + +- virtual void SetName (const char* iName) +- { +- cs_free (fName); fName = CS::StrDup (iName); +- } ++ virtual void SetName (const char* iName); + virtual const char* GetName () const { return fName; } + + /* Commented out: should be implemented by all descendants. |