From 3543351d664783dfb925bc00c080298ce2bd36f6 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 May 2012 16:51:43 +0000
Subject: main/gvfs: upgrade to 1.12.3, split afc and avahi

---
 main/gvfs/APKBUILD                           | 36 ++++++++++++++++++++--------
 main/gvfs/gvfs-1.10.1-unneeded-include.patch | 27 ---------------------
 2 files changed, 26 insertions(+), 37 deletions(-)
 delete mode 100644 main/gvfs/gvfs-1.10.1-unneeded-include.patch

diff --git a/main/gvfs/APKBUILD b/main/gvfs/APKBUILD
index 154c31acbc..b80b11eb9c 100644
--- a/main/gvfs/APKBUILD
+++ b/main/gvfs/APKBUILD
@@ -1,22 +1,22 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gvfs
-pkgver=1.9.1
-pkgrel=4
+pkgver=1.12.3
+pkgrel=0
 pkgdesc="Backends for the gio framework in GLib"
 url="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/"
 arch="all"
 license="GPL"
 depends=
 triggers="$pkgname.trigger=/usr/lib/gvfs"
-makedepends="dbus-glib-dev intltool fuse-dev udev-dev bluez-dev expat-dev
-	samba-dev libsoup-dev avahi-dev libarchive-dev gnome-disk-utility-dev
-	libgphoto2-dev libcdio-dev"
+makedepends="intltool fuse-dev udev-dev bluez-dev expat-dev
+	samba-dev libsoup-dev avahi-dev libarchive-dev udisks2-dev
+	libgphoto2-dev libcdio-dev libgcrypt-dev"
 install=
 subpackages="$pkgname-dev $pkgname-fuse $pkgname-smb $pkgname-archive
-	$pkgname-obexftp $pkgname-gphoto2 $pkgname-lang"
-source="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/gvfs-$pkgver.tar.bz2
-	gvfs-1.10.1-unneeded-include.patch"
+	$pkgname-obexftp $pkgname-gphoto2 $pkgname-lang $pkgname-afp
+	$pkgname-avahi"
+source="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/gvfs-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -94,10 +94,26 @@ gphoto2() {
 		usr/share/dbus*/services/*GPhoto*
 }
 
+afp() {
+	pkgdesc="AFP support for gvfs"
+	cd "$pkgdir"
+	_mv_files \
+		usr/lib/gvfs/gvfs*afp* \
+		usr/share/gvfs/*/afp*
+}
+
+avahi() {
+	pkgdesc="DNS-SD support for gvfs"
+	cd "$pkgdir"
+	_mv_files \
+		usr/lib/lib*dns*.so.* \
+		usr/lib/gvfs/gvfs*dns* \
+		usr/share/gvfs/*/dns*
+}
+
 #
 #afc() {
 #	pkgdesc="AFC support for gvfs"
 #}
 
-md5sums="875748f5d6995149e94fdab247d29a8a  gvfs-1.9.1.tar.bz2
-6a251c3870b9e101eb01fff63ba22526  gvfs-1.10.1-unneeded-include.patch"
+md5sums="348edf09eca150ba7065017127f63c64  gvfs-1.12.3.tar.xz"
diff --git a/main/gvfs/gvfs-1.10.1-unneeded-include.patch b/main/gvfs/gvfs-1.10.1-unneeded-include.patch
deleted file mode 100644
index 96663e6b04..0000000000
--- a/main/gvfs/gvfs-1.10.1-unneeded-include.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 42d800f377dfa4e7338c516d286aef0b76bb1f72 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 13 Oct 2011 18:58:57 -0400
-Subject: [PATCH] Drop an unneeded include
-
-GLib recently became less forgiving about single includes
-like this.
----
- client/gvfsfusedaemon.c |    2 --
- 1 files changed, 0 insertions(+), 2 deletions(-)
-
-diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
-index b41e83b..a4ba32c 100644
---- a/client/gvfsfusedaemon.c
-+++ b/client/gvfsfusedaemon.c
-@@ -41,8 +41,6 @@
- #include <glib/gprintf.h>
- #include <gio/gio.h>
- 
--#include <glib/gurifuncs.h>
--
- /* stuff from common/ */
- #include <gdaemonmount.h>
- #include <gvfsdaemonprotocol.h>
--- 
-1.7.8.4
-
-- 
cgit v1.2.3