[arch-commits] Commit in gvfs/trunk (PKGBUILD gvfs-1.12.2-afp-g_clear_object.patch)

[Ionut Biru]

    Date: Thursday, May 17, 2012 @ 11:20:36
  Author: ibiru
Revision: 159194

update to 1.12.3

Modified:
  gvfs/trunk/PKGBUILD
Deleted:
  gvfs/trunk/gvfs-1.12.2-afp-g_clear_object.patch

--------------------------------------+
 PKGBUILD                             |    9 ++------
 gvfs-1.12.2-afp-g_clear_object.patch |   35 ---------------------------------
 2 files changed, 3 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-17 14:38:12 UTC (rev 159193)
+++ PKGBUILD	2012-05-17 15:20:36 UTC (rev 159194)
@@ -3,21 +3,18 @@
 
 pkgbase=gvfs
 pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.2
+pkgver=1.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
 url="http://www.gnome.org"
 options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        gvfs-1.12.2-afp-g_clear_object.patch)
-sha256sums=('998b9d0089d21e451e455b6bc5f421eb08bcb3e5ff0aceda98e424cc42ef6616'
-            '6a93963644317d9e55aebac723008bd94cf97d42349dbf48ab6996fa5d9eed89')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
+sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
 
 build() {
   cd "$pkgbase-$pkgver"
-  patch -p1 -i ../gvfs-1.12.2-afp-g_clear_object.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gvfs \

Deleted: gvfs-1.12.2-afp-g_clear_object.patch
===================================================================
--- gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 14:38:12 UTC (rev 159193)
+++ gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 15:20:36 UTC (rev 159194)
@@ -1,35 +0,0 @@
-From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen at redhat.com>
-Date: Mon, 30 Apr 2012 06:09:30 -0400
-Subject: [PATCH] afp: Use g_clear_object properly
-
-g_clear_object expects the address of a pointer. A recent
-change in its definition makes gcc complain about this.
-(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716)
----
- daemon/gvfsafpvolume.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c
-index 3fd33f2..5207459 100644
---- a/daemon/gvfsafpvolume.c
-+++ b/daemon/gvfsafpvolume.c
-@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res
-   return;
- 
- error:
--  g_clear_object (info);
-+  g_clear_object (&info);
-   g_simple_async_result_take_error (simple, err);
-   g_simple_async_result_complete (simple);
-   g_object_unref (simple);
-@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume  *volume,
-     *bytes_read = g_simple_async_result_get_op_res_gssize (simple);
-   
-   return TRUE;
--}
-\ No newline at end of file
-+}
--- 
-1.7.8.6
-