diff options
| author | root <root@rshg054.dnsready.net> | 2012-05-14 00:02:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-05-14 00:02:14 +0000 |
| commit | d3af8dc0117dc1ce4fea3d05c7a2d7786bd78986 (patch) | |
| tree | 31feb3c3623dd48f13ce1cdbdf10d870ea5b5678 /extra/gvfs | |
| parent | e8aea505d7f36277edd02ef965bc3f8e1c81ee5d (diff) | |
Mon May 14 00:02:13 UTC 2012
Diffstat (limited to 'extra/gvfs')
| -rw-r--r-- | extra/gvfs/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch | 35 |
2 files changed, 41 insertions, 3 deletions
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index d4911ea95..0d8828adf 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157347 2012-04-27 16:15:04Z ibiru $ +# $Id: PKGBUILD 158913 2012-05-13 02:45:39Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs @@ -10,11 +10,14 @@ 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) -sha256sums=('998b9d0089d21e451e455b6bc5f421eb08bcb3e5ff0aceda98e424cc42ef6616') +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') 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 \ diff --git a/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch b/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch new file mode 100644 index 000000000..09e11d888 --- /dev/null +++ b/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch @@ -0,0 +1,35 @@ +From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@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 + |