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

[Simo Leone]

    Date: Sunday, December 16, 2007 @ 23:22:20
  Author: simo
    Path: /home/cvs-extra/extra/network/pidgin

Modified: PKGBUILD (1.14 -> 1.15)
 Removed: fix-uname-notification.patch (1.1)

upgpkg: pidgin 2.3.1-1


------------------------------+
 PKGBUILD                     |   17 ++++++-----------
 fix-uname-notification.patch |   40 ----------------------------------------
 2 files changed, 6 insertions(+), 51 deletions(-)


Index: extra/network/pidgin/PKGBUILD
diff -u extra/network/pidgin/PKGBUILD:1.14 extra/network/pidgin/PKGBUILD:1.15
--- extra/network/pidgin/PKGBUILD:1.14	Sat Dec  1 12:15:20 2007
+++ extra/network/pidgin/PKGBUILD	Sun Dec 16 23:22:19 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.14 2007/12/01 17:15:20 dan Exp $
+# $Id: PKGBUILD,v 1.15 2007/12/17 04:22:19 simo 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=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="A GTK+-based messaging client"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,19 +17,14 @@
 options=(!libtool)
 install=pidgin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        iconv-fix.patch
-        fix-uname-notification.patch)
-md5sums=('0456e63358c8be7a905f9a8ca6494088'
-         'de084bf1e2f345eada74671787256b74'
-         '8c10dc7a7ca6f25adddb11288ed2f168')
-
+        iconv-fix.patch)
+md5sums=('0a593c2c343d5b854bd2cd2be7542f40'
+         'de084bf1e2f345eada74671787256b74')
 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
   sed -i -e 's/gconftool-2/no/g' configure.ac
Index: extra/network/pidgin/fix-uname-notification.patch
diff -u extra/network/pidgin/fix-uname-notification.patch:1.1 extra/network/pidgin/fix-uname-notification.patch:removed
--- extra/network/pidgin/fix-uname-notification.patch:1.1	Sat Dec  1 12:15:20 2007
+++ extra/network/pidgin/fix-uname-notification.patch	Sun Dec 16 23:22:20 2007
@@ -1,40 +0,0 @@
-#
-#
-# 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);