[arch-commits] CVS update of extra/network/pidgin (2 files)

[Dan McGee]

    Date: Saturday, December 1, 2007 @ 12:15:20
  Author: dan
    Path: /home/cvs-extra/extra/network/pidgin

   Added: fix-uname-notification.patch (1.1)
Modified: PKGBUILD (1.13 -> 1.14)

fix msn display name bug


------------------------------+
 PKGBUILD                     |   15 ++++++++++-----
 fix-uname-notification.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 5 deletions(-)


Index: extra/network/pidgin/PKGBUILD
diff -u extra/network/pidgin/PKGBUILD:1.13 extra/network/pidgin/PKGBUILD:1.14
--- extra/network/pidgin/PKGBUILD:1.13	Mon Nov 26 23:52:06 2007
+++ extra/network/pidgin/PKGBUILD	Sat Dec  1 12:15:20 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.13 2007/11/27 04:52:06 dan Exp $
+# $Id: PKGBUILD,v 1.14 2007/12/01 17:15:20 dan Exp $
 # Contributor: Lucien Immink <l.immink at student.fnt.hvu.nl>
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=pidgin
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,19 +16,24 @@
 provides=('gaim')
 options=(!libtool)
 install=pidgin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 iconv-fix.patch)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+        iconv-fix.patch
+        fix-uname-notification.patch)
 md5sums=('0456e63358c8be7a905f9a8ca6494088'
-         'de084bf1e2f345eada74671787256b74')
+         'de084bf1e2f345eada74671787256b74'
+         '8c10dc7a7ca6f25adddb11288ed2f168')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
 
   # fix some weird autoconf substitution bug, should report this upstream
   patch -p0 < ../iconv-fix.patch || return 1
+  # fix MSN display name bug (Pidgin bug #4062, fixed in 2.3.1)
+  patch -p0 < ../fix-uname-notification.patch || return 1
 
   # gconf won't die with the --disable-schemas-install option
-  #  unfortunately this makes configure run twice, but oh well
   sed -i -e 's/gconftool-2/no/g' configure.ac
+  autoconf || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --disable-perl --disable-cap \
               --disable-schemas-install \
Index: extra/network/pidgin/fix-uname-notification.patch
diff -u /dev/null extra/network/pidgin/fix-uname-notification.patch:1.1
--- /dev/null	Sat Dec  1 12:15:21 2007
+++ extra/network/pidgin/fix-uname-notification.patch	Sat Dec  1 12:15:20 2007
@@ -0,0 +1,40 @@
+#
+#
+# patch "libpurple/protocols/msnp9/notification.c"
+#  from [dd690580185c00b68db4240fd22732b5e3770c36]
+#    to [83db9e1346bfbee5a95f55cfe10508d78fdac196]
+#
+============================================================
+--- libpurple/protocols/msnp9/notification.c	dd690580185c00b68db4240fd22732b5e3770c36
++++ libpurple/protocols/msnp9/notification.c	83db9e1346bfbee5a95f55cfe10508d78fdac196
+@@ -780,14 +780,27 @@ rea_cmd(MsnCmdProc *cmdproc, MsnCommand
+ static void
+ rea_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+ {
+-	/* TODO: This might be for us too */
+-
+ 	MsnSession *session;
++	PurpleAccount *account;
+ 	PurpleConnection *gc;
+ 	const char *friendly;
++	char *username;
+
+ 	session = cmdproc->session;
+-	gc = session->account->gc;
++	account = session->account;
++	username = g_strdup(purple_normalize(account,
++						purple_account_get_username(account)));
++
++	/* Only set display name if our *own* friendly name changed! */
++	if (strcmp(username, purple_normalize(account, cmd->params[2])))
++	{
++		g_free(username);
++		return;
++	}
++
++	g_free(username);
++
++	gc = account->gc;
+ 	friendly = purple_url_decode(cmd->params[3]);
+
+ 	purple_connection_set_display_name(gc, friendly);