[arch-commits] Commit in gvfs/repos (18 files)

Ionut Biru ibiru at archlinux.org
Thu May 17 15:22:23 UTC 2012


    Date: Thursday, May 17, 2012 @ 11:22:23
  Author: ibiru
Revision: 159195

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gvfs/repos/extra-i686/PKGBUILD
    (from rev 159194, gvfs/trunk/PKGBUILD)
  gvfs/repos/extra-i686/gvfs-module.install
    (from rev 159194, gvfs/trunk/gvfs-module.install)
  gvfs/repos/extra-i686/gvfs-smb.install
    (from rev 159194, gvfs/trunk/gvfs-smb.install)
  gvfs/repos/extra-i686/gvfs.install
    (from rev 159194, gvfs/trunk/gvfs.install)
  gvfs/repos/extra-x86_64/PKGBUILD
    (from rev 159194, gvfs/trunk/PKGBUILD)
  gvfs/repos/extra-x86_64/gvfs-module.install
    (from rev 159194, gvfs/trunk/gvfs-module.install)
  gvfs/repos/extra-x86_64/gvfs-smb.install
    (from rev 159194, gvfs/trunk/gvfs-smb.install)
  gvfs/repos/extra-x86_64/gvfs.install
    (from rev 159194, gvfs/trunk/gvfs.install)
Deleted:
  gvfs/repos/extra-i686/PKGBUILD
  gvfs/repos/extra-i686/gvfs-1.12.2-afp-g_clear_object.patch
  gvfs/repos/extra-i686/gvfs-module.install
  gvfs/repos/extra-i686/gvfs-smb.install
  gvfs/repos/extra-i686/gvfs.install
  gvfs/repos/extra-x86_64/PKGBUILD
  gvfs/repos/extra-x86_64/gvfs-1.12.2-afp-g_clear_object.patch
  gvfs/repos/extra-x86_64/gvfs-module.install
  gvfs/repos/extra-x86_64/gvfs-smb.install
  gvfs/repos/extra-x86_64/gvfs.install

---------------------------------------------------+
 extra-i686/PKGBUILD                               |  227 +++++++++-----------
 extra-i686/gvfs-1.12.2-afp-g_clear_object.patch   |   35 ---
 extra-i686/gvfs-module.install                    |   14 -
 extra-i686/gvfs-smb.install                       |   24 +-
 extra-i686/gvfs.install                           |   28 +-
 extra-x86_64/PKGBUILD                             |  227 +++++++++-----------
 extra-x86_64/gvfs-1.12.2-afp-g_clear_object.patch |   35 ---
 extra-x86_64/gvfs-module.install                  |   14 -
 extra-x86_64/gvfs-smb.install                     |   24 +-
 extra-x86_64/gvfs.install                         |   28 +-
 10 files changed, 290 insertions(+), 366 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-i686/PKGBUILD	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,115 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.2
-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')
-
-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 \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}

Copied: gvfs/repos/extra-i686/PKGBUILD (from rev 159194, gvfs/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,112 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
+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)   
+sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
+
+build() {
+  cd "$pkgbase-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support')
+  install=gvfs.install
+
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
+      -i monitor/Makefile
+  make DESTDIR="$pkgdir" install
+
+  cd "$pkgdir"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
+  install=gvfs-smb.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=$pkgver")
+  install=gvfs-module.install
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+}

Deleted: extra-i686/gvfs-1.12.2-afp-g_clear_object.patch
===================================================================
--- extra-i686/gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-i686/gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 15:22:23 UTC (rev 159195)
@@ -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
-

Deleted: extra-i686/gvfs-module.install
===================================================================
--- extra-i686/gvfs-module.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-i686/gvfs-module.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}

Copied: gvfs/repos/extra-i686/gvfs-module.install (from rev 159194, gvfs/trunk/gvfs-module.install)
===================================================================
--- extra-i686/gvfs-module.install	                        (rev 0)
+++ extra-i686/gvfs-module.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: extra-i686/gvfs-smb.install
===================================================================
--- extra-i686/gvfs-smb.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-i686/gvfs-smb.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Copied: gvfs/repos/extra-i686/gvfs-smb.install (from rev 159194, gvfs/trunk/gvfs-smb.install)
===================================================================
--- extra-i686/gvfs-smb.install	                        (rev 0)
+++ extra-i686/gvfs-smb.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Deleted: extra-i686/gvfs.install
===================================================================
--- extra-i686/gvfs.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-i686/gvfs.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Copied: gvfs/repos/extra-i686/gvfs.install (from rev 159194, gvfs/trunk/gvfs.install)
===================================================================
--- extra-i686/gvfs.install	                        (rev 0)
+++ extra-i686/gvfs.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,14 @@
+post_install() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-x86_64/PKGBUILD	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,115 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.2
-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')
-
-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 \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}

Copied: gvfs/repos/extra-x86_64/PKGBUILD (from rev 159194, gvfs/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,112 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
+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)   
+sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
+
+build() {
+  cd "$pkgbase-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support')
+  install=gvfs.install
+
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
+      -i monitor/Makefile
+  make DESTDIR="$pkgdir" install
+
+  cd "$pkgdir"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
+  install=gvfs-smb.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=$pkgver")
+  install=gvfs-module.install
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+}

Deleted: extra-x86_64/gvfs-1.12.2-afp-g_clear_object.patch
===================================================================
--- extra-x86_64/gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-x86_64/gvfs-1.12.2-afp-g_clear_object.patch	2012-05-17 15:22:23 UTC (rev 159195)
@@ -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
-

Deleted: extra-x86_64/gvfs-module.install
===================================================================
--- extra-x86_64/gvfs-module.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-x86_64/gvfs-module.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}

Copied: gvfs/repos/extra-x86_64/gvfs-module.install (from rev 159194, gvfs/trunk/gvfs-module.install)
===================================================================
--- extra-x86_64/gvfs-module.install	                        (rev 0)
+++ extra-x86_64/gvfs-module.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: extra-x86_64/gvfs-smb.install
===================================================================
--- extra-x86_64/gvfs-smb.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-x86_64/gvfs-smb.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Copied: gvfs/repos/extra-x86_64/gvfs-smb.install (from rev 159194, gvfs/trunk/gvfs-smb.install)
===================================================================
--- extra-x86_64/gvfs-smb.install	                        (rev 0)
+++ extra-x86_64/gvfs-smb.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}

Deleted: extra-x86_64/gvfs.install
===================================================================
--- extra-x86_64/gvfs.install	2012-05-17 15:20:36 UTC (rev 159194)
+++ extra-x86_64/gvfs.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}

Copied: gvfs/repos/extra-x86_64/gvfs.install (from rev 159194, gvfs/trunk/gvfs.install)
===================================================================
--- extra-x86_64/gvfs.install	                        (rev 0)
+++ extra-x86_64/gvfs.install	2012-05-17 15:22:23 UTC (rev 159195)
@@ -0,0 +1,14 @@
+post_install() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}




More information about the arch-commits mailing list