Date: Thursday, May 13, 2010 @ 01:33:52 Author: ibiru Revision: 80152
upgpkg: pidgin 2.7.0-1 update to 2.7.0 Added: pidgin/trunk/msn_fix.patch Modified: pidgin/trunk/PKGBUILD ---------------+ PKGBUILD | 14 ++++++++------ msn_fix.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-05-12 22:59:20 UTC (rev 80151) +++ PKGBUILD 2010-05-13 05:33:52 UTC (rev 80152) @@ -6,7 +6,7 @@ pkgbase=('pidgin') pkgname=('libpurple' 'pidgin' 'finch') -pkgver=2.6.6 +pkgver=2.7.0 pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" @@ -15,12 +15,15 @@ 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10-base' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('6ebbe9d339246dfebb244e4c855c4feb678f120d1024ef2ee269e2fde77b2ad9') +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2 + msn_fix.patch) +sha256sums=('dc59cbae75db8ecf2850c35e82fc11ac33bbf2542e901e6e1e4525688635783d' + '1910ea7dd816d3e9b123fa9dc204ad586396a820ae3c870a6aa15dd1eff0ad49') build() { cd "$srcdir/$pkgbase-$pkgver" + patch -Np0 -i "${srcdir}/msn_fix.patch" || return 1 ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-schemas-install \ @@ -35,8 +38,7 @@ } package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') - optdepends=('cyrus-sasl-plugins: needed for facebook xmpp authentication') + depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plugins') cd "$srcdir/$pkgbase-$pkgver" for dir in libpurple share/sounds share/ca-certs m4macros po @@ -73,7 +75,7 @@ } package_finch(){ pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver" 'libidn') + depends=("libpurple=$pkgver" 'python') optdepends=('avahi: Bonjour protocol support' 'tk: Tcl/Tk scripting support' 'ca-certificates: SSL CA certificates') Added: msn_fix.patch =================================================================== --- msn_fix.patch (rev 0) +++ msn_fix.patch 2010-05-13 05:33:52 UTC (rev 80152) @@ -0,0 +1,28 @@ +# +# +# patch "libpurple/protocols/msn/slplink.c" +# from [a96a53635871463de0177e5a99fe4ebdc2c7d577] +# to [87ada76abf90c44e615679efc5f8128bb941bba1] +# +============================================================ +--- libpurple/protocols/msn/slplink.c a96a53635871463de0177e5a99fe4ebdc2c7d577 ++++ libpurple/protocols/msn/slplink.c 87ada76abf90c44e615679efc5f8128bb941bba1 +@@ -383,6 +383,7 @@ msn_slplink_release_slpmsg(MsnSlpLink *s + msn_slplink_release_slpmsg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg) + { + MsnMessage *msg; ++ const char *passport; + + slpmsg->msg = msg = msn_message_new_msnslp(); + +@@ -421,7 +422,8 @@ msn_slplink_release_slpmsg(MsnSlpLink *s + + msg->msnslp_header.total_size = slpmsg->size; + +- msn_message_set_attr(msg, "P2P-Dest", slplink->remote_user); ++ passport = purple_normalize(slplink->session->account, slplink->remote_user); ++ msn_message_set_attr(msg, "P2P-Dest", passport); + + msg->ack_cb = msg_ack; + msg->nak_cb = msg_nak; +