[arch-commits] Commit in pidgin/trunk (2 files)

[Evangelos Foutras]

    Date: Saturday, August 13, 2011 @ 07:30:30
  Author: foutrelis
Revision: 135431

upgpkg: pidgin 2.9.0-3
Fix upstream issue #14351: "multiple display of room members".

Added:
  pidgin/trunk/ticket-14351-multiple-display-of-room-members.patch
Modified:
  pidgin/trunk/PKGBUILD

-----------------------------------------------------+
 PKGBUILD                                            |   14 ++++++++++----
 ticket-14351-multiple-display-of-room-members.patch |   17 +++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-13 09:59:26 UTC (rev 135430)
+++ PKGBUILD	2011-08-13 11:30:30 UTC (rev 135431)
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.9.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,17 +17,23 @@
              'networkmanager')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-        nm09-more.patch)
+        nm09-more.patch
+        ticket-14351-multiple-display-of-room-members.patch)
 md5sums=('2cd285c7a40f93b7a51bfe733971d3a6'
-         'a673659d86c7a65aa710f7c8c7feda82')
+         'a673659d86c7a65aa710f7c8c7feda82'
+         '47f16f838b741cfdeda18d7b08a7b816')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Further fixes for NetworkManager 0.9
-  # (http://developer.pidgin.im/ticket/13859)
+  # http://developer.pidgin.im/ticket/13859
   patch -Np1 -i "$srcdir/nm09-more.patch"
 
+  # Fix upstream issue #14351: multiple display of room members
+  # http://developer.pidgin.im/ticket/14351
+  patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch"
+
   # Use Python 2
   sed -i 's/env python$/\02/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}

Added: ticket-14351-multiple-display-of-room-members.patch
===================================================================
--- ticket-14351-multiple-display-of-room-members.patch	                        (rev 0)
+++ ticket-14351-multiple-display-of-room-members.patch	2011-08-13 11:30:30 UTC (rev 135431)
@@ -0,0 +1,17 @@
+#
+#
+# patch "libpurple/conversation.c"
+#  from [cd6817f4863abafef969359f65cc025f9483b401]
+#    to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803]
+#
+============================================================
+--- libpurple/conversation.c	cd6817f4863abafef969359f65cc025f9483b401
++++ libpurple/conversation.c	19aac10ceebae1ee28788b6f0c02bcfcff0c8803
+@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC
+ 	}
+ 
+ 	g_hash_table_remove_all(chat->users);
+-	chat->users = NULL;
+ 
+ 	g_list_free(users);
+ 	chat->in_room = NULL;