From 023cbd3622ae123aa6eb7e7d79a927a262931a9c Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sat, 1 Feb 2014 03:04:38 -0200
Subject: pidgin-nonprism-2.10.8-2: fix login issues with certain XMPP servers
 (upstream ticket #15879)

---
 nonprism/pidgin-nonprism/PKGBUILD | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'nonprism/pidgin-nonprism/PKGBUILD')

diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
index 4c9fff786..9f80eb57a 100644
--- a/nonprism/pidgin-nonprism/PKGBUILD
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204841 2014-01-28 15:36:09Z foutrelis $
+# $Id: PKGBUILD 204921 2014-01-31 12:35:03Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,7 +8,7 @@
 _pkgname=pidgin
 pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
 pkgver=2.10.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -16,26 +16,32 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
 source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2{,.asc}
+        pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch
         nonprism.patch)
 sha256sums=('b633367e3588ff3e615d68e812302dfdbe32e73693cbe42a0d827b7aed7a8227'
             'SKIP'
+            '4b4cc2d0816bbc7de83d34de6880935163007193a36dcc13afc89fc1ffacc5d2'
             'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
 
 prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
+
   msg 'remove Google Talk and Facebook protocols'
   patch -Np1 -i "$srcdir/nonprism.patch"
   msg 'remove wrong OS term'
   sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
   sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
-}
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  # https://developer.pidgin.im/ticket/15879
+  patch -Np1 -i "$srcdir/pidgin-2.10.8-fix-login-issues-with-certain-xmpp-servers.patch"
 
   # Use Python 2
   sed -i 's/env python$/&2/' */plugins/*.py \
     libpurple/purple-{remote,notifications-example,url-handler}
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
-- 
cgit v1.2.3-54-g00ecf