[arch-commits] Commit in folks/trunk (2 files)

[Jan Steffens]

    Date: Sunday, September 18, 2011 @ 16:33:11
  Author: heftig
Revision: 138211

0.6.3

Modified:
  folks/trunk/PKGBUILD
Deleted:
  folks/trunk/Bug_658631_crash_at_empathy_startup.patch

-------------------------------------------+
 Bug_658631_crash_at_empathy_startup.patch |   41 ----------------------------
 PKGBUILD                                  |   15 +++-------
 2 files changed, 5 insertions(+), 51 deletions(-)

Deleted: Bug_658631_crash_at_empathy_startup.patch
===================================================================
--- Bug_658631_crash_at_empathy_startup.patch	2011-09-18 16:29:47 UTC (rev 138210)
+++ Bug_658631_crash_at_empathy_startup.patch	2011-09-18 20:33:11 UTC (rev 138211)
@@ -1,41 +0,0 @@
-From 1f85f89051e63b05e271b418687c242a83e2f296 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip at tecnocode.co.uk>
-Date: Mon, 12 Sep 2011 22:09:10 +0000
-Subject: Bug 658631 — crash at empathy startup
-
-In the case that a persona is removed and the individual containing that
-persona is replaced by a different non-null individual which doesn't contain
-that persona (because it's been removed), we need to set the persona's
-individual pointer to null rather than the replacement individual.
-
-This stops us tripping the assertion in the setter for Persona.individual.
-
-Closes: bgo#658631
----
-diff --git a/folks/individual.vala b/folks/individual.vala
-index 3b6c12b..59548ee 100644
---- a/folks/individual.vala
-+++ b/folks/individual.vala
-@@ -1510,7 +1510,19 @@ public class Folks.Individual : Object,
-        * aggregator's rewritten, it would be nice to fix this. */
-       if (persona.individual == this)
-         {
--          persona.individual = replacement_individual;
-+          /* It may be the case that the persona's being removed from the
-+           * individual (i.e. the replacement individual is non-null, but
-+           * doesn't contain this persona). In this case, we need to set the
-+           * persona's individual to null. */
-+          if (replacement_individual != null &&
-+              persona in replacement_individual.personas)
-+            {
-+              persona.individual = replacement_individual;
-+            }
-+          else
-+            {
-+              persona.individual = null;
-+            }
-         }
-     }
- 
---
-cgit v0.9.0.2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-18 16:29:47 UTC (rev 138210)
+++ PKGBUILD	2011-09-18 20:33:11 UTC (rev 138211)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Ionut Biru <ibiru at archlinux.org>
+
 pkgname=folks
-pkgver=0.6.2.1
-pkgrel=2
+pkgver=0.6.3
+pkgrel=1
 pkgdesc="Library to aggregates people into metacontacts "
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
@@ -10,18 +11,12 @@
 depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
 makedepends=('gobject-introspection' 'vala' 'intltool' 'libtracker-sparql')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz
-        Bug_658631_crash_at_empathy_startup.patch)
-sha256sums=('3eda79a71890b51b6f723067b61c32ef25e9041a9e188b483d7f23e3dcd328ee'
-            '4ef4caaab73e799fe31e7a93ba1f3f088e99f66600e644828bbcc4fb966c1196')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('e21810966f300b31e8cd51cca9851606213345eb933584997b49326c43b46e1b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Fix a crash
-  patch -Np1 -i "$srcdir/Bug_658631_crash_at_empathy_startup.patch"
-  find . -name '*.stamp' -delete
-
   # Change tracker version
   grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g'