diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-14 23:14:32 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-14 23:14:32 +0000 |
| commit | 4784cc8068c68b6fc23c2bd0ee8158b2a924f5f4 (patch) | |
| tree | 30dd0cb9a1406f132ae8c5b5dbbb4ee4b25732f8 /extra/pidgin | |
| parent | 76c08dc0eadb92247b4978f3185ee4176603b7af (diff) | |
Sun Aug 14 23:14:32 UTC 2011
Diffstat (limited to 'extra/pidgin')
| -rw-r--r-- | extra/pidgin/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/pidgin/ticket-14351-multiple-display-of-room-members.patch | 17 |
2 files changed, 30 insertions, 8 deletions
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 91e94bb66..8f6b5e32e 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -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 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' '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} @@ -74,8 +80,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' - 'cyrus-sasl-plugins') + depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch new file mode 100644 index 000000000..bf0966891 --- /dev/null +++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch @@ -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; |