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

[Evangelos Foutras]

    Date: Tuesday, October 13, 2015 @ 23:30:13
  Author: foutrelis
Revision: 249233

upgpkg: pidgin 2.10.11-6

Revert change that breaks rejoining multi-user chats (FS#46690).

Modified:
  pidgin/trunk/PKGBUILD

----------+
 PKGBUILD |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-13 19:42:32 UTC (rev 249232)
+++ PKGBUILD	2015-10-13 21:30:13 UTC (rev 249233)
@@ -7,7 +7,7 @@
 
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.11
-pkgrel=5
+pkgrel=6
 _rev=cbc4db14444c91f4f4b03aa1b228c2d51dacea6b
 arch=('i686' 'x86_64')
 url="http://pidgin.im/"
@@ -22,6 +22,13 @@
 prepare() {
   cd $pkgbase
 
+  # Revert change that breaks rejoining multi-user chats
+  # https://developer.pidgin.im/ticket/16724
+  {
+    hg diff -c 136a5e95a1ad
+    hg diff -c 187b51ce9922
+  } | patch -Rp1
+
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}