1 |
dirtyepic 08/09/30 03:10:38 |
2 |
|
3 |
Added: kopete-3.5.10-gcc43.patch |
4 |
Log: |
5 |
Fix GCC 4.3 build error w/ USE="jingle". Patch from devsk in bug #223535. |
6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 kde-base/kopete/files/kopete-3.5.10-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kopete/files/kopete-3.5.10-gcc43.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kopete/files/kopete-3.5.10-gcc43.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: kopete-3.5.10-gcc43.patch |
15 |
=================================================================== |
16 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc |
17 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc 2006-10-01 11:26:45.000000000 -0600 |
18 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc 2008-09-29 20:52:46.000000000 -0600 |
19 |
@@ -32,6 +32,7 @@ |
20 |
#include "talk/base/byteorder.h" |
21 |
#include "talk/base/common.h" |
22 |
#include "talk/base/logging.h" |
23 |
+#include <cstring> |
24 |
|
25 |
#if defined(_MSC_VER) && _MSC_VER < 1300 |
26 |
namespace std { |
27 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc |
28 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc 2006-10-01 11:26:45.000000000 -0600 |
29 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc 2008-09-29 20:52:46.000000000 -0600 |
30 |
@@ -30,6 +30,7 @@ |
31 |
#include "talk/base/byteorder.h" |
32 |
#include <algorithm> |
33 |
#include <cassert> |
34 |
+#include <cstring> |
35 |
|
36 |
#if defined(_MSC_VER) && _MSC_VER < 1300 |
37 |
namespace std { |
38 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc |
39 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc 2006-10-01 11:26:45.000000000 -0600 |
40 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc 2008-09-29 20:52:46.000000000 -0600 |
41 |
@@ -29,7 +29,8 @@ |
42 |
#include "talk/base/logging.h" |
43 |
#include "talk/base/network.h" |
44 |
#include "talk/base/socket.h" |
45 |
-#include <string> |
46 |
+#include <cstring> |
47 |
+#include <cstdlib> |
48 |
#include <iostream> |
49 |
#include <cassert> |
50 |
#include <errno.h> |
51 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h |
52 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h 2006-10-01 11:26:45.000000000 -0600 |
53 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h 2008-09-29 20:52:46.000000000 -0600 |
54 |
@@ -32,6 +32,7 @@ |
55 |
#include "talk/base/criticalsection.h" |
56 |
#include "talk/base/socketserver.h" |
57 |
#include "talk/base/jtime.h" |
58 |
+#include <cstring> |
59 |
#include <vector> |
60 |
#include <queue> |
61 |
#include <algorithm> |
62 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc |
63 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc 2006-10-01 11:26:45.000000000 -0600 |
64 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc 2008-09-29 20:52:46.000000000 -0600 |
65 |
@@ -30,11 +30,13 @@ |
66 |
#endif |
67 |
|
68 |
#include <cassert> |
69 |
+#include <algorithm> |
70 |
|
71 |
#ifdef POSIX |
72 |
extern "C" { |
73 |
#include <errno.h> |
74 |
#include <fcntl.h> |
75 |
+#include <string.h> |
76 |
#include <sys/time.h> |
77 |
#include <unistd.h> |
78 |
} |
79 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc |
80 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc 2006-10-01 11:26:45.000000000 -0600 |
81 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc 2008-09-29 20:52:46.000000000 -0600 |
82 |
@@ -42,6 +42,7 @@ |
83 |
#endif |
84 |
|
85 |
#include <cassert> |
86 |
+#include <cstring> |
87 |
|
88 |
#include "talk/base/base64.h" |
89 |
#include "talk/base/basicdefs.h" |
90 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc |
91 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc 2006-10-01 11:26:44.000000000 -0600 |
92 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc 2008-09-29 20:52:46.000000000 -0600 |
93 |
@@ -29,6 +29,7 @@ |
94 |
#include "talk/p2p/base/stun.h" |
95 |
#include <iostream> |
96 |
#include <cassert> |
97 |
+#include <cstring> |
98 |
|
99 |
#if defined(_MSC_VER) && _MSC_VER < 1300 |
100 |
namespace std { |
101 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc |
102 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc 2006-10-01 11:26:44.000000000 -0600 |
103 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc 2008-09-29 20:52:46.000000000 -0600 |
104 |
@@ -28,6 +28,7 @@ |
105 |
#include "talk/base/bytebuffer.h" |
106 |
#include "talk/p2p/base/stunserver.h" |
107 |
#include <iostream> |
108 |
+#include <cstring> |
109 |
|
110 |
#ifdef POSIX |
111 |
extern "C" { |
112 |
diff -Naur kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h |
113 |
--- kopete-3.5.10-orig/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h 2006-10-01 11:26:45.000000000 -0600 |
114 |
+++ kopete-3.5.10/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h 2008-09-29 20:52:46.000000000 -0600 |
115 |
@@ -31,6 +31,8 @@ |
116 |
#include "talk/base/linked_ptr.h" |
117 |
#include "talk/base/scoped_ptr.h" |
118 |
|
119 |
+#include <cstring> |
120 |
+ |
121 |
namespace buzz { |
122 |
|
123 |
class XmppPasswordImpl { |