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