| 1 |
hd_brummy 12/06/30 16:16:07 |
| 2 |
|
| 3 |
Modified: vdr-amarok-0.0.2-gcc4.3.patch |
| 4 |
Added: vdr-amarok-0.0.2_gcc-4.7.diff |
| 5 |
Log: |
| 6 |
fixed gcc-4.7. compile, bug 423059; eapi=4 |
| 7 |
|
| 8 |
(Portage version: 2.1.10.11/cvs/Linux i686) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: vdr-amarok-0.0.2-gcc4.3.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- vdr-amarok-0.0.2-gcc4.3.patch 17 Dec 2008 14:15:34 -0000 1.1 |
| 24 |
+++ vdr-amarok-0.0.2-gcc4.3.patch 30 Jun 2012 16:16:07 -0000 1.2 |
| 25 |
@@ -17,7 +17,7 @@ |
| 26 |
#ifndef WIN32 |
| 27 |
// this is for Linux |
| 28 |
#include <unistd.h> |
| 29 |
-+#include <string.h> |
| 30 |
++#include <cstring> |
| 31 |
#include <sys/types.h> |
| 32 |
#include <sys/socket.h> |
| 33 |
#include <netinet/in.h> |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: vdr-amarok-0.0.2_gcc-4.7.diff |
| 43 |
=================================================================== |
| 44 |
gcc-4.7 compile fix |
| 45 |
https://bugs.gentoo.org/show_bug.cgi?id=423059 |
| 46 |
|
| 47 |
signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2012/30/06) |
| 48 |
diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h |
| 49 |
--- amarok-0.0.2.orig/Sockets.h 2012-06-30 17:40:27.000000000 +0200 |
| 50 |
+++ amarok-0.0.2/Sockets.h 2012-06-30 17:43:21.000000000 +0200 |
| 51 |
@@ -182,8 +182,8 @@ |
| 52 |
{ |
| 53 |
if (this->gptr() == NULL) |
| 54 |
{ |
| 55 |
- setg(s, s + n, s + n); |
| 56 |
- setp(s, s + n); |
| 57 |
+ this->setg(s, s + n, s + n); |
| 58 |
+ this->setp(s, s + n); |
| 59 |
inbuf_ = s; |
| 60 |
outbuf_ = s; |
| 61 |
bufsize_ = n; |
| 62 |
@@ -215,9 +215,9 @@ |
| 63 |
{ |
| 64 |
_flush(); |
| 65 |
} |
| 66 |
- setp(outbuf_, outbuf_ + bufsize_); |
| 67 |
+ this->setp(outbuf_, outbuf_ + bufsize_); |
| 68 |
if (c != traits::eof()) |
| 69 |
- sputc(traits::to_char_type(c)); |
| 70 |
+ this->sputc(traits::to_char_type(c)); |
| 71 |
return 0; |
| 72 |
} |
| 73 |
|
| 74 |
@@ -225,7 +225,7 @@ |
| 75 |
{ |
| 76 |
// just flush the put area |
| 77 |
_flush(); |
| 78 |
- setp(outbuf_, outbuf_ + bufsize_); |
| 79 |
+ this->setp(outbuf_, outbuf_ + bufsize_); |
| 80 |
return 0; |
| 81 |
} |
| 82 |
|
| 83 |
@@ -256,7 +256,7 @@ |
| 84 |
return traits::eof(); |
| 85 |
|
| 86 |
size_t totalbytes = readn + remained_; |
| 87 |
- setg(inbuf_, inbuf_, |
| 88 |
+ this->setg(inbuf_, inbuf_, |
| 89 |
inbuf_ + totalbytes / sizeof(char_type)); |
| 90 |
|
| 91 |
remained_ = totalbytes % sizeof(char_type); |
| 92 |
diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h |
| 93 |
--- amarok-0.0.2.orig/vdramgw/Sockets.h 2012-06-30 17:40:27.000000000 +0200 |
| 94 |
+++ amarok-0.0.2/vdramgw/Sockets.h 2012-06-30 17:41:52.000000000 +0200 |
| 95 |
@@ -182,8 +182,8 @@ |
| 96 |
{ |
| 97 |
if (this->gptr() == NULL) |
| 98 |
{ |
| 99 |
- setg(s, s + n, s + n); |
| 100 |
- setp(s, s + n); |
| 101 |
+ this->setg(s, s + n, s + n); |
| 102 |
+ this->setp(s, s + n); |
| 103 |
inbuf_ = s; |
| 104 |
outbuf_ = s; |
| 105 |
bufsize_ = n; |
| 106 |
@@ -215,9 +215,9 @@ |
| 107 |
{ |
| 108 |
_flush(); |
| 109 |
} |
| 110 |
- setp(outbuf_, outbuf_ + bufsize_); |
| 111 |
+ this->setp(outbuf_, outbuf_ + bufsize_); |
| 112 |
if (c != traits::eof()) |
| 113 |
- sputc(traits::to_char_type(c)); |
| 114 |
+ this->sputc(traits::to_char_type(c)); |
| 115 |
return 0; |
| 116 |
} |
| 117 |
|
| 118 |
@@ -225,7 +225,7 @@ |
| 119 |
{ |
| 120 |
// just flush the put area |
| 121 |
_flush(); |
| 122 |
- setp(outbuf_, outbuf_ + bufsize_); |
| 123 |
+ this->setp(outbuf_, outbuf_ + bufsize_); |
| 124 |
return 0; |
| 125 |
} |
| 126 |
|
| 127 |
@@ -256,7 +256,7 @@ |
| 128 |
return traits::eof(); |
| 129 |
|
| 130 |
size_t totalbytes = readn + remained_; |
| 131 |
- setg(inbuf_, inbuf_, |
| 132 |
+ this->setg(inbuf_, inbuf_, |
| 133 |
inbuf_ + totalbytes / sizeof(char_type)); |
| 134 |
|
| 135 |
remained_ = totalbytes % sizeof(char_type); |
Archives