From nobody Sat Jun 24 14:19:46 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpGTH1Hmnz4hLmR; Sat, 24 Jun 2023 14:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpGTH0pd6z4Krg; Sat, 24 Jun 2023 14:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687616387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSW72zO0vy4QkYqqNBgzoUsl0/Z845p6U/MQRhSHodk=; b=AxxXMCCEhvOlVlzD/2NK+gdXeDKtnGgh0r1lDhjjfSwaANPNG2XDJMAeMnjHg2U30qdznz mBFijbvSQGN66ws+jWMXp3zgmQGg0uGvmujq+pr+F4nqkhQzKWBOd5x2M6ZhFz6dY5Nr56 pC/oVbAsQsaFGsqzeAtfiA67yotVWGxMFXf8LgaLmiP9N5rcAg2Dk7s+jczTxa/ndYv0ii /CM/sbDrwp9kbHlPIaNsvbcq0rm4Wu2p4HWLAN0h6w0lDTMlgmO6Kqvcsl8vSIJ+1PpsZW /uJBJM/rTZijOi+mNFwbzeyCsPRj2b7PmOLIWR1kYt9s/B8H/BZP1U+ASDOGTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687616387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eSW72zO0vy4QkYqqNBgzoUsl0/Z845p6U/MQRhSHodk=; b=C+7wTKjOGTG/W5dmENoSmPf5nECNfnkrMiukLzm3iDjqoya9Bvdbfg+5raUz/8AJo3csDz /BGK2VGkuP6uLYYnNX2I5/HBc7n3lYFEHYz20fW1DRQyqzUxaJvrgtfLBZYm+aEIfnkRB1 N0giKSP7DZxCp0Hb5pQOuMYP4rDZgCl0NYTtPIr3K4mt0Ln6QrNe2dRLVbkxpWo93grUuW 1DV0dvJC069M/JanUldntLdWtosAyrJ/hTm9fZWZYbHu50QZV8StrsRk5q6fVHBhpfYEB0 5MHSxE3vZighrEvSnn91nASLZFI0381WRTufRPkHKofMsBDFwUDdAxT73AJOdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687616387; a=rsa-sha256; cv=none; b=AHtKAkfPIHSeq8BRihJ7HPZyUrfqYsm7ZyouG5ThA9b2Tb+lSgNnUS8KYBWgWyb3wWqnnY Yk39IgKJeNhIOgWLmzvJPpS04lOvfZmBafPwU+MRMSL7BGrRYPCLFi36rxG03VTgiINAFS gUudfQaj74SQz4fJP/WNeYky1Zkj33ECixK45KTdJWP+NYvhqd6dwJt45BBLyXJ6K6mDbB J/OpFSGVN5/lW5wEFySnjKwnFPshrjJnhOp3LxfKX7lOpmZQUfw9j9vo7W2otI2zACUdvo FGetyySKTkNqyK/23P12GYRcXCWK74GsHD5hD37f9B8ZoAfsTLXXtMF2svPjag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QpGTG6zx4zpZ2; Sat, 24 Jun 2023 14:19:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OEJkV6030148; Sat, 24 Jun 2023 14:19:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OEJkHT030147; Sat, 24 Jun 2023 14:19:46 GMT (envelope-from git) Date: Sat, 24 Jun 2023 14:19:46 GMT Message-Id: <202306241419.35OEJkHT030147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: a71db64dbe83 - main - net-im/libpurple: fix build with clang 16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a71db64dbe83166bf7ff42f6208b0668c76c5c65 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=a71db64dbe83166bf7ff42f6208b0668c76c5c65 commit a71db64dbe83166bf7ff42f6208b0668c76c5c65 Author: Dimitry Andric AuthorDate: 2023-06-24 14:18:52 +0000 Commit: Joe Marcus Clarke 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++; +