diff --git a/x11-packages/pidgin/build.sh b/x11-packages/pidgin/build.sh index 07e566e2d3..a90e978b12 100644 --- a/x11-packages/pidgin/build.sh +++ b/x11-packages/pidgin/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://pidgin.im/ TERMUX_PKG_DESCRIPTION="Multi-protocol instant messaging client" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.14.12 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION="2.14.13" TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/pidgin/pidgin-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=2b05246be208605edbb93ae9edc079583d449e2a9710db6d348d17f59020a4b7 +TERMUX_PKG_SHA256=120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8 TERMUX_PKG_DEPENDS="atk, dbus, dbus-glib, fontconfig, freetype, gdk-pixbuf, glib, gstreamer, gtk2, harfbuzz, libcairo, libgnt, libgnutls, libice, libidn, libsasl, libsm, libx11, libxcomposite, libxcursor, libxdamage, libxext, libxfixes, libxinerama, libxml2, libxrandr, libxrender, libxss, ncurses, pango, tcl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/x11-packages/pidgin/sasl_callback-proc.patch b/x11-packages/pidgin/sasl_callback-proc.patch deleted file mode 100644 index f5c86c2c3d..0000000000 --- a/x11-packages/pidgin/sasl_callback-proc.patch +++ /dev/null @@ -1,69 +0,0 @@ -https://github.com/termux/termux-packages/issues/15852 - ---- a/libpurple/protocols/irc/msgs.c -+++ b/libpurple/protocols/irc/msgs.c -@@ -1622,22 +1622,22 @@ - 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++; - ---- a/libpurple/protocols/jabber/auth_cyrus.c -+++ b/libpurple/protocols/jabber/auth_cyrus.c -@@ -373,30 +373,30 @@ - - 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++; -