From 2787bccf56177dcb9302f9576188844ce226130d Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 23 Sep 2010 13:55:53 +0000 Subject: [PATCH] - remove unneeded patches which would be hard to maintain with future updates --- .../patch-lib_ext_wocky_tests_Makefile_in | 5 +- ...lib_ext_wocky_tests_wocky-connector-test_c | 12 ---- ..._wocky_tests_wocky-test-connector-server_c | 12 ---- ...t_wocky_tests_wocky-xmpp-connection-test_c | 57 ----------------- ...xt_wocky_tests_wocky-xmpp-readwrite-test_c | 21 ------- .../patch-lib_ext_wocky_wocky_Makefile_in | 15 +++++ ...ext_wocky_wocky_wocky-jabber-auth-digest_c | 12 ---- ...ch-lib_ext_wocky_wocky_wocky-jabber-auth_c | 21 ------- .../patch-lib_ext_wocky_wocky_wocky-muc_c | 39 ------------ .../patch-lib_ext_wocky_wocky_wocky-node_c | 12 ---- ...ch-lib_ext_wocky_wocky_wocky-pep-service_c | 21 ------- .../patch-lib_ext_wocky_wocky_wocky-ping_c | 30 --------- .../patch-lib_ext_wocky_wocky_wocky-porter_c | 25 -------- ...lib_ext_wocky_wocky_wocky-pubsub-helpers_c | 12 ---- ...ch-lib_ext_wocky_wocky_wocky-pubsub-node_c | 12 ---- ...lib_ext_wocky_wocky_wocky-pubsub-service_c | 12 ---- .../patch-lib_ext_wocky_wocky_wocky-roster_c | 63 ------------------- ...-lib_ext_wocky_wocky_wocky-tls-connector_c | 21 ------- .../patch-lib_ext_wocky_wocky_wocky-tls_c | 12 ---- ...ib_ext_wocky_wocky_wocky-xmpp-connection_c | 28 --------- 20 files changed, 19 insertions(+), 423 deletions(-) delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-connector-server_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-connection-test_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c create mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_Makefile_in delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth-digest_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-muc_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-node_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pep-service_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-ping_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-porter_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-helpers_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-node_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-service_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-roster_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls-connector_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls_c delete mode 100644 net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_Makefile_in b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_Makefile_in index 9162c0d2ad0..6a2161146a0 100644 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_Makefile_in +++ b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_Makefile_in @@ -1,4 +1,7 @@ -$OpenBSD: patch-lib_ext_wocky_tests_Makefile_in,v 1.1 2010/09/23 13:37:12 jasper Exp $ +$OpenBSD: patch-lib_ext_wocky_tests_Makefile_in,v 1.2 2010/09/23 13:55:53 jasper Exp $ + +Don't enable all the warnings, prevents dozens of patches for NULL -> (void *)0. + --- lib/ext/wocky/tests/Makefile.in.orig Wed Sep 22 16:50:28 2010 +++ lib/ext/wocky/tests/Makefile.in Wed Sep 22 16:50:48 2010 @@ -295,7 +295,7 @@ ECHO_N = @ECHO_N@ diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test_c deleted file mode 100644 index 7d2d61ad3b6..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-connector-test_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_tests_wocky-connector-test_c,v 1.1 2010/05/28 09:19:53 espie Exp $ ---- lib/ext/wocky/tests/wocky-connector-test.c.orig Mon May 24 11:20:50 2010 -+++ lib/ext/wocky/tests/wocky-connector-test.c Mon May 24 11:22:07 2010 -@@ -73,6 +73,8 @@ - - #define OK 0 - #define CONNECTOR_OK { OK, OK, OK, OK, OK, OK } -+#undef NULL -+#define NULL (void *)0 - - gboolean running_test = FALSE; - static GError *error = NULL; diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-connector-server_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-connector-server_c deleted file mode 100644 index f2fa6fbca68..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-test-connector-server_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_tests_wocky-test-connector-server_c,v 1.2 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/tests/wocky-test-connector-server.c.orig Tue Jun 15 16:05:18 2010 -+++ lib/ext/wocky/tests/wocky-test-connector-server.c Wed Sep 22 16:34:48 2010 -@@ -590,7 +590,7 @@ iq_set_query_JABBER_AUTH (TestConnectorServer *self, - } - else if (sha1hash != NULL) - { -- gchar *hsrc = g_strconcat (INITIAL_STREAM_ID, priv->pass, NULL); -+ gchar *hsrc = g_strconcat (INITIAL_STREAM_ID, priv->pass, (void *)0); - gchar *sha1 = g_compute_checksum_for_string (G_CHECKSUM_SHA1, hsrc, -1); - DEBUG ("checksum: %s vs %s", sha1, sha1hash->content); - if (wocky_strdiff (priv->user, username->content) || diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-connection-test_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-connection-test_c deleted file mode 100644 index 68c1ae9adb2..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-connection-test_c +++ /dev/null @@ -1,57 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_tests_wocky-xmpp-connection-test_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/tests/wocky-xmpp-connection-test.c.orig Wed Sep 22 16:48:15 2010 -+++ lib/ext/wocky/tests/wocky-xmpp-connection-test.c Wed Sep 22 16:49:04 2010 -@@ -167,7 +167,7 @@ test_send_simple_message (void) - '$', "Art thou not Romeo, and a Montague?", - ')', - ')', -- NULL); -+ (void *)0); - - wocky_xmpp_connection_send_stanza_async (WOCKY_XMPP_CONNECTION (test->in), - s, NULL, send_stanza_cb, test); -@@ -355,7 +355,7 @@ test_error_pending_send_pending (test_data_t *test) - WockyStanza *stanza; - - stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, -- WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", NULL); -+ WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", (void *)0); - - /* should get a _PENDING error */ - wocky_xmpp_connection_send_open_async (test->in, NULL, NULL, NULL, NULL, NULL, -@@ -381,7 +381,7 @@ test_error_pending (void) - WockyStanza *stanza; - - stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, -- WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", NULL); -+ WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", (void *)0); - - wocky_xmpp_connection_recv_open_async (test->out, NULL, - error_pending_open_received_cb, test); -@@ -508,7 +508,7 @@ test_error_not_open (void) - WockyStanza *stanza; - - stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, -- WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", NULL); -+ WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", (void *)0); - - wocky_xmpp_connection_send_stanza_async (test->in, stanza, NULL, - error_not_open_send_stanza_cb, test); -@@ -734,7 +734,7 @@ test_error_is_open_or_closed (void) - WockyStanza *stanza; - - stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, -- WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", NULL); -+ WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", (void *)0); - - - wocky_xmpp_connection_send_open_async (WOCKY_XMPP_CONNECTION (test->in), -@@ -807,7 +807,7 @@ test_recv_cancel (void) - test_open_connection (test); - - stanza = wocky_stanza_build (WOCKY_STANZA_TYPE_MESSAGE, -- WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", NULL); -+ WOCKY_STANZA_SUB_TYPE_CHAT, "a"," b", (void *)0); - - cancellable = g_cancellable_new (); - diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c deleted file mode 100644 index 5dcb35296b1..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_tests_wocky-xmpp-readwrite-test_c,v 1.2 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/tests/wocky-xmpp-readwrite-test.c.orig Tue Jun 15 16:05:18 2010 -+++ lib/ext/wocky/tests/wocky-xmpp-readwrite-test.c Wed Sep 22 16:48:06 2010 -@@ -30,7 +30,7 @@ create_stanza (void) - '$', "Art thou not Romeo, and a Montague?", - ')', - ')', -- NULL); -+ (void *)0); - - html = wocky_node_get_child (wocky_stanza_get_top_node (stanza), "html"); - head = wocky_node_add_child (html, "head"); -@@ -68,7 +68,7 @@ test_readwrite (void) - "from", &from, - "version", &version, - "lang", &lang, -- NULL); -+ (void *)0); - - g_assert (!wocky_strdiff (to, TO)); - g_assert (!wocky_strdiff (from, FROM)); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_Makefile_in b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_Makefile_in new file mode 100644 index 00000000000..2a4fef72544 --- /dev/null +++ b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_Makefile_in @@ -0,0 +1,15 @@ +$OpenBSD: patch-lib_ext_wocky_wocky_Makefile_in,v 1.1 2010/09/23 13:55:53 jasper Exp $ + +Don't enable all the warnings, prevents dozens of patches for NULL -> (void *)0. + +--- lib/ext/wocky/wocky/Makefile.in.orig Thu Sep 23 15:50:44 2010 ++++ lib/ext/wocky/wocky/Makefile.in Thu Sep 23 15:50:53 2010 +@@ -238,7 +238,7 @@ ECHO_N = @ECHO_N@ + ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + ENABLE_CODING_STYLE_CHECKS = @ENABLE_CODING_STYLE_CHECKS@ +-ERROR_CFLAGS = @ERROR_CFLAGS@ ++ERROR_CFLAGS = + EXEEXT = @EXEEXT@ + FFLAGS = @FFLAGS@ + FGREP = @FGREP@ diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth-digest_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth-digest_c deleted file mode 100644 index 7d593da96fb..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth-digest_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-jabber-auth-digest_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-jabber-auth-digest.c.orig Wed Sep 22 16:38:41 2010 -+++ lib/ext/wocky/wocky/wocky-jabber-auth-digest.c Wed Sep 22 16:39:03 2010 -@@ -136,7 +136,7 @@ wocky_jabber_auth_digest_new (const gchar *session_id, - static GString * - digest_generate_initial_response (const gchar *session_id, const gchar *password) - { -- gchar *hsrc = g_strconcat (session_id, password, NULL); -+ gchar *hsrc = g_strconcat (session_id, password, (void *)0); - gchar *sha1 = g_compute_checksum_for_string (G_CHECKSUM_SHA1, hsrc, -1); - GString *response = g_string_new (sha1); - diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth_c deleted file mode 100644 index 7b4c891462f..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-jabber-auth_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-jabber-auth_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-jabber-auth.c.orig Wed Sep 22 16:38:10 2010 -+++ lib/ext/wocky/wocky/wocky-jabber-auth.c Wed Sep 22 16:38:29 2010 -@@ -504,7 +504,7 @@ wocky_jabber_auth_start_cb (GObject *source, - '(', auth_field, '$', start_data->initial_response->str, ')', - '(', "resource", '$', priv->resource, ')', - ')', -- NULL); -+ (void *)0); - - wocky_xmpp_connection_send_stanza_async (conn, iq, priv->cancel, - jabber_auth_query, self); -@@ -655,7 +655,7 @@ wocky_jabber_auth_authenticate_async (WockyJabberAuth - '$', priv->username, - ')', - ')', -- NULL); -+ (void *)0); - - wocky_xmpp_connection_send_stanza_async (conn, iq, priv->cancel, - jabber_auth_init_sent, self); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-muc_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-muc_c deleted file mode 100644 index 968e2aadc7b..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-muc_c +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-muc_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-muc.c.orig Wed Sep 22 16:39:16 2010 -+++ lib/ext/wocky/wocky/wocky-muc.c Wed Sep 22 16:39:52 2010 -@@ -782,7 +782,7 @@ wocky_muc_disco_info_async (WockyMuc *muc, - '(', "query", - ':', NS_DISCO_INFO, - ')', -- NULL); -+ (void *)0); - - result = g_simple_async_result_new (G_OBJECT (muc), callback, data, - wocky_muc_disco_info_finish); -@@ -807,7 +807,7 @@ wocky_muc_create_presence (WockyMuc *muc, - type, - priv->user, - priv->jid, -- NULL); -+ (void *)0); - WockyNode *presence = wocky_stanza_get_top_node (stanza); - WockyNode *x = wocky_node_add_child_ns (presence, - "x", WOCKY_NS_MUC); -@@ -860,7 +860,7 @@ register_presence_handler (WockyMuc *muc) - priv->rjid, - WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, - handle_presence, muc, -- NULL); -+ (void *)0); - - return priv->pres_handler; - } -@@ -879,7 +879,7 @@ register_message_handler (WockyMuc *muc) - priv->rjid, - WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, - handle_message, muc, -- NULL); -+ (void *)0); - - return priv->mesg_handler; - } diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-node_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-node_c deleted file mode 100644 index 36d58e38e67..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-node_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-node_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-node.c.orig Wed Sep 22 16:40:10 2010 -+++ lib/ext/wocky/wocky/wocky-node.c Wed Sep 22 16:40:22 2010 -@@ -876,7 +876,7 @@ wocky_node_append_content (WockyNode *node, - const gchar *content) - { - gchar *t = node->content; -- node->content = g_strconcat (t, content, NULL); -+ node->content = g_strconcat (t, content, (void *)0); - g_free (t); - } - diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pep-service_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pep-service_c deleted file mode 100644 index 949a860ccb4..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pep-service_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-pep-service_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-pep-service.c.orig Wed Sep 22 16:40:50 2010 -+++ lib/ext/wocky/wocky/wocky-pep-service.c Wed Sep 22 16:41:08 2010 -@@ -268,7 +268,7 @@ wocky_pep_service_start (WockyPepService *self, - '@', "node", priv->node, - ')', - ')', -- NULL); -+ (void *)0); - - /* TODO: subscribe to node if needed */ - } -@@ -327,7 +327,7 @@ wocky_pep_service_get_async (WockyPepService *self, - '(', "items", - '@', "node", priv->node, - ')', -- ')', NULL); -+ ')', (void *)0); - - result = g_simple_async_result_new (G_OBJECT (self), - callback, user_data, wocky_pep_service_get_finish); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-ping_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-ping_c deleted file mode 100644 index 525faa6d7fe..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-ping_c +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-ping_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-ping.c.orig Wed Sep 22 16:41:31 2010 -+++ lib/ext/wocky/wocky/wocky-ping.c Wed Sep 22 16:41:59 2010 -@@ -133,7 +133,7 @@ wocky_ping_constructed (GObject *object) - WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, ping_iq_cb, self, - '(', "ping", - ':', WOCKY_XMPP_NS_PING, -- ')', NULL); -+ ')', (void *)0); - } - - static void -@@ -216,7 +216,7 @@ send_xmpp_ping (WockyPing *self) - WOCKY_STANZA_SUB_TYPE_GET, NULL, NULL, - '(', "ping", - ':', WOCKY_XMPP_NS_PING, -- ')', NULL); -+ ')', (void *)0); - - wocky_porter_send_iq_async (priv->porter, iq, NULL, NULL, NULL); - g_object_unref (iq); -@@ -272,7 +272,7 @@ ping_iq_cb (WockyPorter *porter, WockyStanza *stanza, - - /* As a side-effect of sending pong, our keepalive timer will be - * reset, so we don't have to do it manually. */ -- reply = wocky_stanza_build_iq_result (stanza, NULL); -+ reply = wocky_stanza_build_iq_result (stanza, (void *)0); - wocky_porter_send (porter, reply); - g_object_unref (reply); - diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-porter_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-porter_c deleted file mode 100644 index d36942d7df7..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-porter_c +++ /dev/null @@ -1,25 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-porter_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-porter.c.orig Wed Sep 22 16:42:11 2010 -+++ lib/ext/wocky/wocky/wocky-porter.c Wed Sep 22 16:42:34 2010 -@@ -445,18 +445,18 @@ wocky_porter_constructed (GObject *object) - wocky_porter_register_handler (self, - WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_RESULT, NULL, - WOCKY_PORTER_HANDLER_PRIORITY_MAX, -- handle_iq_reply, self, NULL); -+ handle_iq_reply, self, (void *)0); - - wocky_porter_register_handler (self, - WOCKY_STANZA_TYPE_IQ, WOCKY_STANZA_SUB_TYPE_ERROR, NULL, - WOCKY_PORTER_HANDLER_PRIORITY_MAX, -- handle_iq_reply, self, NULL); -+ handle_iq_reply, self, (void *)0); - - /* Register the stream error handler */ - wocky_porter_register_handler (self, - WOCKY_STANZA_TYPE_STREAM_ERROR, WOCKY_STANZA_SUB_TYPE_NONE, NULL, - WOCKY_PORTER_HANDLER_PRIORITY_MAX, -- handle_stream_error, self, NULL); -+ handle_stream_error, self, (void *)0); - } - - static void diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-helpers_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-helpers_c deleted file mode 100644 index 4cadcef1f8e..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-helpers_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-pubsub-helpers_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-pubsub-helpers.c.orig Wed Sep 22 16:42:51 2010 -+++ lib/ext/wocky/wocky/wocky-pubsub-helpers.c Wed Sep 22 16:43:02 2010 -@@ -102,7 +102,7 @@ wocky_pubsub_make_stanza ( - '*', &action, - ')', - ')', -- NULL); -+ (void *)0); - - if (pubsub_node != NULL) - *pubsub_node = pubsub; diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-node_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-node_c deleted file mode 100644 index 68fdc35fbff..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-node_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-pubsub-node_c,v 1.2 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-pubsub-node.c.orig Fri Sep 10 13:37:39 2010 -+++ lib/ext/wocky/wocky/wocky-pubsub-node.c Wed Sep 22 16:34:48 2010 -@@ -158,7 +158,7 @@ wocky_pubsub_node_constructed (GObject *object) - g_object_get (priv->service, - "jid", &(priv->service_jid), - "session", &session, -- NULL); -+ (void *)0); - g_assert (priv->service_jid != NULL); - - g_assert (session != NULL); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-service_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-service_c deleted file mode 100644 index 0e55fb64586..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-pubsub-service_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-pubsub-service_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-pubsub-service.c.orig Wed Sep 22 16:43:23 2010 -+++ lib/ext/wocky/wocky/wocky-pubsub-service.c Wed Sep 22 16:43:37 2010 -@@ -224,7 +224,7 @@ wocky_pubsub_service_constructed (GObject *object) - ':', WOCKY_XMPP_NS_PUBSUB_EVENT, - '(', m->action, ')', - ')', -- NULL); -+ (void *)0); - - g_ptr_array_add (priv->trampolines, t); - } diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-roster_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-roster_c deleted file mode 100644 index 6197e8e7d9a..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-roster_c +++ /dev/null @@ -1,63 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-roster_c,v 1.2 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-roster.c.orig Tue Jun 15 16:05:18 2010 -+++ lib/ext/wocky/wocky/wocky-roster.c Wed Sep 22 16:55:04 2010 -@@ -497,7 +497,7 @@ roster_update (WockyRoster *self, - "name", wocky_node_get_attribute (n, "name"), - "subscription", subscription_type, - "groups", groups, -- NULL); -+ (void *)0); - - g_hash_table_insert (priv->items, g_strdup (jid), contact); - -@@ -539,12 +539,12 @@ roster_iq_handler_set_cb (WockyPorter *porter, - DEBUG ("Failed to update roster: %s", - error ? error->message : "no message"); - g_error_free (error); -- reply = wocky_stanza_build_iq_error (stanza, NULL); -+ reply = wocky_stanza_build_iq_error (stanza, (void *)0); - } - else - { - /* ack */ -- reply = wocky_stanza_build_iq_result (stanza, NULL); -+ reply = wocky_stanza_build_iq_result (stanza, (void *)0); - } - - wocky_porter_send (porter, reply); -@@ -576,7 +576,7 @@ wocky_roster_constructed (GObject *object) - WOCKY_PORTER_HANDLER_PRIORITY_NORMAL, roster_iq_handler_set_cb, self, - '(', "query", - ':', WOCKY_XMPP_NS_ROSTER, -- ')', NULL); -+ ')', (void *)0); - - priv->contact_factory = wocky_session_get_contact_factory (priv->session); - g_assert (priv->contact_factory != NULL); -@@ -723,7 +723,7 @@ wocky_roster_fetch_roster_async (WockyRoster *self, - '(', "query", - ':', WOCKY_XMPP_NS_ROSTER, - ')', -- NULL); -+ (void *)0); - - priv->fetch_result = g_simple_async_result_new (G_OBJECT (self), - callback, user_data, wocky_roster_fetch_roster_finish); -@@ -799,7 +799,7 @@ build_iq_for_contact (WockyBareContact *contact, - '@', "jid", jid, - ')', - ')', -- NULL); -+ (void *)0); - - g_assert (item != NULL); - -@@ -843,7 +843,7 @@ build_remove_contact_iq (WockyBareContact *contact) - '@', "subscription", "remove", - ')', - ')', -- NULL); -+ (void *)0); - } - - static WockyStanza * diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls-connector_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls-connector_c deleted file mode 100644 index b7ffa957944..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls-connector_c +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-tls-connector_c,v 1.1 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-tls-connector.c.orig Wed Sep 22 16:47:03 2010 -+++ lib/ext/wocky/wocky/wocky-tls-connector.c Wed Sep 22 16:47:25 2010 -@@ -236,7 +236,7 @@ do_handshake (WockyTLSConnector *self) - { - GIOStream *base_stream = NULL; - -- g_object_get (self->priv->connection, "base-stream", &base_stream, NULL); -+ g_object_get (self->priv->connection, "base-stream", &base_stream, (void *)0); - g_assert (base_stream != NULL); - - self->priv->session = wocky_tls_session_new (base_stream); -@@ -368,7 +368,7 @@ starttls_recv_cb (GObject *source, - { - GIOStream *base_stream = NULL; - -- g_object_get (self->priv->connection, "base-stream", &base_stream, NULL); -+ g_object_get (self->priv->connection, "base-stream", &base_stream, (void *)0); - g_assert (base_stream != NULL); - - self->priv->session = wocky_tls_session_new (base_stream); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls_c deleted file mode 100644 index b28de23f12b..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-tls_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-tls_c,v 1.1 2010/05/28 09:19:53 espie Exp $ ---- lib/ext/wocky/wocky/wocky-tls.c.orig Mon May 24 11:18:53 2010 -+++ lib/ext/wocky/wocky/wocky-tls.c Mon May 24 11:19:36 2010 -@@ -528,7 +528,7 @@ add_certfiles (gnutls_certificate_credentials cred, - for (entry = readdir (dir); entry != NULL; entry = readdir (dir)) - { - struct stat file; -- gchar *path = g_build_path ("/", thing, entry->d_name, NULL); -+ gchar *path = g_build_path ("/", thing, entry->d_name, (char *)0); - - if ((stat (path, &file) == 0) && S_ISREG (file.st_mode)) - n += add (cred, path, GNUTLS_X509_FMT_PEM); diff --git a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c b/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c deleted file mode 100644 index ea5fb24bf73..00000000000 --- a/net/telepathy/telepathy-gabble/patches/patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-lib_ext_wocky_wocky_wocky-xmpp-connection_c,v 1.2 2010/09/23 13:37:12 jasper Exp $ ---- lib/ext/wocky/wocky/wocky-xmpp-connection.c.orig Tue Jun 15 16:05:18 2010 -+++ lib/ext/wocky/wocky/wocky-xmpp-connection.c Wed Sep 22 16:34:48 2010 -@@ -637,19 +637,19 @@ wocky_xmpp_connection_recv_open_finish (WockyXmppConne - priv->input_open = TRUE; - - if (to != NULL) -- g_object_get (priv->reader, "to", to, NULL); -+ g_object_get (priv->reader, "to", to, (void *)0); - - if (from != NULL) -- g_object_get (priv->reader, "from", from, NULL); -+ g_object_get (priv->reader, "from", from, (void *)0); - - if (version != NULL) -- g_object_get (priv->reader, "version", version, NULL); -+ g_object_get (priv->reader, "version", version, (void *)0); - - if (lang != NULL) -- g_object_get (priv->reader, "lang", lang, NULL); -+ g_object_get (priv->reader, "lang", lang, (void *)0); - - if (id != NULL) -- g_object_get (priv->reader, "id", id, NULL); -+ g_object_get (priv->reader, "id", id, (void *)0); - - return TRUE; - }