summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libsoup/libsoup-2.2.105
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libsoup/libsoup-2.2.105')
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch1186
-rw-r--r--meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch85
2 files changed, 0 insertions, 1271 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
deleted file mode 100644
index 79e2ab8f74..0000000000
--- a/meta/recipes-support/libsoup/libsoup-2.2.105/dprintf_conflict_with_eglibc.patch
+++ /dev/null
@@ -1,1186 +0,0 @@
1Upstream-Status: Pending
2
3diff -rupN libsoup-2.2.105/tests/auth-test.c libsoup-2.2.105.new//tests/auth-test.c
4--- libsoup-2.2.105/tests/auth-test.c 2007-12-05 00:13:27.000000000 +0200
5+++ libsoup-2.2.105.new//tests/auth-test.c 2012-01-16 20:12:09.000000000 +0200
6@@ -19,7 +19,7 @@ int errors = 0;
7 gboolean debug = FALSE;
8
9 static void
10-dprintf (const char *format, ...)
11+dprintfsoup (const char *format, ...)
12 {
13 va_list args;
14
15@@ -216,18 +216,18 @@ handler (SoupMessage *msg, gpointer data
16
17 auth = identify_auth (msg);
18
19- dprintf (" %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
20+ dprintfsoup (" %d %s (using %s)\n", msg->status_code, msg->reason_phrase,
21 auths[auth]);
22
23 if (*expected) {
24 exp = *expected - '0';
25 if (auth != exp) {
26- dprintf (" expected %s!\n", auths[exp]);
27+ dprintfsoup (" expected %s!\n", auths[exp]);
28 errors++;
29 }
30 memmove (expected, expected + 1, strlen (expected));
31 } else {
32- dprintf (" expected to be finished\n");
33+ dprintfsoup (" expected to be finished\n");
34 errors++;
35 }
36 }
37@@ -266,10 +266,10 @@ bug271540_sent (SoupMessage *msg, gpoint
38 int auth = identify_auth (msg);
39
40 if (!*authenticated && auth) {
41- dprintf (" using auth on message %d before authenticating!!??\n", n);
42+ dprintfsoup (" using auth on message %d before authenticating!!??\n", n);
43 errors++;
44 } else if (*authenticated && !auth) {
45- dprintf (" sent unauthenticated message %d after authenticating!\n", n);
46+ dprintfsoup (" sent unauthenticated message %d after authenticating!\n", n);
47 errors++;
48 }
49 }
50@@ -287,12 +287,12 @@ bug271540_authenticate (SoupSession *ses
51 return;
52
53 if (!*authenticated) {
54- dprintf (" authenticating message %d\n", n);
55+ dprintfsoup (" authenticating message %d\n", n);
56 *username = g_strdup ("user1");
57 *password = g_strdup ("realm1");
58 *authenticated = TRUE;
59 } else {
60- dprintf (" asked to authenticate message %d after authenticating!\n", n);
61+ dprintfsoup (" asked to authenticate message %d after authenticating!\n", n);
62 errors++;
63 }
64 }
65@@ -304,7 +304,7 @@ bug271540_finished (SoupMessage *msg, gp
66 int n = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (msg), "#"));
67
68 if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
69- dprintf (" got status '%d %s' on message %d!\n",
70+ dprintfsoup (" got status '%d %s' on message %d!\n",
71 msg->status_code, msg->reason_phrase, n);
72 errors++;
73 }
74@@ -350,10 +350,10 @@ main (int argc, char **argv)
75 G_CALLBACK (reauthenticate), &i);
76
77 for (i = 0; i < ntests; i++) {
78- dprintf ("Test %d: %s\n", i + 1, tests[i].explanation);
79+ dprintfsoup ("Test %d: %s\n", i + 1, tests[i].explanation);
80
81 uri = g_strconcat (base_uri, tests[i].url, NULL);
82- dprintf (" GET %s\n", uri);
83+ dprintfsoup (" GET %s\n", uri);
84
85 msg = soup_message_new (SOUP_METHOD_GET, uri);
86 g_free (uri);
87@@ -372,21 +372,21 @@ main (int argc, char **argv)
88 soup_session_send_message (session, msg);
89 if (msg->status_code != SOUP_STATUS_UNAUTHORIZED &&
90 msg->status_code != SOUP_STATUS_OK) {
91- dprintf (" %d %s !\n", msg->status_code,
92+ dprintfsoup (" %d %s !\n", msg->status_code,
93 msg->reason_phrase);
94 errors++;
95 }
96 if (*expected) {
97- dprintf (" expected %d more round(s)\n",
98+ dprintfsoup (" expected %d more round(s)\n",
99 (int)strlen (expected));
100 errors++;
101 }
102 g_free (expected);
103
104 if (msg->status_code != tests[i].final_status)
105- dprintf (" expected %d\n", tests[i].final_status);
106+ dprintfsoup (" expected %d\n", tests[i].final_status);
107
108- dprintf ("\n");
109+ dprintfsoup ("\n");
110
111 g_object_unref (msg);
112 }
113@@ -395,7 +395,7 @@ main (int argc, char **argv)
114
115 /* And now for a regression test */
116
117- dprintf ("Regression test for bug 271540:\n");
118+ dprintfsoup ("Regression test for bug 271540:\n");
119 session = soup_session_async_new ();
120
121 authenticated = FALSE;
122@@ -424,7 +424,7 @@ main (int argc, char **argv)
123
124 apache_cleanup ();
125
126- dprintf ("\n");
127+ dprintfsoup ("\n");
128 if (errors) {
129 printf ("auth-test: %d error(s). Run with '-d' for details\n",
130 errors);
131diff -rupN libsoup-2.2.105/tests/context-test.c libsoup-2.2.105.new//tests/context-test.c
132--- libsoup-2.2.105/tests/context-test.c 2007-12-05 00:13:27.000000000 +0200
133+++ libsoup-2.2.105.new//tests/context-test.c 2012-01-16 20:11:27.000000000 +0200
134@@ -28,7 +28,7 @@ GThread *server_thread;
135 char *base_uri;
136
137 static void
138-dprintf (const char *format, ...)
139+dprintfsoup (const char *format, ...)
140 {
141 va_list args;
142
143@@ -168,7 +168,7 @@ do_test1 (void)
144 {
145 GMainLoop *loop;
146
147- dprintf ("Test 1: blocking the main thread does not block other thread\n");
148+ dprintfsoup ("Test 1: blocking the main thread does not block other thread\n");
149
150 test1_cond = g_cond_new ();
151 test1_mutex = g_mutex_new ();
152@@ -196,7 +196,7 @@ idle_start_test1_thread (gpointer loop)
153 if (g_cond_timed_wait (test1_cond, test1_mutex, &time))
154 g_thread_join (thread);
155 else {
156- dprintf (" timeout!\n");
157+ dprintfsoup (" timeout!\n");
158 errors++;
159 }
160
161@@ -232,17 +232,17 @@ test1_thread (gpointer user_data)
162
163 uri = g_build_filename (base_uri, "slow", NULL);
164
165- dprintf (" send_message\n");
166+ dprintfsoup (" send_message\n");
167 msg = soup_message_new ("GET", uri);
168 soup_session_send_message (session, msg);
169 if (msg->status_code != SOUP_STATUS_OK) {
170- dprintf (" unexpected status: %d %s\n",
171+ dprintfsoup (" unexpected status: %d %s\n",
172 msg->status_code, msg->reason_phrase);
173 errors++;
174 }
175 g_object_unref (msg);
176
177- dprintf (" queue_message\n");
178+ dprintfsoup (" queue_message\n");
179 msg = soup_message_new ("GET", uri);
180 loop = g_main_loop_new (async_context, FALSE);
181 g_object_ref (msg);
182@@ -250,7 +250,7 @@ test1_thread (gpointer user_data)
183 g_main_loop_run (loop);
184 g_main_loop_unref (loop);
185 if (msg->status_code != SOUP_STATUS_OK) {
186- dprintf (" unexpected status: %d %s\n",
187+ dprintfsoup (" unexpected status: %d %s\n",
188 msg->status_code, msg->reason_phrase);
189 errors++;
190 }
191@@ -279,7 +279,7 @@ do_test2 (void)
192 char *uri;
193 SoupMessage *msg;
194
195- dprintf ("Test 2: a session with its own context is independent of the main loop.\n");
196+ dprintfsoup ("Test 2: a session with its own context is independent of the main loop.\n");
197
198 idle = g_idle_add_full (G_PRIORITY_HIGH, idle_test2_fail, NULL, NULL);
199
200@@ -291,11 +291,11 @@ do_test2 (void)
201
202 uri = g_build_filename (base_uri, "slow", NULL);
203
204- dprintf (" send_message\n");
205+ dprintfsoup (" send_message\n");
206 msg = soup_message_new ("GET", uri);
207 soup_session_send_message (session, msg);
208 if (msg->status_code != SOUP_STATUS_OK) {
209- dprintf (" unexpected status: %d %s\n",
210+ dprintfsoup (" unexpected status: %d %s\n",
211 msg->status_code, msg->reason_phrase);
212 errors++;
213 }
214@@ -311,7 +311,7 @@ do_test2 (void)
215 static gboolean
216 idle_test2_fail (gpointer user_data)
217 {
218- dprintf (" idle ran!\n");
219+ dprintfsoup (" idle ran!\n");
220 errors++;
221 return FALSE;
222 }
223@@ -356,7 +356,7 @@ main (int argc, char **argv)
224 g_free (base_uri);
225 g_main_context_unref (g_main_context_default ());
226
227- dprintf ("\n");
228+ dprintfsoup ("\n");
229 if (errors) {
230 printf ("context-test: %d error(s). Run with '-d' for details\n",
231 errors);
232diff -rupN libsoup-2.2.105/tests/header-parsing.c libsoup-2.2.105.new//tests/header-parsing.c
233--- libsoup-2.2.105/tests/header-parsing.c 2007-10-28 19:57:03.000000000 +0200
234+++ libsoup-2.2.105.new//tests/header-parsing.c 2012-01-16 20:11:54.000000000 +0200
235@@ -10,7 +10,7 @@
236 gboolean debug = FALSE;
237
238 static void
239-dprintf (const char *format, ...)
240+dprintfsoup (const char *format, ...)
241 {
242 va_list args;
243
244@@ -455,7 +455,7 @@ static void
245 print_header (gpointer key, gpointer value, gpointer data)
246 {
247 GSList *values = value;
248- dprintf (" '%s': '%s'\n",
249+ dprintfsoup (" '%s': '%s'\n",
250 (char *)key, (char*)values->data);
251 }
252
253@@ -480,11 +480,11 @@ do_request_tests (void)
254 SoupHttpVersion version;
255 GHashTable *headers;
256
257- dprintf ("Request tests\n");
258+ dprintfsoup ("Request tests\n");
259 for (i = 0; i < 1; i++) {
260 gboolean ok = TRUE;
261
262- dprintf ("%2d. %s (%s): ", i + 1, reqtests[i].description,
263+ dprintfsoup ("%2d. %s (%s): ", i + 1, reqtests[i].description,
264 reqtests[i].method ? "should parse" : "should NOT parse");
265
266 headers = g_hash_table_new_full (g_str_hash, g_str_equal,
267@@ -519,34 +519,34 @@ do_request_tests (void)
268 }
269
270 if (ok)
271- dprintf ("OK!\n");
272+ dprintfsoup ("OK!\n");
273 else {
274- dprintf ("BAD!\n");
275+ dprintfsoup ("BAD!\n");
276 errors++;
277 if (reqtests[i].method) {
278- dprintf (" expected: '%s' '%s' 'HTTP/1.%d'\n",
279+ dprintfsoup (" expected: '%s' '%s' 'HTTP/1.%d'\n",
280 reqtests[i].method, reqtests[i].path,
281 reqtests[i].version);
282 for (h = 0; reqtests[i].headers[h].name; h++) {
283- dprintf (" '%s': '%s'\n",
284+ dprintfsoup (" '%s': '%s'\n",
285 reqtests[i].headers[h].name,
286 reqtests[i].headers[h].value);
287 }
288 } else
289- dprintf (" expected: parse error\n");
290+ dprintfsoup (" expected: parse error\n");
291 if (method) {
292- dprintf (" got: '%s' '%s' 'HTTP/1.%d'\n",
293+ dprintfsoup (" got: '%s' '%s' 'HTTP/1.%d'\n",
294 method, path, version);
295 g_hash_table_foreach (headers, print_header, NULL);
296 } else
297- dprintf (" got: parse error\n");
298+ dprintfsoup (" got: parse error\n");
299 }
300
301 g_free (method);
302 g_free (path);
303 g_hash_table_destroy (headers);
304 }
305- dprintf ("\n");
306+ dprintfsoup ("\n");
307
308 return errors;
309 }
310@@ -561,11 +561,11 @@ do_response_tests (void)
311 SoupHttpVersion version;
312 GHashTable *headers;
313
314- dprintf ("Response tests\n");
315+ dprintfsoup ("Response tests\n");
316 for (i = 0; i < num_resptests; i++) {
317 gboolean ok = TRUE;
318
319- dprintf ("%2d. %s (%s): ", i + 1, resptests[i].description,
320+ dprintfsoup ("%2d. %s (%s): ", i + 1, resptests[i].description,
321 resptests[i].reason_phrase ? "should parse" : "should NOT parse");
322
323 headers = g_hash_table_new_full (g_str_hash, g_str_equal,
324@@ -600,34 +600,34 @@ do_response_tests (void)
325 }
326
327 if (ok)
328- dprintf ("OK!\n");
329+ dprintfsoup ("OK!\n");
330 else {
331- dprintf ("BAD!\n");
332+ dprintfsoup ("BAD!\n");
333 errors++;
334 if (resptests[i].reason_phrase) {
335- dprintf (" expected: 'HTTP/1.%d' '%03d' '%s'\n",
336+ dprintfsoup (" expected: 'HTTP/1.%d' '%03d' '%s'\n",
337 resptests[i].version,
338 resptests[i].status_code,
339 resptests[i].reason_phrase);
340 for (h = 0; resptests[i].headers[h].name; h++) {
341- dprintf (" '%s': '%s'\n",
342+ dprintfsoup (" '%s': '%s'\n",
343 resptests[i].headers[h].name,
344 resptests[i].headers[h].value);
345 }
346 } else
347- dprintf (" expected: parse error\n");
348+ dprintfsoup (" expected: parse error\n");
349 if (reason_phrase) {
350- dprintf (" got: 'HTTP/1.%d' '%03d' '%s'\n",
351+ dprintfsoup (" got: 'HTTP/1.%d' '%03d' '%s'\n",
352 version, status_code, reason_phrase);
353 g_hash_table_foreach (headers, print_header, NULL);
354 } else
355- dprintf (" got: parse error\n");
356+ dprintfsoup (" got: parse error\n");
357 }
358
359 g_free (reason_phrase);
360 g_hash_table_destroy (headers);
361 }
362- dprintf ("\n");
363+ dprintfsoup ("\n");
364
365 return errors;
366 }
367@@ -651,7 +651,7 @@ main (int argc, char **argv)
368 errors = do_request_tests ();
369 errors += do_response_tests ();
370
371- dprintf ("\n");
372+ dprintfsoup ("\n");
373 if (errors) {
374 printf ("header-parsing: %d error(s). Run with '-d' for details\n",
375 errors);
376diff -rupN libsoup-2.2.105/tests/ntlm-test.c libsoup-2.2.105.new//tests/ntlm-test.c
377--- libsoup-2.2.105/tests/ntlm-test.c 2007-12-05 00:13:27.000000000 +0200
378+++ libsoup-2.2.105.new//tests/ntlm-test.c 2012-01-16 20:11:45.000000000 +0200
379@@ -29,7 +29,7 @@
380 gboolean debug = FALSE;
381
382 static void
383-dprintf (const char *format, ...)
384+dprintfsoup (const char *format, ...)
385 {
386 va_list args;
387
388@@ -219,58 +219,58 @@ do_message (SoupSession *session, SoupUr
389 G_CALLBACK (ntlm_response_check), &state);
390
391 soup_session_send_message (session, msg);
392- dprintf (" %-10s -> ", path);
393+ dprintfsoup (" %-10s -> ", path);
394
395 if (state.got_prompt) {
396- dprintf (" PROMPT");
397+ dprintfsoup (" PROMPT");
398 if (!get_prompt) {
399- dprintf ("???");
400+ dprintfsoup ("???");
401 errors++;
402 }
403 } else if (get_prompt) {
404- dprintf (" no-prompt???");
405+ dprintfsoup (" no-prompt???");
406 errors++;
407 }
408
409 if (state.sent_request) {
410- dprintf (" REQUEST");
411+ dprintfsoup (" REQUEST");
412 if (!do_ntlm) {
413- dprintf ("???");
414+ dprintfsoup ("???");
415 errors++;
416 }
417 } else if (do_ntlm) {
418- dprintf (" no-request???");
419+ dprintfsoup (" no-request???");
420 errors++;
421 }
422
423 if (state.got_challenge) {
424- dprintf (" CHALLENGE");
425+ dprintfsoup (" CHALLENGE");
426 if (!do_ntlm) {
427- dprintf ("???");
428+ dprintfsoup ("???");
429 errors++;
430 }
431 } else if (do_ntlm) {
432- dprintf (" no-challenge???");
433+ dprintfsoup (" no-challenge???");
434 errors++;
435 }
436
437 if (state.sent_response) {
438- dprintf (" RESPONSE");
439+ dprintfsoup (" RESPONSE");
440 if (!do_ntlm) {
441- dprintf ("???");
442+ dprintfsoup ("???");
443 errors++;
444 }
445 } else if (do_ntlm) {
446- dprintf (" no-response???");
447+ dprintfsoup (" no-response???");
448 errors++;
449 }
450
451- dprintf (" -> %s", msg->reason_phrase);
452+ dprintfsoup (" -> %s", msg->reason_phrase);
453 if (msg->status_code != status_code) {
454- dprintf ("???");
455+ dprintfsoup ("???");
456 errors++;
457 }
458- dprintf ("\n");
459+ dprintfsoup ("\n");
460
461 g_object_unref (msg);
462 return errors;
463@@ -327,11 +327,11 @@ do_ntlm_tests (SoupUri *base_uri)
464 {
465 int errors = 0;
466
467- dprintf ("Round 1: Non-NTLM Connection\n");
468+ dprintfsoup ("Round 1: Non-NTLM Connection\n");
469 errors += do_ntlm_round (base_uri, NULL);
470- dprintf ("Round 2: NTLM Connection, user=alice\n");
471+ dprintfsoup ("Round 2: NTLM Connection, user=alice\n");
472 errors += do_ntlm_round (base_uri, "alice");
473- dprintf ("Round 3: NTLM Connection, user=bob\n");
474+ dprintfsoup ("Round 3: NTLM Connection, user=bob\n");
475 errors += do_ntlm_round (base_uri, "bob");
476
477 return errors;
478@@ -397,7 +397,7 @@ main (int argc, char **argv)
479 g_hash_table_destroy (connections);
480 g_main_context_unref (g_main_context_default ());
481
482- dprintf ("\n");
483+ dprintfsoup ("\n");
484 if (errors) {
485 printf ("ntlm-test: %d error(s). Run with '-d' for details\n",
486 errors);
487diff -rupN libsoup-2.2.105/tests/proxy-test.c libsoup-2.2.105.new//tests/proxy-test.c
488--- libsoup-2.2.105/tests/proxy-test.c 2007-12-05 00:13:27.000000000 +0200
489+++ libsoup-2.2.105.new//tests/proxy-test.c 2012-01-16 20:11:02.000000000 +0200
490@@ -14,7 +14,7 @@ int errors = 0;
491 gboolean debug = FALSE;
492
493 static void
494-dprintf (const char *format, ...)
495+dprintfsoup (const char *format, ...)
496 {
497 va_list args;
498
499@@ -76,7 +76,7 @@ test_url (const char *url, int proxy, gu
500 SoupUri *proxy_uri;
501 SoupMessage *msg;
502
503- dprintf (" GET %s via %s\n", url, proxy_names[proxy]);
504+ dprintfsoup (" GET %s via %s\n", url, proxy_names[proxy]);
505 if (proxy == UNAUTH_PROXY && expected != SOUP_STATUS_FORBIDDEN)
506 expected = SOUP_STATUS_PROXY_UNAUTHORIZED;
507
508@@ -99,9 +99,9 @@ test_url (const char *url, int proxy, gu
509
510 soup_session_send_message (session, msg);
511
512- dprintf (" %d %s\n", msg->status_code, msg->reason_phrase);
513+ dprintfsoup (" %d %s\n", msg->status_code, msg->reason_phrase);
514 if (msg->status_code != expected) {
515- dprintf (" EXPECTED %d!\n", expected);
516+ dprintfsoup (" EXPECTED %d!\n", expected);
517 errors++;
518 }
519
520@@ -115,7 +115,7 @@ run_test (int i, gboolean sync)
521 {
522 char *http_url, *https_url;
523
524- dprintf ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
525+ dprintfsoup ("Test %d: %s (%s)\n", i + 1, tests[i].explanation,
526 sync ? "sync" : "async");
527
528 if (!strncmp (tests[i].url, "http", 4)) {
529@@ -141,7 +141,7 @@ run_test (int i, gboolean sync)
530 g_free (http_url);
531 g_free (https_url);
532
533- dprintf ("\n");
534+ dprintfsoup ("\n");
535 }
536
537 int
538@@ -176,7 +176,7 @@ main (int argc, char **argv)
539 apache_cleanup ();
540 g_main_context_unref (g_main_context_default ());
541
542- dprintf ("\n");
543+ dprintfsoup ("\n");
544 if (errors) {
545 printf ("proxy-test: %d error(s). Run with '-d' for details\n",
546 errors);
547diff -rupN libsoup-2.2.105/tests/pull-api.c libsoup-2.2.105.new//tests/pull-api.c
548--- libsoup-2.2.105/tests/pull-api.c 2007-12-05 00:13:27.000000000 +0200
549+++ libsoup-2.2.105.new//tests/pull-api.c 2012-01-16 20:11:14.000000000 +0200
550@@ -19,7 +19,7 @@ char *correct_response;
551 guint correct_response_len;
552
553 static void
554-dprintf (int level, const char *format, ...)
555+dprintfsoup (int level, const char *format, ...)
556 {
557 va_list args;
558
559@@ -98,7 +98,7 @@ do_fully_async_test (SoupSession *sessio
560 loop = g_main_loop_new (NULL, FALSE);
561
562 uri = g_build_filename (base_uri, sub_uri, NULL);
563- dprintf (1, "GET %s\n", uri);
564+ dprintfsoup (1, "GET %s\n", uri);
565
566 msg = soup_message_new (SOUP_METHOD_GET, uri);
567 g_free (uri);
568@@ -152,10 +152,10 @@ fully_async_request_chunk (gpointer user
569 FullyAsyncData *ad = user_data;
570
571 if (!ad->did_first_timeout) {
572- dprintf (1, " first timeout\n");
573+ dprintfsoup (1, " first timeout\n");
574 ad->did_first_timeout = TRUE;
575 } else
576- dprintf (2, " timeout\n");
577+ dprintfsoup (2, " timeout\n");
578 ad->timeout = 0;
579
580 /* ad->chunks_ready and ad->chunk_wanted are used because
581@@ -180,14 +180,14 @@ fully_async_got_headers (SoupMessage *ms
582 {
583 FullyAsyncData *ad = user_data;
584
585- dprintf (1, " %d %s\n", msg->status_code, msg->reason_phrase);
586+ dprintfsoup (1, " %d %s\n", msg->status_code, msg->reason_phrase);
587 if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
588 /* Let soup handle this one; this got_headers handler
589 * will get called again next time around.
590 */
591 return;
592 } else if (msg->status_code != SOUP_STATUS_OK) {
593- dprintf (1, " unexpected status: %d %s\n",
594+ dprintfsoup (1, " unexpected status: %d %s\n",
595 msg->status_code, msg->reason_phrase);
596 errors++;
597 return;
598@@ -210,7 +210,7 @@ fully_async_got_chunk (SoupMessage *msg,
599 {
600 FullyAsyncData *ad = user_data;
601
602- dprintf (2, " got chunk from %lu - %lu\n",
603+ dprintfsoup (2, " got chunk from %lu - %lu\n",
604 (unsigned long) ad->read_so_far,
605 (unsigned long) ad->read_so_far + msg->response.length);
606
607@@ -227,13 +227,13 @@ fully_async_got_chunk (SoupMessage *msg,
608 * somewhere.
609 */
610 if (ad->read_so_far + msg->response.length > correct_response_len) {
611- dprintf (1, " read too far! (%lu > %lu)\n",
612+ dprintfsoup (1, " read too far! (%lu > %lu)\n",
613 (unsigned long) (ad->read_so_far + msg->response.length),
614 (unsigned long) correct_response_len);
615 errors++;
616 } else if (memcmp (msg->response.body, correct_response + ad->read_so_far,
617 msg->response.length) != 0) {
618- dprintf (1, " data mismatch in block starting at %lu\n",
619+ dprintfsoup (1, " data mismatch in block starting at %lu\n",
620 (unsigned long) ad->read_so_far);
621 errors++;
622 }
623@@ -257,7 +257,7 @@ fully_async_finished (SoupMessage *msg,
624 FullyAsyncData *ad = user_data;
625
626 if (msg->status_code != ad->expected_status) {
627- dprintf (1, " unexpected final status: %d %s !\n",
628+ dprintfsoup (1, " unexpected final status: %d %s !\n",
629 msg->status_code, msg->reason_phrase);
630 errors++;
631 }
632@@ -300,7 +300,7 @@ do_synchronously_async_test (SoupSession
633 GByteArray *chunk;
634
635 uri = g_build_filename (base_uri, sub_uri, NULL);
636- dprintf (1, "GET %s\n", uri);
637+ dprintfsoup (1, "GET %s\n", uri);
638
639 msg = soup_message_new (SOUP_METHOD_GET, uri);
640 g_free (uri);
641@@ -314,11 +314,11 @@ do_synchronously_async_test (SoupSession
642 sync_async_send (session, msg);
643 if (msg->status == SOUP_MESSAGE_STATUS_FINISHED &&
644 expected_status == SOUP_STATUS_OK) {
645- dprintf (1, " finished without reading response!\n");
646+ dprintfsoup (1, " finished without reading response!\n");
647 errors++;
648 } else if (msg->status != SOUP_MESSAGE_STATUS_FINISHED &&
649 expected_status != SOUP_STATUS_OK) {
650- dprintf (1, " request failed to fail!\n");
651+ dprintfsoup (1, " request failed to fail!\n");
652 errors++;
653 }
654
655@@ -327,19 +327,19 @@ do_synchronously_async_test (SoupSession
656 */
657 read_so_far = 0;
658 while ((chunk = sync_async_read_chunk (msg))) {
659- dprintf (2, " read chunk from %lu - %lu\n",
660+ dprintfsoup (2, " read chunk from %lu - %lu\n",
661 (unsigned long) read_so_far,
662 (unsigned long) read_so_far + chunk->len);
663
664 if (read_so_far + chunk->len > correct_response_len) {
665- dprintf (1, " read too far! (%lu > %lu)\n",
666+ dprintfsoup (1, " read too far! (%lu > %lu)\n",
667 (unsigned long) read_so_far + chunk->len,
668 (unsigned long) correct_response_len);
669 errors++;
670 } else if (memcmp (chunk->data,
671 correct_response + read_so_far,
672 chunk->len) != 0) {
673- dprintf (1, " data mismatch in block starting at %lu\n",
674+ dprintfsoup (1, " data mismatch in block starting at %lu\n",
675 (unsigned long) read_so_far);
676 errors++;
677 }
678@@ -350,10 +350,10 @@ do_synchronously_async_test (SoupSession
679 if (msg->status != SOUP_MESSAGE_STATUS_FINISHED ||
680 (msg->status_code == SOUP_STATUS_OK &&
681 read_so_far != correct_response_len)) {
682- dprintf (1, " loop ended before message was fully read!\n");
683+ dprintfsoup (1, " loop ended before message was fully read!\n");
684 errors++;
685 } else if (msg->status_code != expected_status) {
686- dprintf (1, " unexpected final status: %d %s !\n",
687+ dprintfsoup (1, " unexpected final status: %d %s !\n",
688 msg->status_code, msg->reason_phrase);
689 errors++;
690 }
691@@ -413,14 +413,14 @@ sync_async_got_headers (SoupMessage *msg
692 {
693 SyncAsyncData *ad = user_data;
694
695- dprintf (1, " %d %s\n", msg->status_code, msg->reason_phrase);
696+ dprintfsoup (1, " %d %s\n", msg->status_code, msg->reason_phrase);
697 if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) {
698 /* Let soup handle this one; this got_headers handler
699 * will get called again next time around.
700 */
701 return;
702 } else if (msg->status_code != SOUP_STATUS_OK) {
703- dprintf (1, " unexpected status: %d %s\n",
704+ dprintfsoup (1, " unexpected status: %d %s\n",
705 msg->status_code, msg->reason_phrase);
706 errors++;
707 return;
708@@ -526,7 +526,7 @@ main (int argc, char **argv)
709 base_uri = "http://localhost:47524/";
710 get_correct_response (base_uri);
711
712- dprintf (1, "\nFully async, fast requests\n");
713+ dprintfsoup (1, "\nFully async, fast requests\n");
714 session = soup_session_async_new ();
715 g_signal_connect (session, "authenticate",
716 G_CALLBACK (authenticate), NULL);
717@@ -539,7 +539,7 @@ main (int argc, char **argv)
718 soup_session_abort (session);
719 g_object_unref (session);
720
721- dprintf (1, "\nFully async, slow requests\n");
722+ dprintfsoup (1, "\nFully async, slow requests\n");
723 session = soup_session_async_new ();
724 g_signal_connect (session, "authenticate",
725 G_CALLBACK (authenticate), NULL);
726@@ -552,7 +552,7 @@ main (int argc, char **argv)
727 soup_session_abort (session);
728 g_object_unref (session);
729
730- dprintf (1, "\nSynchronously async\n");
731+ dprintfsoup (1, "\nSynchronously async\n");
732 session = soup_session_async_new ();
733 g_signal_connect (session, "authenticate",
734 G_CALLBACK (authenticate), NULL);
735@@ -571,7 +571,7 @@ main (int argc, char **argv)
736 apache_cleanup ();
737 g_main_context_unref (g_main_context_default ());
738
739- dprintf (1, "\n");
740+ dprintfsoup (1, "\n");
741 if (errors) {
742 printf ("pull-api: %d error(s). Run with '-d' for details\n",
743 errors);
744diff -rupN libsoup-2.2.105/tests/uri-parsing.c libsoup-2.2.105.new//tests/uri-parsing.c
745--- libsoup-2.2.105/tests/uri-parsing.c 2007-10-28 19:57:03.000000000 +0200
746+++ libsoup-2.2.105.new//tests/uri-parsing.c 2012-01-16 20:10:35.000000000 +0200
747@@ -10,7 +10,7 @@
748 gboolean debug = FALSE;
749
750 static void
751-dprintf (const char *format, ...)
752+dprintfsoup (const char *format, ...)
753 {
754 va_list args;
755
756@@ -113,21 +113,21 @@ do_uri (SoupUri *base_uri, const char *b
757 char *uri_string;
758
759 if (base_uri) {
760- dprintf ("<%s> + <%s> = <%s>? ", base_str, in_uri,
761+ dprintfsoup ("<%s> + <%s> = <%s>? ", base_str, in_uri,
762 out_uri ? out_uri : "ERR");
763 uri = soup_uri_new_with_base (base_uri, in_uri);
764 } else {
765- dprintf ("<%s> => <%s>? ", in_uri,
766+ dprintfsoup ("<%s> => <%s>? ", in_uri,
767 out_uri ? out_uri : "ERR");
768 uri = soup_uri_new (in_uri);
769 }
770
771 if (!uri) {
772 if (out_uri) {
773- dprintf ("ERR\n Could not parse %s\n", in_uri);
774+ dprintfsoup ("ERR\n Could not parse %s\n", in_uri);
775 return FALSE;
776 } else {
777- dprintf ("OK\n");
778+ dprintfsoup ("OK\n");
779 return TRUE;
780 }
781 }
782@@ -136,18 +136,18 @@ do_uri (SoupUri *base_uri, const char *b
783 soup_uri_free (uri);
784
785 if (!out_uri) {
786- dprintf ("ERR\n Got %s\n", uri_string);
787+ dprintfsoup ("ERR\n Got %s\n", uri_string);
788 return FALSE;
789 }
790
791 if (strcmp (uri_string, out_uri) != 0) {
792- dprintf ("NO\n Unparses to <%s>\n", uri_string);
793+ dprintfsoup ("NO\n Unparses to <%s>\n", uri_string);
794 g_free (uri_string);
795 return FALSE;
796 }
797 g_free (uri_string);
798
799- dprintf ("OK\n");
800+ dprintfsoup ("OK\n");
801 return TRUE;
802 }
803
804@@ -169,14 +169,14 @@ main (int argc, char **argv)
805 }
806 }
807
808- dprintf ("Absolute URI parsing\n");
809+ dprintfsoup ("Absolute URI parsing\n");
810 for (i = 0; i < num_abs_tests; i++) {
811 if (!do_uri (NULL, NULL, abs_tests[i].uri_string,
812 abs_tests[i].result))
813 errs++;
814 }
815
816- dprintf ("\nRelative URI parsing\n");
817+ dprintfsoup ("\nRelative URI parsing\n");
818 base_uri = soup_uri_new (base);
819 if (!base_uri) {
820 fprintf (stderr, "Could not parse %s!\n", base);
821@@ -198,7 +198,7 @@ main (int argc, char **argv)
822 }
823 soup_uri_free (base_uri);
824
825- dprintf ("\n");
826+ dprintfsoup ("\n");
827 if (errs) {
828 printf ("uri-parsing: %d error(s). Run with '-d' for details\n",
829 errs);
830diff -rupN libsoup-2.2.105/tests/xmlrpc-test.c libsoup-2.2.105.new//tests/xmlrpc-test.c
831--- libsoup-2.2.105/tests/xmlrpc-test.c 2008-02-08 04:19:00.000000000 +0200
832+++ libsoup-2.2.105.new//tests/xmlrpc-test.c 2012-01-16 20:12:18.000000000 +0200
833@@ -19,7 +19,7 @@ static const char *uri = "http://localho
834 int debug;
835
836 static void
837-dprintf (int level, const char *format, ...)
838+dprintfsoup (int level, const char *format, ...)
839 {
840 va_list args;
841
842@@ -54,13 +54,13 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
843 soup_xmlrpc_message_persist (xmsg);
844 status = soup_session_send_message (session, msg);
845
846- dprintf (3, "\n%.*s\n%d %s\n%.*s\n",
847+ dprintfsoup (3, "\n%.*s\n%d %s\n%.*s\n",
848 msg->request.length, msg->request.body,
849 msg->status_code, msg->reason_phrase,
850 msg->response.length, msg->response.body);
851
852 if (!SOUP_STATUS_IS_SUCCESSFUL (status)) {
853- dprintf (1, "ERROR: %d %s\n", status, msg->reason_phrase);
854+ dprintfsoup (1, "ERROR: %d %s\n", status, msg->reason_phrase);
855 g_object_unref (msg);
856 return FALSE;
857 }
858@@ -69,9 +69,9 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
859 g_object_unref (msg);
860 if (!response || soup_xmlrpc_response_is_fault (response)) {
861 if (!response)
862- dprintf (1, "ERROR: no response\n");
863+ dprintfsoup (1, "ERROR: no response\n");
864 else {
865- dprintf (1, "ERROR: fault\n");
866+ dprintfsoup (1, "ERROR: fault\n");
867 g_object_unref (response);
868 }
869 return FALSE;
870@@ -79,11 +79,11 @@ do_xmlrpc (SoupXmlrpcMessage *xmsg, Soup
871
872 value = soup_xmlrpc_response_get_value (response);
873 if (!value) {
874- dprintf (1, "ERROR: no value?\n");
875+ dprintfsoup (1, "ERROR: no value?\n");
876 g_object_unref (response);
877 return NULL;
878 } else if (soup_xmlrpc_value_get_type (value) != type) {
879- dprintf (1, "ERROR: wrong value type; expected %s, got %s\n",
880+ dprintfsoup (1, "ERROR: wrong value type; expected %s, got %s\n",
881 value_type[type], value_type[soup_xmlrpc_value_get_type (value)]);
882 g_object_unref (response);
883 return NULL;
884@@ -101,7 +101,7 @@ test_sum (void)
885 int i, val, sum;
886 long result;
887
888- dprintf (1, "sum (array of int -> int): ");
889+ dprintfsoup (1, "sum (array of int -> int): ");
890
891 msg = soup_xmlrpc_message_new (uri);
892 soup_xmlrpc_message_start_call (msg, "sum");
893@@ -109,11 +109,11 @@ test_sum (void)
894 soup_xmlrpc_message_start_array (msg);
895 for (i = sum = 0; i < 10; i++) {
896 val = rand () % 100;
897- dprintf (2, "%s%d", i == 0 ? "[" : ", ", val);
898+ dprintfsoup (2, "%s%d", i == 0 ? "[" : ", ", val);
899 soup_xmlrpc_message_write_int (msg, val);
900 sum += val;
901 }
902- dprintf (2, "] -> ");
903+ dprintfsoup (2, "] -> ");
904 soup_xmlrpc_message_end_array (msg);
905 soup_xmlrpc_message_end_param (msg);
906 soup_xmlrpc_message_end_call (msg);
907@@ -124,14 +124,14 @@ test_sum (void)
908 value = soup_xmlrpc_response_get_value (response);
909
910 if (!soup_xmlrpc_value_get_int (value, &result)) {
911- dprintf (1, "wrong type?\n");
912+ dprintfsoup (1, "wrong type?\n");
913 g_object_unref (response);
914 return FALSE;
915 }
916 g_object_unref (response);
917
918- dprintf (2, "%ld: ", result);
919- dprintf (1, "%s\n", result == sum ? "OK!" : "WRONG!");
920+ dprintfsoup (2, "%ld: ", result);
921+ dprintfsoup (1, "%s\n", result == sum ? "OK!" : "WRONG!");
922 return result == sum;
923 }
924
925@@ -146,7 +146,7 @@ test_countBools (void)
926 gboolean val, ok;
927 GHashTable *result;
928
929- dprintf (1, "countBools (array of boolean -> struct of ints): ");
930+ dprintfsoup (1, "countBools (array of boolean -> struct of ints): ");
931
932 msg = soup_xmlrpc_message_new (uri);
933 soup_xmlrpc_message_start_call (msg, "countBools");
934@@ -154,14 +154,14 @@ test_countBools (void)
935 soup_xmlrpc_message_start_array (msg);
936 for (i = trues = falses = 0; i < 10; i++) {
937 val = rand () > (RAND_MAX / 2);
938- dprintf (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
939+ dprintfsoup (2, "%s%c", i == 0 ? "[" : ", ", val ? 'T' : 'F');
940 soup_xmlrpc_message_write_boolean (msg, val);
941 if (val)
942 trues++;
943 else
944 falses++;
945 }
946- dprintf (2, "] -> ");
947+ dprintfsoup (2, "] -> ");
948 soup_xmlrpc_message_end_array (msg);
949 soup_xmlrpc_message_end_param (msg);
950 soup_xmlrpc_message_end_call (msg);
951@@ -172,19 +172,19 @@ test_countBools (void)
952 value = soup_xmlrpc_response_get_value (response);
953
954 if (!soup_xmlrpc_value_get_struct (value, &result)) {
955- dprintf (1, "wrong type?\n");
956+ dprintfsoup (1, "wrong type?\n");
957 g_object_unref (response);
958 return FALSE;
959 }
960
961 if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "true"), &ret_trues)) {
962- dprintf (1, "NO 'true' value in response\n");
963+ dprintfsoup (1, "NO 'true' value in response\n");
964 g_hash_table_destroy (result);
965 g_object_unref (response);
966 return FALSE;
967 }
968 if (!soup_xmlrpc_value_get_int (g_hash_table_lookup (result, "false"), &ret_falses)) {
969- dprintf (1, "NO 'false' value in response\n");
970+ dprintfsoup (1, "NO 'false' value in response\n");
971 g_hash_table_destroy (result);
972 g_object_unref (response);
973 return FALSE;
974@@ -192,9 +192,9 @@ test_countBools (void)
975 g_hash_table_destroy (result);
976 g_object_unref (response);
977
978- dprintf (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
979+ dprintfsoup (2, "{ true: %ld, false: %ld } ", ret_trues, ret_falses);
980 ok = (trues == ret_trues) && (falses == ret_falses);
981- dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
982+ dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
983 return ok;
984 }
985
986@@ -211,7 +211,7 @@ test_md5sum (void)
987 guchar digest[16];
988 gboolean ok;
989
990- dprintf (1, "md5sum (base64 -> base64): ");
991+ dprintfsoup (1, "md5sum (base64 -> base64): ");
992
993 msg = soup_xmlrpc_message_new (uri);
994 soup_xmlrpc_message_start_call (msg, "md5sum");
995@@ -228,14 +228,14 @@ test_md5sum (void)
996 value = soup_xmlrpc_response_get_value (response);
997
998 if (!soup_xmlrpc_value_get_base64 (value, &result)) {
999- dprintf (1, "wrong type?\n");
1000+ dprintfsoup (1, "wrong type?\n");
1001 g_object_unref (response);
1002 return FALSE;
1003 }
1004 g_object_unref (response);
1005
1006 if (result->len != 16) {
1007- dprintf (1, "result has WRONG length (%d)\n", result->len);
1008+ dprintfsoup (1, "result has WRONG length (%d)\n", result->len);
1009 g_byte_array_free (result, TRUE);
1010 return FALSE;
1011 }
1012@@ -245,7 +245,7 @@ test_md5sum (void)
1013 soup_md5_final (&md5, digest);
1014
1015 ok = (memcmp (digest, result->data, 16) == 0);
1016- dprintf (1, "%s\n", ok ? "OK!" : "WRONG!");
1017+ dprintfsoup (1, "%s\n", ok ? "OK!" : "WRONG!");
1018 g_byte_array_free (result, TRUE);
1019 return ok;
1020 }
1021@@ -260,7 +260,7 @@ test_dateChange (void)
1022 time_t when, result;
1023 char timestamp[128];
1024
1025- dprintf (1, "dateChange (struct of time and ints -> time): ");
1026+ dprintfsoup (1, "dateChange (struct of time and ints -> time): ");
1027
1028 msg = soup_xmlrpc_message_new (uri);
1029 soup_xmlrpc_message_start_call (msg, "dateChange");
1030@@ -281,53 +281,53 @@ test_dateChange (void)
1031
1032 strftime (timestamp, sizeof (timestamp),
1033 "%Y-%m-%dT%H:%M:%S", &tm);
1034- dprintf (2, "{ date: %s", timestamp);
1035+ dprintfsoup (2, "{ date: %s", timestamp);
1036
1037 if (rand () % 3) {
1038 tm.tm_year = 70 + (rand () % 50);
1039- dprintf (2, ", tm_year: %d", tm.tm_year);
1040+ dprintfsoup (2, ", tm_year: %d", tm.tm_year);
1041 soup_xmlrpc_message_start_member (msg, "tm_year");
1042 soup_xmlrpc_message_write_int (msg, tm.tm_year);
1043 soup_xmlrpc_message_end_member (msg);
1044 }
1045 if (rand () % 3) {
1046 tm.tm_mon = rand () % 12;
1047- dprintf (2, ", tm_mon: %d", tm.tm_mon);
1048+ dprintfsoup (2, ", tm_mon: %d", tm.tm_mon);
1049 soup_xmlrpc_message_start_member (msg, "tm_mon");
1050 soup_xmlrpc_message_write_int (msg, tm.tm_mon);
1051 soup_xmlrpc_message_end_member (msg);
1052 }
1053 if (rand () % 3) {
1054 tm.tm_mday = 1 + (rand () % 28);
1055- dprintf (2, ", tm_mday: %d", tm.tm_mday);
1056+ dprintfsoup (2, ", tm_mday: %d", tm.tm_mday);
1057 soup_xmlrpc_message_start_member (msg, "tm_mday");
1058 soup_xmlrpc_message_write_int (msg, tm.tm_mday);
1059 soup_xmlrpc_message_end_member (msg);
1060 }
1061 if (rand () % 3) {
1062 tm.tm_hour = rand () % 24;
1063- dprintf (2, ", tm_hour: %d", tm.tm_hour);
1064+ dprintfsoup (2, ", tm_hour: %d", tm.tm_hour);
1065 soup_xmlrpc_message_start_member (msg, "tm_hour");
1066 soup_xmlrpc_message_write_int (msg, tm.tm_hour);
1067 soup_xmlrpc_message_end_member (msg);
1068 }
1069 if (rand () % 3) {
1070 tm.tm_min = rand () % 60;
1071- dprintf (2, ", tm_min: %d", tm.tm_min);
1072+ dprintfsoup (2, ", tm_min: %d", tm.tm_min);
1073 soup_xmlrpc_message_start_member (msg, "tm_min");
1074 soup_xmlrpc_message_write_int (msg, tm.tm_min);
1075 soup_xmlrpc_message_end_member (msg);
1076 }
1077 if (rand () % 3) {
1078 tm.tm_sec = rand () % 60;
1079- dprintf (2, ", tm_sec: %d", tm.tm_sec);
1080+ dprintfsoup (2, ", tm_sec: %d", tm.tm_sec);
1081 soup_xmlrpc_message_start_member (msg, "tm_sec");
1082 soup_xmlrpc_message_write_int (msg, tm.tm_sec);
1083 soup_xmlrpc_message_end_member (msg);
1084 }
1085 when = soup_mktime_utc (&tm);
1086
1087- dprintf (2, " } -> ");
1088+ dprintfsoup (2, " } -> ");
1089
1090 soup_xmlrpc_message_end_struct (msg);
1091 soup_xmlrpc_message_end_param (msg);
1092@@ -339,7 +339,7 @@ test_dateChange (void)
1093 value = soup_xmlrpc_response_get_value (response);
1094
1095 if (!soup_xmlrpc_value_get_datetime (value, &result)) {
1096- dprintf (1, "wrong type?\n");
1097+ dprintfsoup (1, "wrong type?\n");
1098 g_object_unref (response);
1099 return FALSE;
1100 }
1101@@ -348,9 +348,9 @@ test_dateChange (void)
1102 memset (&tm, 0, sizeof (tm));
1103 soup_gmtime (&result, &tm);
1104 strftime (timestamp, sizeof (timestamp), "%Y-%m-%dT%H:%M:%S", &tm);
1105- dprintf (2, "%s: ", timestamp);
1106+ dprintfsoup (2, "%s: ", timestamp);
1107
1108- dprintf (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
1109+ dprintfsoup (1, "%s\n", (when == result) ? "OK!" : "WRONG!");
1110 return (when == result);
1111 }
1112
1113@@ -372,17 +372,17 @@ test_echo (void)
1114 char *echo;
1115 int i;
1116
1117- dprintf (1, "echo (array of string -> array of string): ");
1118+ dprintfsoup (1, "echo (array of string -> array of string): ");
1119
1120 msg = soup_xmlrpc_message_new (uri);
1121 soup_xmlrpc_message_start_call (msg, "echo");
1122 soup_xmlrpc_message_start_param (msg);
1123 soup_xmlrpc_message_start_array (msg);
1124 for (i = 0; i < N_ECHO_STRINGS; i++) {
1125- dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
1126+ dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo_strings[i]);
1127 soup_xmlrpc_message_write_string (msg, echo_strings[i]);
1128 }
1129- dprintf (2, "] -> ");
1130+ dprintfsoup (2, "] -> ");
1131 soup_xmlrpc_message_end_array (msg);
1132 soup_xmlrpc_message_end_param (msg);
1133 soup_xmlrpc_message_end_call (msg);
1134@@ -393,25 +393,25 @@ test_echo (void)
1135 value = soup_xmlrpc_response_get_value (response);
1136
1137 if (!soup_xmlrpc_value_array_get_iterator (value, &iter)) {
1138- dprintf (1, "wrong type?\n");
1139+ dprintfsoup (1, "wrong type?\n");
1140 g_object_unref (response);
1141 return FALSE;
1142 }
1143 i = 0;
1144 while (iter) {
1145 if (!soup_xmlrpc_value_array_iterator_get_value (iter, &elt)) {
1146- dprintf (1, " WRONG! Can't get result element %d\n", i + 1);
1147+ dprintfsoup (1, " WRONG! Can't get result element %d\n", i + 1);
1148 g_object_unref (response);
1149 return FALSE;
1150 }
1151 if (!soup_xmlrpc_value_get_string (elt, &echo)) {
1152- dprintf (1, " WRONG! Result element %d is not a string", i + 1);
1153+ dprintfsoup (1, " WRONG! Result element %d is not a string", i + 1);
1154 g_object_unref (response);
1155 return FALSE;
1156 }
1157- dprintf (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
1158+ dprintfsoup (2, "%s\"%s\"", i == 0 ? "[" : ", ", echo);
1159 if (strcmp (echo_strings[i], echo) != 0) {
1160- dprintf (1, " WRONG! Mismatch at %d\n", i + 1);
1161+ dprintfsoup (1, " WRONG! Mismatch at %d\n", i + 1);
1162 g_free (echo);
1163 g_object_unref (response);
1164 return FALSE;
1165@@ -421,10 +421,10 @@ test_echo (void)
1166 iter = soup_xmlrpc_value_array_iterator_next (iter);
1167 i++;
1168 }
1169- dprintf (2, "] ");
1170+ dprintfsoup (2, "] ");
1171 g_object_unref (response);
1172
1173- dprintf (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
1174+ dprintfsoup (1, "%s\n", i == N_ECHO_STRINGS ? "OK!" : "WRONG! Too few results");
1175 return i == N_ECHO_STRINGS;
1176 }
1177
1178@@ -480,7 +480,7 @@ main (int argc, char **argv)
1179
1180 apache_cleanup ();
1181
1182- dprintf (1, "\n");
1183+ dprintfsoup (1, "\n");
1184 if (errors) {
1185 printf ("xmlrpc-test: %d error(s). Run with '-d' for details\n",
1186 errors);
diff --git a/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch b/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch
deleted file mode 100644
index c85ec149a2..0000000000
--- a/meta/recipes-support/libsoup/libsoup-2.2.105/fix-for-new-glib.patch
+++ /dev/null
@@ -1,85 +0,0 @@
1Fix for glib-2.0 version 2.32.2
2
3Upstream-Status: Pending
4
5Signed-off-by: Saul Wold <sgw@linux.intel.com>
6
7
8Index: libsoup-2.2.105/libsoup/soup-date.h
9===================================================================
10--- libsoup-2.2.105.orig/libsoup/soup-date.h
11+++ libsoup-2.2.105/libsoup/soup-date.h
12@@ -7,7 +7,7 @@
13 #define SOUP_DATE_H 1
14
15 #include <time.h>
16-#include <glib/gmacros.h>
17+#include <glib.h>
18
19 G_BEGIN_DECLS
20
21Index: libsoup-2.2.105/libsoup/soup-method.h
22===================================================================
23--- libsoup-2.2.105.orig/libsoup/soup-method.h
24+++ libsoup-2.2.105/libsoup/soup-method.h
25@@ -6,7 +6,7 @@
26 #ifndef SOUP_METHOD_H
27 #define SOUP_METHOD_H 1
28
29-#include <glib/gmacros.h>
30+#include <glib.h>
31
32 G_BEGIN_DECLS
33
34Index: libsoup-2.2.105/libsoup/soup-portability.h
35===================================================================
36--- libsoup-2.2.105.orig/libsoup/soup-portability.h
37+++ libsoup-2.2.105/libsoup/soup-portability.h
38@@ -6,7 +6,7 @@
39 #ifndef SOUP_PORTABILITY_H
40 #define SOUP_PORTABILITY_H
41
42-#include <glibconfig.h>
43+#include <glib.h>
44
45 #ifdef G_OS_WIN32
46
47Index: libsoup-2.2.105/libsoup/soup-status.h
48===================================================================
49--- libsoup-2.2.105.orig/libsoup/soup-status.h
50+++ libsoup-2.2.105/libsoup/soup-status.h
51@@ -8,7 +8,7 @@
52 #ifndef SOUP_STATUS_H
53 #define SOUP_STATUS_H 1
54
55-#include <glib/gmacros.h>
56+#include <glib.h>
57
58 G_BEGIN_DECLS
59
60Index: libsoup-2.2.105/libsoup/soup-types.h
61===================================================================
62--- libsoup-2.2.105.orig/libsoup/soup-types.h
63+++ libsoup-2.2.105/libsoup/soup-types.h
64@@ -6,7 +6,7 @@
65 #ifndef SOUP_TYPES_H
66 #define SOUP_TYPES_H 1
67
68-#include <glib/gtypes.h>
69+#include <glib.h>
70 #include <glib-object.h>
71
72 #include <libsoup/soup-status.h>
73Index: libsoup-2.2.105/tests/revserver.c
74===================================================================
75--- libsoup-2.2.105.orig/tests/revserver.c
76+++ libsoup-2.2.105/tests/revserver.c
77@@ -11,7 +11,7 @@
78 #include <libsoup/soup-address.h>
79 #include <libsoup/soup-socket.h>
80
81-#include <glib/gthread.h>
82+#include <glib.h>
83
84 static void rev_read (SoupSocket *sock, GString *buf);
85 static void rev_write (SoupSocket *sock, GString *buf);
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 06:58:07 +0000