summaryrefslogtreecommitdiff
path: root/nonprism
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-15 10:53:01 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-10-15 10:53:01 -0300
commitaa3f156a70091067ddc5ebb49e59ed609d06aa17 (patch)
treeedd89f8682f6256c4a4c47cf42e533af7329814f /nonprism
parentc0988be88e92b17821957b6c09847d28823057fc (diff)
pidgin-2.10.11-6.nonprism1: revert change that breaks rejoining multi-user chats (FS#46690 -> https://bugs.archlinux.org/task/46690)
Diffstat (limited to 'nonprism')
-rw-r--r--nonprism/pidgin/PKGBUILD11
1 files changed, 9 insertions, 2 deletions
diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD
index a848861ef..74f42a8f4 100644
--- a/nonprism/pidgin/PKGBUILD
+++ b/nonprism/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 248703 2015-10-09 18:10:52Z foutrelis $
+# $Id: PKGBUILD 249233 2015-10-13 21:30:13Z foutrelis $
# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
@@ -9,7 +9,7 @@
pkgname=('pidgin' 'libpurple' 'finch')
pkgver=2.10.11
-pkgrel=5.nonprism1
+pkgrel=6.nonprism1
_rev=cbc4db14444c91f4f4b03aa1b228c2d51dacea6b
arch=('i686' 'x86_64')
url="http://pidgin.im/"
@@ -26,6 +26,13 @@ sha256sums=('SKIP'
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
+
msg "Remove Google Talk and Facebook protocols"
patch -Np1 -i "$srcdir/nonprism.patch"