Date: Sat, 24 Jun 2023 14:19:46 GMT From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a71db64dbe83 - main - net-im/libpurple: fix build with clang 16 Message-ID: <202306241419.35OEJkHT030147@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=a71db64dbe83166bf7ff42f6208b0668c76c5c65 commit a71db64dbe83166bf7ff42f6208b0668c76c5c65 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2023-06-24 14:18:52 +0000 Commit: Joe Marcus Clarke <marcus@FreeBSD.org> CommitDate: 2023-06-24 14:19:44 +0000 net-im/libpurple: fix build with clang 16 PR: 272103 --- .../files/patch-libpurple_protocols_irc_msgs.c | 29 +++++++++++++++++ .../patch-libpurple_protocols_jabber_auth__cyrus.c | 38 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/net-im/libpurple/files/patch-libpurple_protocols_irc_msgs.c b/net-im/libpurple/files/patch-libpurple_protocols_irc_msgs.c new file mode 100644 index 000000000000..06ccf513a645 --- /dev/null +++ b/net-im/libpurple/files/patch-libpurple_protocols_irc_msgs.c @@ -0,0 +1,29 @@ +--- libpurple/protocols/irc/msgs.c.orig 2022-05-31 01:52:30 UTC ++++ libpurple/protocols/irc/msgs.c +@@ -1622,22 +1622,22 @@ irc_msg_cap(struct irc_conn *irc, const char *name, co + irc->sasl_cb = g_new0(sasl_callback_t, 5); + + irc->sasl_cb[id].id = SASL_CB_AUTHNAME; +- irc->sasl_cb[id].proc = irc_sasl_cb_simple; ++ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_simple; + irc->sasl_cb[id].context = (void *)irc; + id++; + + irc->sasl_cb[id].id = SASL_CB_USER; +- irc->sasl_cb[id].proc = irc_sasl_cb_simple; ++ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_simple; + irc->sasl_cb[id].context = (void *)irc; + id++; + + irc->sasl_cb[id].id = SASL_CB_PASS; +- irc->sasl_cb[id].proc = irc_sasl_cb_secret; ++ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_secret; + irc->sasl_cb[id].context = (void *)irc; + id++; + + irc->sasl_cb[id].id = SASL_CB_LOG; +- irc->sasl_cb[id].proc = irc_sasl_cb_log; ++ irc->sasl_cb[id].proc = (int(*)(void))irc_sasl_cb_log; + irc->sasl_cb[id].context = (void *)irc; + id++; + diff --git a/net-im/libpurple/files/patch-libpurple_protocols_jabber_auth__cyrus.c b/net-im/libpurple/files/patch-libpurple_protocols_jabber_auth__cyrus.c new file mode 100644 index 000000000000..984396f6be74 --- /dev/null +++ b/net-im/libpurple/files/patch-libpurple_protocols_jabber_auth__cyrus.c @@ -0,0 +1,38 @@ +--- libpurple/protocols/jabber/auth_cyrus.c.orig 2021-12-21 02:44:53 UTC ++++ libpurple/protocols/jabber/auth_cyrus.c +@@ -373,30 +373,30 @@ jabber_sasl_build_callbacks(JabberStream *js) + + id = 0; + js->sasl_cb[id].id = SASL_CB_GETREALM; +- js->sasl_cb[id].proc = jabber_sasl_cb_realm; ++ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_realm; + js->sasl_cb[id].context = (void *)js; + id++; + + js->sasl_cb[id].id = SASL_CB_AUTHNAME; +- js->sasl_cb[id].proc = jabber_sasl_cb_simple; ++ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_simple; + js->sasl_cb[id].context = (void *)js; + id++; + + js->sasl_cb[id].id = SASL_CB_USER; +- js->sasl_cb[id].proc = jabber_sasl_cb_simple; ++ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_simple; + js->sasl_cb[id].context = (void *)js; + id++; + + account = purple_connection_get_account(js->gc); + if (purple_account_get_password(account) != NULL ) { + js->sasl_cb[id].id = SASL_CB_PASS; +- js->sasl_cb[id].proc = jabber_sasl_cb_secret; ++ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_secret; + js->sasl_cb[id].context = (void *)js; + id++; + } + + js->sasl_cb[id].id = SASL_CB_LOG; +- js->sasl_cb[id].proc = jabber_sasl_cb_log; ++ js->sasl_cb[id].proc = (int(*)(void))jabber_sasl_cb_log; + js->sasl_cb[id].context = (void*)js; + id++; +home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306241419.35OEJkHT030147>