[arch-commits] Commit in libgnome-keyring/trunk (PKGBUILD fix_crash.patch)

[Ionut Biru]

    Date: Thursday, May 26, 2011 @ 12:32:57
  Author: ibiru
Revision: 125537

update to 3.0.3

Modified:
  libgnome-keyring/trunk/PKGBUILD
Deleted:
  libgnome-keyring/trunk/fix_crash.patch

-----------------+
 PKGBUILD        |   11 ++++-------
 fix_crash.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-26 16:28:05 UTC (rev 125536)
+++ PKGBUILD	2011-05-26 16:32:57 UTC (rev 125537)
@@ -2,8 +2,8 @@
 #Maintainer: Jan De Groot <jgc at archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -11,14 +11,11 @@
 makedepends=('intltool' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix_crash.patch)
-sha256sums=('7914ac5edae5e602ba8f7c505ecd18faa84e8482a3f4e6ee0a20aee3a24d6f5d'
-            '4b8c3d9cbc72d171b274e9ad38b01ff9f7ce92beaf1d1e89c54db70d6c4e8a6a')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a0cc08bcd431070d3f01c2741903c2bd8b0231ee73de709d28e722e28575fdf8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_crash.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-keyring

Deleted: fix_crash.patch
===================================================================
--- fix_crash.patch	2011-05-26 16:28:05 UTC (rev 125536)
+++ fix_crash.patch	2011-05-26 16:32:57 UTC (rev 125537)
@@ -1,35 +0,0 @@
-From 9bcac748b54e00836715b0f70be26b7cbdc8c888 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt at ubuntu.com>
-Date: Mon, 23 May 2011 08:58:49 +0000
-Subject: Fix crash from recent memleak fix (b49e32b)
-
-make_attribute_list_va() statically copies the caller's method arguments into
-the GnomeKeyringAttributeList, so we must only free the array itself, not the
-GnomeKeyringAttribute strings.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=650840
----
-diff --git a/library/gnome-keyring.c b/library/gnome-keyring.c
-index dc271dd..4febf47 100644
---- a/library/gnome-keyring.c
-+++ b/library/gnome-keyring.c
-@@ -2443,7 +2443,7 @@ gnome_keyring_find_itemsv (GnomeKeyringItemType                  type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items (type, attributes, callback, data, destroy_data);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
-@@ -2520,7 +2520,7 @@ gnome_keyring_find_itemsv_sync  (GnomeKeyringItemType        type,
- 	va_end (args);
- 
- 	ret = gnome_keyring_find_items_sync (type, attributes, found);
--	gnome_keyring_attribute_list_free (attributes);
-+	g_array_free (attributes, TRUE);
- 	return ret;
- }
- 
---
-cgit v0.9