diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-06-30 16:03:20 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2012-06-30 16:03:20 +0000 |
commit | b66c68b61ff4224d9b2a0eeb4def075b6daf19f9 (patch) | |
tree | 8611378e20c5c60af7e2e127df2f8e906f010bf7 /media-sound/vdramgw/files | |
parent | Version bump #424237 by PetaMem R&D. (diff) | |
download | historical-b66c68b61ff4224d9b2a0eeb4def075b6daf19f9.tar.gz historical-b66c68b61ff4224d9b2a0eeb4def075b6daf19f9.tar.bz2 historical-b66c68b61ff4224d9b2a0eeb4def075b6daf19f9.zip |
gcc-4.7 compile fixed, bug 424101; eapi=4; fixed c++ includes; minor fixes in ebuild
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'media-sound/vdramgw/files')
-rw-r--r-- | media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch | 6 | ||||
-rw-r--r-- | media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff | 92 |
2 files changed, 95 insertions, 3 deletions
diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch b/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch index ff504c090e53..8c3ac7452aae 100644 --- a/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch +++ b/media-sound/vdramgw/files/vdramgw-0.0.2-gcc43.patch @@ -5,7 +5,7 @@ diff -ur amarok-0.0.2.orig/Sockets.cpp amarok-0.0.2/Sockets.cpp #include "Sockets.h" -+#include <string.h> ++#include <cstring> #include <sstream> #ifndef WIN32 @@ -16,7 +16,7 @@ diff -ur amarok-0.0.2.orig/vdramgw/Sockets.cpp amarok-0.0.2/vdramgw/Sockets.cpp #include "Sockets.h" -+#include <string.h> ++#include <cstring> #include <sstream> #ifndef WIN32 @@ -28,7 +28,7 @@ diff -ur amarok-0.0.2.orig/vdramgw/vdramgw.cpp amarok-0.0.2/vdramgw/vdramgw.cpp #endif - -+#include <string.h> ++#include <cstring> #include <unistd.h> #include <getopt.h> #include <iostream> diff --git a/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff b/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff new file mode 100644 index 000000000000..c5182cfd33d6 --- /dev/null +++ b/media-sound/vdramgw/files/vdramgw-0.0.2_gcc-4.7.diff @@ -0,0 +1,92 @@ +gcc-4.7 compile fix +https://bugs.gentoo.org/show_bug.cgi?id=424101 + +signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/30/06) +diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h +--- amarok-0.0.2.orig/Sockets.h 2012-06-30 17:40:27.000000000 +0200 ++++ amarok-0.0.2/Sockets.h 2012-06-30 17:43:21.000000000 +0200 +@@ -182,8 +182,8 @@ + { + if (this->gptr() == NULL) + { +- setg(s, s + n, s + n); +- setp(s, s + n); ++ this->setg(s, s + n, s + n); ++ this->setp(s, s + n); + inbuf_ = s; + outbuf_ = s; + bufsize_ = n; +@@ -215,9 +215,9 @@ + { + _flush(); + } +- setp(outbuf_, outbuf_ + bufsize_); ++ this->setp(outbuf_, outbuf_ + bufsize_); + if (c != traits::eof()) +- sputc(traits::to_char_type(c)); ++ this->sputc(traits::to_char_type(c)); + return 0; + } + +@@ -225,7 +225,7 @@ + { + // just flush the put area + _flush(); +- setp(outbuf_, outbuf_ + bufsize_); ++ this->setp(outbuf_, outbuf_ + bufsize_); + return 0; + } + +@@ -256,7 +256,7 @@ + return traits::eof(); + + size_t totalbytes = readn + remained_; +- setg(inbuf_, inbuf_, ++ this->setg(inbuf_, inbuf_, + inbuf_ + totalbytes / sizeof(char_type)); + + remained_ = totalbytes % sizeof(char_type); +diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h +--- amarok-0.0.2.orig/vdramgw/Sockets.h 2012-06-30 17:40:27.000000000 +0200 ++++ amarok-0.0.2/vdramgw/Sockets.h 2012-06-30 17:41:52.000000000 +0200 +@@ -182,8 +182,8 @@ + { + if (this->gptr() == NULL) + { +- setg(s, s + n, s + n); +- setp(s, s + n); ++ this->setg(s, s + n, s + n); ++ this->setp(s, s + n); + inbuf_ = s; + outbuf_ = s; + bufsize_ = n; +@@ -215,9 +215,9 @@ + { + _flush(); + } +- setp(outbuf_, outbuf_ + bufsize_); ++ this->setp(outbuf_, outbuf_ + bufsize_); + if (c != traits::eof()) +- sputc(traits::to_char_type(c)); ++ this->sputc(traits::to_char_type(c)); + return 0; + } + +@@ -225,7 +225,7 @@ + { + // just flush the put area + _flush(); +- setp(outbuf_, outbuf_ + bufsize_); ++ this->setp(outbuf_, outbuf_ + bufsize_); + return 0; + } + +@@ -256,7 +256,7 @@ + return traits::eof(); + + size_t totalbytes = readn + remained_; +- setg(inbuf_, inbuf_, ++ this->setg(inbuf_, inbuf_, + inbuf_ + totalbytes / sizeof(char_type)); + + remained_ = totalbytes % sizeof(char_type); |