Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/wvstreams/files: wvstreams-4.4.1-wireless-user.patch wvstreams-4.4.1-type-punned.patch wvstreams-4.4.1-as-needed.patch wvstreams-4.4.1-gnulib.patch wvstreams-4.4.1-valgrind.patch wvstreams-4.4.1-linux-serial.patch wvstreams-4.4.1-wvconfemu.patch wvstreams-4.4.1-MOC-fix.patch wvstreams-4.4.1-uniconfd-ini.patch wvstreams-4.4.1-external-xplc.patch wvstreams-4.4.1-sigaction.patch wvstreams-4.4-valgrind.patch wvstreams-4.4.1-gcc43.patch
Date: Sat, 21 Jun 2008 01:35:04
Message-Id: E1K9s0I-0000Xl-Ch@stork.gentoo.org
1 mrness 08/06/21 01:34:58
2
3 Added: wvstreams-4.4.1-wireless-user.patch
4 wvstreams-4.4.1-type-punned.patch
5 wvstreams-4.4.1-as-needed.patch
6 wvstreams-4.4.1-gnulib.patch
7 wvstreams-4.4.1-valgrind.patch
8 wvstreams-4.4.1-linux-serial.patch
9 wvstreams-4.4.1-wvconfemu.patch
10 wvstreams-4.4.1-MOC-fix.patch
11 wvstreams-4.4.1-uniconfd-ini.patch
12 wvstreams-4.4.1-external-xplc.patch
13 wvstreams-4.4.1-sigaction.patch
14 wvstreams-4.4-valgrind.patch
15 wvstreams-4.4.1-gcc43.patch
16 Log:
17 Fix broken compilation when valgrind is installed (#210867).
18 Version bump (#211327).
19 (Portage version: 2.1.4.4)
20
21 Revision Changes Path
22 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch
23
24 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch?rev=1.1&view=markup
25 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch?rev=1.1&content-type=text/plain
26
27 Index: wvstreams-4.4.1-wireless-user.patch
28 ===================================================================
29 diff -Nru wvstreams-4.4.1.orig/linuxstreams/wvinterface.cc wvstreams-4.4.1/linuxstreams/wvinterface.cc
30 --- wvstreams-4.4.1.orig/linuxstreams/wvinterface.cc 2007-07-20 00:22:51.000000000 +0300
31 +++ wvstreams-4.4.1/linuxstreams/wvinterface.cc 2008-01-20 12:51:20.000000000 +0200
32 @@ -21,6 +21,7 @@
33 #include <errno.h>
34 #include <linux/sockios.h>
35
36 +#include <sys/sysctl.h> /* Needed for __user definition */
37 #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
38 #include <linux/wireless.h>
39
40
41
42
43 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch?rev=1.1&content-type=text/plain
47
48 Index: wvstreams-4.4.1-type-punned.patch
49 ===================================================================
50 diff -Nru wvstreams-4.4.1.orig/urlget/wvhttppool.cc wvstreams-4.4.1/urlget/wvhttppool.cc
51 --- wvstreams-4.4.1.orig/urlget/wvhttppool.cc 2007-07-20 00:22:36.000000000 +0300
52 +++ wvstreams-4.4.1/urlget/wvhttppool.cc 2008-01-20 13:06:30.000000000 +0200
53 @@ -43,7 +43,12 @@
54 {
55 WvBufUrlStream *x = new WvBufUrlStream;
56 outstream = x;
57 - x->death_notify = (WvStream **)&outstream;
58 + union {
59 + WvBufUrlStream** ppbufurlstream;
60 + WvStream** ppstream;
61 + } s;
62 + s.ppbufurlstream = &outstream;
63 + x->death_notify = s.ppstream;
64 x->url = url;
65
66 putstream = content_source;
67
68
69
70 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch
71
72 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch?rev=1.1&content-type=text/plain
74
75 Index: wvstreams-4.4.1-as-needed.patch
76 ===================================================================
77 diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
78 --- wvstreams-4.4.1.orig/configure.ac 2007-08-30 05:47:54.000000000 +0300
79 +++ wvstreams-4.4.1/configure.ac 2008-01-20 12:55:11.000000000 +0200
80 @@ -460,16 +460,19 @@
81 wv_cv_with_qt=no
82 CPPFLAGS_save="$CPPFLAGS"
83 LDFLAGS_save="$LDFLAGS"
84 + LIBS_save="$LIBS"
85 for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
86 eval wv_qtdir="$wv_qtdir"
87 CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
88 - LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt"
89 + LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
90 + LIBS="$LIBS_save -lqt-mt"
91 AC_TRY_LINK([#include <qstring.h>],
92 [QString x("hello"); return 0; ],
93 [wv_cv_with_qt=$wv_qtdir; break])
94 done
95 CPPFLAGS="$CPPFLAGS_save"
96 LDFLAGS="$LDFLAGS_save"
97 + LIBS="$LIBS_save"
98 ])
99 with_qt=$wv_cv_with_qt
100 if test "$with_qt" != no; then
101 diff -Nru wvstreams-4.4.1.orig/wvrules.mk wvstreams-4.4.1/wvrules.mk
102 --- wvstreams-4.4.1.orig/wvrules.mk 2007-08-17 08:15:31.000000000 +0300
103 +++ wvstreams-4.4.1/wvrules.mk 2008-01-20 12:55:11.000000000 +0200
104 @@ -226,7 +226,7 @@
105
106 wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))
107 define wvlink_so
108 - $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
109 + $(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
110 $(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))
111 endef
112
113 diff -Nru wvstreams-4.4.1.orig/wvrules-posix.mk wvstreams-4.4.1/wvrules-posix.mk
114 --- wvstreams-4.4.1.orig/wvrules-posix.mk 2007-08-17 08:15:31.000000000 +0300
115 +++ wvstreams-4.4.1/wvrules-posix.mk 2008-01-20 12:58:00.000000000 +0200
116 @@ -16,7 +16,7 @@
117 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
118 CFLAGS += $(COPTS) $(C_AND_CXX_FLAGS)
119 CXXFLAGS += $(CXXOPTS) $(C_AND_CXX_FLAGS)
120 -LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB)
121 +LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB) -Wl,-rpath-link,$(WVSTREAMS_LIB)
122
123 # Default compiler we use for linking
124 WVLINK_CC = gcc
125
126
127
128 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch
129
130 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch?rev=1.1&view=markup
131 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch?rev=1.1&content-type=text/plain
132
133 Index: wvstreams-4.4.1-gnulib.patch
134 ===================================================================
135 diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
136 --- wvstreams-4.4.1.orig/configure.ac 2008-01-20 14:56:26.000000000 +0200
137 +++ wvstreams-4.4.1/configure.ac 2008-01-20 14:43:41.000000000 +0200
138 @@ -316,6 +316,7 @@
139 # Check for advanced Linux-style modem support
140 AC_CHECK_HEADERS([linux/serial.h])
141 AC_CHECK_FUNCS([cfmakeraw])
142 +AC_CHECK_FUNCS([strndup])
143
144 # Detect hard-linking based on LN_S's behaviour
145 AC_MSG_CHECKING([whether ln works...])
146
147
148
149 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch
150
151 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch?rev=1.1&view=markup
152 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch?rev=1.1&content-type=text/plain
153
154 Index: wvstreams-4.4.1-valgrind.patch
155 ===================================================================
156 diff -ruN wvstreams-4.4.1/utils/wvtask.cc wvstreams-4.4.1.patched/utils/wvtask.cc
157 --- wvstreams-4.4.1/utils/wvtask.cc 2007-07-19 23:22:55.000000000 +0200
158 +++ wvstreams-4.4.1.patched/utils/wvtask.cc 2008-04-02 20:20:54.000000000 +0200
159 @@ -37,12 +37,12 @@
160 #include <unistd.h>
161 #include <sys/resource.h>
162
163 -#ifdef HAVE_VALGRIND_MEMCHECK_H
164 +//#ifdef HAVE_VALGRIND_MEMCHECK_H
165 #include <valgrind/memcheck.h>
166 -#else
167 -#define VALGRIND_MAKE_READABLE(x, y)
168 -#define RUNNING_ON_VALGRIND 0
169 -#endif
170 +//#else
171 +#define VALGRIND_MAKE_READABLE(x, y)
172 +//#define RUNNING_ON_VALGRIND 0
173 +//#endif
174
175 #define TASK_DEBUG 0
176 #if TASK_DEBUG
177
178
179
180 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch
181
182 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch?rev=1.1&view=markup
183 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch?rev=1.1&content-type=text/plain
184
185 Index: wvstreams-4.4.1-linux-serial.patch
186 ===================================================================
187 diff -Nru wvstreams-4.4.1.orig/streams/wvmodem.cc wvstreams-4.4.1/streams/wvmodem.cc
188 --- wvstreams-4.4.1.orig/streams/wvmodem.cc 2007-07-20 00:22:57.000000000 +0300
189 +++ wvstreams-4.4.1/streams/wvmodem.cc 2008-01-20 12:48:07.000000000 +0200
190 @@ -194,22 +194,22 @@
191 drain();
192
193 #if HAVE_LINUX_SERIAL_H
194 - struct serial_struct old_sinfo, sinfo;
195 - sinfo.reserved_char[0] = 0;
196 - if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
197 - log("Cannot get information for serial port.");
198 - else
199 - {
200 - sinfo = old_sinfo;
201 - // Why there are two closing wait timeouts, is beyond me
202 - // but there are... apparently the second one is deprecated
203 - // but why take a chance...
204 - sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
205 - sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
206 -
207 - if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
208 - log("Cannot set information for serial port.");
209 - }
210 + if (getuid() == 0)
211 + {
212 + struct serial_struct sinfo;
213 + if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
214 + {
215 + // Why there are two closing wait timeouts, is beyond me
216 + // but there are... apparently the second one is deprecated
217 + // but why take a chance...
218 + sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
219 + sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
220 +
221 + //Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...)
222 + //see http://bugs.gentoo.org/show_bug.cgi?id=85754
223 + ioctl(getrfd(), TIOCSSERIAL, &sinfo);
224 + }
225 + }
226 #endif
227
228 // set up the terminal characteristics.
229
230
231
232 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch
233
234 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch?rev=1.1&view=markup
235 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch?rev=1.1&content-type=text/plain
236
237 Index: wvstreams-4.4.1-wvconfemu.patch
238 ===================================================================
239 diff -Nru wvstreams-4.4.1.orig/vars.mk wvstreams-4.4.1/vars.mk
240 --- wvstreams-4.4.1.orig/vars.mk 2007-08-17 08:15:31.000000000 +0300
241 +++ wvstreams-4.4.1/vars.mk 2008-01-20 13:09:46.000000000 +0200
242 @@ -156,7 +156,8 @@
243 streams/wvfile.o \
244 streams/wvstreamclone.o \
245 streams/wvconstream.o \
246 - utils/wvcrashbase.o
247 + utils/wvcrashbase.o \
248 + uniconf/wvconfemu.o
249
250 TESTOBJS = utils/wvtest.o
251
252
253
254
255 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch
256
257 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch?rev=1.1&view=markup
258 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch?rev=1.1&content-type=text/plain
259
260 Index: wvstreams-4.4.1-MOC-fix.patch
261 ===================================================================
262 diff -Nru wvstreams-4.4.1.orig/wvrules.mk wvstreams-4.4.1/wvrules.mk
263 --- wvstreams-4.4.1.orig/wvrules.mk 2008-01-20 13:00:48.000000000 +0200
264 +++ wvstreams-4.4.1/wvrules.mk 2008-01-20 13:25:51.000000000 +0200
265 @@ -248,7 +248,7 @@
266 %.E: %.cc; $(call wvcxx,$@,$<,$*,,-E)
267 %.E: %.cpp; $(call wvcxx,$@,$<,$*,,-E)
268
269 -%.moc: %.h; moc -o $@ $<
270 +%.moc: %.h; $(MOC) -o $@ $<
271
272 %: %.o; $(call wvlink,$@,$^)
273 %.t: %.t.o; $(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
274
275
276
277 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch
278
279 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch?rev=1.1&view=markup
280 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch?rev=1.1&content-type=text/plain
281
282 Index: wvstreams-4.4.1-uniconfd-ini.patch
283 ===================================================================
284 diff -Nru wvstreams-4.4.1.orig/Makefile wvstreams-4.4.1/Makefile
285 --- wvstreams-4.4.1.orig/Makefile 2007-08-30 05:48:09.000000000 +0300
286 +++ wvstreams-4.4.1/Makefile 2008-01-20 12:53:19.000000000 +0200
287 @@ -189,8 +189,8 @@
288 $(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/
289 $(INSTALL) -d $(DESTDIR)$(sbindir)
290 $(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/
291 - $(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf
292 - touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini
293 + $(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf
294 + $(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf
295 $(INSTALL) -d $(DESTDIR)$(mandir)/man8
296 $(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8
297 $(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8
298
299
300
301 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch
302
303 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch?rev=1.1&view=markup
304 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch?rev=1.1&content-type=text/plain
305
306 Index: wvstreams-4.4.1-external-xplc.patch
307 ===================================================================
308 diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
309 --- wvstreams-4.4.1.orig/configure.ac 2008-01-20 14:04:54.000000000 +0200
310 +++ wvstreams-4.4.1/configure.ac 2008-01-20 14:06:45.000000000 +0200
311 @@ -488,10 +488,9 @@
312
313 # xplc
314 if test "$with_xplc" != "no"; then
315 - if test "$with_xplc" = ""; then
316 - if pkg-config --modversion xplc-${xplc_version}; then
317 - WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
318 - WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
319 + if pkg-config --atleast-version=${xplc_version} xplc; then
320 + WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc`])
321 + WV_APPEND(LDFLAGS, [`pkg-config --libs xplc`])
322 AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
323 LIBS_save="$LIBS"
324 AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
325 @@ -501,24 +500,6 @@
326 else
327 with_xplc='no'
328 fi
329 - else
330 - WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
331 - WV_APPEND(LDFLAGS, [-L$with_xplc])
332 - AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
333 - LIBS_save="$LIBS"
334 - AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
335 - LIBS="$LIBS_save"
336 - xplc_pc="xplc-${xplc_version}"
337 - fi
338 - # What if we can't find it?
339 - if test "$with_xplc" = "no" && test -d xplc; then
340 - WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
341 - WV_APPEND(LDFLAGS, [-L\$(WVSTREAMS)/xplc])
342 - AC_CONFIG_SUBDIRS(xplc)
343 - build_xplc=yes
344 - with_xplc='$(WVSTREAMS)/xplc'
345 - xplc_pc='wvxplc'
346 - fi
347 fi
348
349 # zlib
350
351
352
353 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch
354
355 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch?rev=1.1&view=markup
356 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch?rev=1.1&content-type=text/plain
357
358 Index: wvstreams-4.4.1-sigaction.patch
359 ===================================================================
360 diff -Nru wvstreams-4.4.1.orig/utils/wvcrash.cc wvstreams-4.4.1/utils/wvcrash.cc
361 --- wvstreams-4.4.1.orig/utils/wvcrash.cc 2007-08-17 08:15:30.000000000 +0300
362 +++ wvstreams-4.4.1/utils/wvcrash.cc 2008-01-20 13:07:57.000000000 +0200
363 @@ -388,7 +388,6 @@
364 act.sa_handler = wvcrash;
365 sigfillset(&act.sa_mask);
366 act.sa_flags = SA_ONSTACK | SA_RESTART;
367 - act.sa_restorer = NULL;
368
369 if (sigaction(sig, &act, NULL))
370 fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
371
372
373
374 1.1 net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch
375
376 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch?rev=1.1&view=markup
377 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch?rev=1.1&content-type=text/plain
378
379 Index: wvstreams-4.4-valgrind.patch
380 ===================================================================
381 diff -ruN wvstreams-4.4/utils/wvtask.cc wvstreams-4.4.patched/utils/wvtask.cc
382 --- wvstreams-4.4/utils/wvtask.cc 2007-07-19 23:22:55.000000000 +0200
383 +++ wvstreams-4.4.patched/utils/wvtask.cc 2008-04-02 20:20:54.000000000 +0200
384 @@ -37,12 +37,12 @@
385 #include <unistd.h>
386 #include <sys/resource.h>
387
388 -#ifdef HAVE_VALGRIND_MEMCHECK_H
389 +//#ifdef HAVE_VALGRIND_MEMCHECK_H
390 #include <valgrind/memcheck.h>
391 -#else
392 -#define VALGRIND_MAKE_READABLE(x, y)
393 -#define RUNNING_ON_VALGRIND 0
394 -#endif
395 +//#else
396 +#define VALGRIND_MAKE_READABLE(x, y)
397 +//#define RUNNING_ON_VALGRIND 0
398 +//#endif
399
400 #define TASK_DEBUG 0
401 #if TASK_DEBUG
402
403
404
405 1.1 net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch
406
407 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch?rev=1.1&view=markup
408 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch?rev=1.1&content-type=text/plain
409
410 Index: wvstreams-4.4.1-gcc43.patch
411 ===================================================================
412 diff -ur wvstreams-4.4.1.orig/include/uniconfkey.h wvstreams-4.4.1/include/uniconfkey.h
413 --- wvstreams-4.4.1.orig/include/uniconfkey.h 2007-07-19 22:22:49.000000000 +0100
414 +++ wvstreams-4.4.1/include/uniconfkey.h 2008-06-17 19:54:46.000000000 +0100
415 @@ -7,6 +7,8 @@
416 #ifndef __UNICONFKEY_H
417 #define __UNICONFKEY_H
418
419 +#include <climits>
420 +
421 #include "wvstring.h"
422 #include "wvlinklist.h"
423
424 diff -ur wvstreams-4.4.1.orig/include/wvserialize.h wvstreams-4.4.1/include/wvserialize.h
425 --- wvstreams-4.4.1.orig/include/wvserialize.h 2007-08-17 06:15:30.000000000 +0100
426 +++ wvstreams-4.4.1/include/wvserialize.h 2008-06-17 20:02:28.000000000 +0100
427 @@ -349,7 +349,7 @@
428 * except as the last character.
429 */
430 template <>
431 -extern WvString _wv_deserialize<WvString>(WvBuf &buf);
432 +WvString _wv_deserialize<WvString>(WvBuf &buf);
433
434
435 /** Deserialize a WvBuf. */
436
437
438
439 --
440 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups