From 852cbdbbce596c8f65b18090fc429bfa9e84f191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Wed, 22 Oct 2014 16:26:21 -0200
Subject: pidgin-2.10.10-1.nonprism1: updating version

---
 nonprism/pidgin/PKGBUILD       | 12 +++++++-----
 nonprism/pidgin/nonprism.patch | 15 +++++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/nonprism/pidgin/PKGBUILD b/nonprism/pidgin/PKGBUILD
index 634906c63..86aa86132 100644
--- a/nonprism/pidgin/PKGBUILD
+++ b/nonprism/pidgin/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 213831 2014-05-29 19:02:38Z foutrelis $
+# $Id: PKGBUILD 225182 2014-10-22 15:13:44Z foutrelis $
 # Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): Lucien Immink <l.immink@student.fnt.hvu.nl>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=pidgin
 pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.9
-pkgrel=2.nonprism1
+pkgver=2.10.10
+pkgrel=1.nonprism1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin.im/"
 license=('GPL')
@@ -17,9 +19,9 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
 source=(https://downloads.sourceforge.net/project/$pkgname/Pidgin/$pkgver/$pkgname-$pkgver.tar.bz2{,.asc}
         nonprism.patch)
-sha256sums=('dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319'
+sha256sums=('dc6b95512eaec75aef170aabce471491fc70584932599dfead20f1f1c45c822d'
             'SKIP'
-            'f7acfb852cdecfed16e8b116546b643cad1c44d28b56f28ff5485f92af68e9e2')
+            'f720dc9aca3191b65cd89828ab7266e06d93203b7f0de9ac6b506227b00b0bc0')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/nonprism/pidgin/nonprism.patch b/nonprism/pidgin/nonprism.patch
index 88140268e..d57c1ddd8 100644
--- a/nonprism/pidgin/nonprism.patch
+++ b/nonprism/pidgin/nonprism.patch
@@ -1,6 +1,5 @@
-diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
---- a/pidgin/gtkutils.c     2013-02-11 07:16:53.000000000 -0200
-+++ b/pidgin/gtkutils.c    2013-08-16 19:59:22.633298587 -0300
+--- pidgin-2.10.10.orig/pidgin/gtkutils.c	2014-10-16 22:19:33.000000000 -0200
++++ pidgin-2.10.10/pidgin/gtkutils.c	2014-10-22 16:16:10.310955981 -0200
 @@ -677,7 +677,6 @@
  	GdkPixbuf *pixbuf = NULL;
  	GtkSizeGroup *sg;
@@ -9,7 +8,7 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
  	int i;
  
  	aop_menu = g_malloc0(sizeof(AopMenu));
-@@ -686,55 +685,12 @@
+@@ -686,63 +685,12 @@
  	gtk_widget_show(aop_menu->menu);
  	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
  
@@ -39,6 +38,10 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
 -			if (pixbuf)
 -				g_object_unref(pixbuf);
 -
+-			/* libpurple3 compatibility */
+-			if (g_strcmp0(default_proto_id, "prpl-gtalk") == 0)
+-				aop_menu->default_item = i;
+-
 -			gtalk_name = NULL;
 -			i++;
 -		}
@@ -58,6 +61,10 @@ diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils
 -			if (pixbuf)
 -				g_object_unref(pixbuf);
 -
+-			/* libpurple3 compatibility */
+-			if (g_strcmp0(default_proto_id, "prpl-facebook-xmpp") == 0)
+-				aop_menu->default_item = i;
+-
 -			facebook_name = NULL;
 -			i++;
 -		}
-- 
cgit v1.2.3-2-g168b