Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/synergy/files: synergy-1.3.1+gcc-4.3.patch
Date: Mon, 21 Apr 2008 13:39:19
Message-Id: E1JnwEm-00074X-Lz@stork.gentoo.org
1 flameeyes 08/04/21 13:39:16
2
3 Added: synergy-1.3.1+gcc-4.3.patch
4 Log:
5 Add patch to fix building with GCC 4.3.
6 (Portage version: 2.1.5_rc5)
7
8 Revision Changes Path
9 1.1 x11-misc/synergy/files/synergy-1.3.1+gcc-4.3.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/synergy/files/synergy-1.3.1+gcc-4.3.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/synergy/files/synergy-1.3.1+gcc-4.3.patch?rev=1.1&content-type=text/plain
13
14 Index: synergy-1.3.1+gcc-4.3.patch
15 ===================================================================
16 Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
17 ===================================================================
18 --- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp
19 +++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
20 @@ -20,6 +20,8 @@
21 #include <fcntl.h>
22 #include <errno.h>
23
24 +#include <cstdlib>
25 +
26 //
27 // CArchDaemonUnix
28 //
29 Index: synergy-1.3.1/lib/arch/CMultibyte.cpp
30 ===================================================================
31 --- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp
32 +++ synergy-1.3.1/lib/arch/CMultibyte.cpp
33 @@ -19,14 +19,12 @@
34 #include "CArch.h"
35 #include <limits.h>
36 #include <string.h>
37 +#include <cstdlib>
38 #if HAVE_LOCALE_H
39 # include <locale.h>
40 #endif
41 #if HAVE_WCHAR_H || defined(_MSC_VER)
42 # include <wchar.h>
43 -#elif __APPLE__
44 - // wtf? Darwin puts mbtowc() et al. in stdlib
45 -# include <stdlib.h>
46 #else
47 // platform apparently has no wchar_t support. provide dummy
48 // implementations. hopefully at least the C++ compiler has
49 Index: synergy-1.3.1/lib/base/CStringUtil.cpp
50 ===================================================================
51 --- synergy-1.3.1.orig/lib/base/CStringUtil.cpp
52 +++ synergy-1.3.1/lib/base/CStringUtil.cpp
53 @@ -19,6 +19,7 @@
54 #include <cctype>
55 #include <cstdio>
56 #include <cstdlib>
57 +#include <cstring>
58 #include <algorithm>
59
60 //
61 Index: synergy-1.3.1/lib/client/CClient.cpp
62 ===================================================================
63 --- synergy-1.3.1.orig/lib/client/CClient.cpp
64 +++ synergy-1.3.1/lib/client/CClient.cpp
65 @@ -27,6 +27,9 @@
66 #include "IEventQueue.h"
67 #include "TMethodEventJob.h"
68
69 +#include <cstring>
70 +#include <cstdlib>
71 +
72 //
73 // CClient
74 //
75 Index: synergy-1.3.1/lib/client/CServerProxy.cpp
76 ===================================================================
77 --- synergy-1.3.1.orig/lib/client/CServerProxy.cpp
78 +++ synergy-1.3.1/lib/client/CServerProxy.cpp
79 @@ -24,6 +24,7 @@
80 #include "TMethodEventJob.h"
81 #include "XBase.h"
82 #include <memory>
83 +#include <cstring>
84
85 //
86 // CServerProxy
87 Index: synergy-1.3.1/lib/net/CTCPSocket.cpp
88 ===================================================================
89 --- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp
90 +++ synergy-1.3.1/lib/net/CTCPSocket.cpp
91 @@ -24,6 +24,7 @@
92 #include "CArch.h"
93 #include "XArch.h"
94 #include <string.h>
95 +#include <cstdlib>
96
97 //
98 // CTCPSocket
99 Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
100 ===================================================================
101 --- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp
102 +++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
103 @@ -27,6 +27,7 @@
104 #include "IEventQueue.h"
105 #include "TMethodEventJob.h"
106 #include <cstring>
107 +#include <cstdlib>
108 #if X_DISPLAY_MISSING
109 # error X11 is required to build synergy
110 #else
111 Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp
112 ===================================================================
113 --- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp
114 +++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp
115 @@ -18,6 +18,8 @@
116 #include "IEventQueue.h"
117 #include "TMethodEventJob.h"
118
119 +#include <cstring>
120 +
121 //
122 // CClientProxy1_3
123 //
124 Index: synergy-1.3.1/lib/server/CServer.cpp
125 ===================================================================
126 --- synergy-1.3.1.orig/lib/server/CServer.cpp
127 +++ synergy-1.3.1/lib/server/CServer.cpp
128 @@ -28,7 +28,8 @@
129 #include "CLog.h"
130 #include "TMethodEventJob.h"
131 #include "CArch.h"
132 -#include <string.h>
133 +#include <cstring>
134 +#include <cstdlib>
135
136 //
137 // CServer
138 Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
139 ===================================================================
140 --- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp
141 +++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
142 @@ -16,6 +16,7 @@
143 #include "IEventQueue.h"
144 #include "CLock.h"
145 #include "TMethodEventJob.h"
146 +#include <cstring>
147
148 //
149 // CPacketStreamFilter
150 Index: synergy-1.3.1/lib/synergy/IKeyState.cpp
151 ===================================================================
152 --- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp
153 +++ synergy-1.3.1/lib/synergy/IKeyState.cpp
154 @@ -13,7 +13,8 @@
155 */
156
157 #include "IKeyState.h"
158 -#include <string.h>
159 +#include <cstring>
160 +#include <cstdlib>
161
162 //
163 // IKeyState
164 Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
165 ===================================================================
166 --- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp
167 +++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
168 @@ -14,6 +14,8 @@
169
170 #include "IPrimaryScreen.h"
171
172 +#include <cstdlib>
173 +
174 //
175 // IPrimaryScreen
176 //
177
178
179
180 --
181 gentoo-commits@l.g.o mailing list