community/gvfs: upgrade to 1.40.1

* Adopt maintainership
* Modernize APKBUILD
* Use /usr/libexec/gvfs for binaries instead of /usr/lib/gvfs
* Add goa,afc and bluray support
* Fix URL&License

Closes GH-7597

2 files changed, 54 insertions, 43 deletions

diff --git a/community/gvfs/APKBUILD b/community/gvfs/APKBUILD
index 7345e6eec1..53d59739b7 100644
--- a/community/gvfs/APKBUILD
+++ b/community/gvfs/APKBUILD
@@ -1,21 +1,21 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=gvfs
-pkgver=1.36.2
-pkgrel=1
+pkgver=1.40.1
+pkgrel=0
 pkgdesc="Backends for the gio framework in GLib"
-url="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/"
+url="https://wiki.gnome.org/Projects/gvfs"
 arch="all"
-license="GPL"
-depends=""
-options="!check"  # no tests available
-triggers="$pkgname.trigger=/usr/lib/gvfs"
-makedepends="intltool fuse-dev libgudev-dev expat-dev samba-dev
+license="LGPL-2.0-or-later"
+makedepends="fuse-dev libgudev-dev expat-dev samba-dev libxml2-dev
 	libsoup-dev avahi-dev libarchive-dev udisks2-dev libgphoto2-dev
 	libcdio-paranoia-dev libgcrypt-dev libxslt-dev docbook-xsl
-	libmtp-dev gcr-dev libcap-dev libsecret-dev libnfs-dev meson ninja
-	openssh-client"
+	libmtp-dev gcr-dev libcap-dev libsecret-dev libnfs-dev meson
+	openssh-client libusb-dev gnome-online-accounts-dev libimobiledevice-dev
+	libbluray-dev libgdata-dev"
+triggers="$pkgname.trigger=/usr/libexec/gvfs"
 subpackages="$pkgname-dev $pkgname-lang
+	$pkgname-afc
 	$pkgname-afp
 	$pkgname-archive
 	$pkgname-avahi
@@ -23,44 +23,36 @@ subpackages="$pkgname-dev $pkgname-lang
 	$pkgname-dav
 	$pkgname-fuse
 	$pkgname-gphoto2
+	$pkgname-goa
 	$pkgname-mtp
 	$pkgname-nfs
 	$pkgname-smb
 	"
 source="https://download.gnome.org/sources/gvfs/${pkgver%.*}/gvfs-$pkgver.tar.xz"
 
-builddir="$srcdir/$pkgname-$pkgver"
 build() {
-	mkdir -p "$builddir"/build
-	cd "$builddir"/build
 	meson \
 		--buildtype=release \
 		--prefix=/usr \
+		--libexecdir=/usr/libexec/gvfs \
 		--sysconfdir=/etc \
-		--libexecdir=/usr/lib/gvfs \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		-Dafc=false \
-		-Dbluray=false \
-		-Dgdu=false \
-		-Dgoa=false \
-		-Dgoogle=false \
-		-Dhttp=true \
-		-Dlibmtp=true \
-		-Dlogind=false \
-		-Dsmb=true \
 		-Dsystemduserunitdir=no \
 		-Dtmpfilesdir=no \
-		..
-	# workaround parallel build issue
-	ninja common/gvfsdbus.h
+		-Dlogind=false \
+		. output
+
 
-	ninja
+	ninja -C output
+}
+
+check() {
+	ninja -C output test
 }
 
 package() {
-	cd "$builddir"/build
-	DESTDIR="$pkgdir" ninja install
+	DESTDIR="$pkgdir" ninja -C output install
 }
 
 _mv_files() {
@@ -74,14 +66,14 @@ _mv_files() {
 fuse() {
 	pkgdesc="FUSE support for gvfs"
 	cd "$pkgdir"
-	_mv_files usr/lib/gvfs/gvfsd-fuse
+	_mv_files usr/libexec/gvfs/gvfsd-fuse
 }
 
 smb() {
 	pkgdesc="Windows fileshare support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfsd-smb* \
+		usr/libexec/gvfs/gvfsd-smb* \
 		usr/share/gvfs/mounts/smb* \
 		usr/share/glib-*/schemas/org.gnome.system.smb.gschema.xml \
 		usr/share/GConf/gsettings/gvfs-smb.convert
@@ -90,14 +82,14 @@ smb() {
 mtp() {
 	pkgdesc="MTP support for gvfs"
 	cd "$pkgdir"
-	_mv_files usr/lib/gvfs/gvfsd-mtp
+	_mv_files usr/libexec/gvfs/gvfsd-mtp
 }
 
 archive() {
 	pkgdesc="Archiving support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfsd-archive* \
+		usr/libexec/gvfs/gvfsd-archive* \
 		usr/share/gvfs/mounts/archive*
 }
 
@@ -105,7 +97,7 @@ obexftp() {
 	pkgdesc="ObexFTP support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfsd-obex* \
+		usr/libexec/gvfs/gvfsd-obex* \
 		usr/share/gvfs/mounts/obex*
 }
 
@@ -113,7 +105,7 @@ gphoto2() {
 	pkgdesc="gphoto2 support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfs*gphoto* \
+		usr/libexec/gvfs/gvfs*gphoto* \
 		usr/share/gvfs/*/gphoto* \
 		usr/share/dbus*/services/*GPhoto*
 }
@@ -122,7 +114,7 @@ afp() {
 	pkgdesc="AFP support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfs*afp* \
+		usr/libexec/gvfs/gvfs*afp* \
 		usr/share/gvfs/*/afp*
 }
 
@@ -130,7 +122,7 @@ avahi() {
 	pkgdesc="DNS-SD support for gvfs"
 	cd "$pkgdir"
 	_mv_files \
-		usr/lib/gvfs/gvfs*dns* \
+		usr/libexec/gvfs/gvfs*dns* \
 		usr/share/gvfs/mounts/dns-sd.mount \
 		usr/share/glib-*/schemas/org.gnome.system.dns_sd.gschema.xml \
 		usr/share/GConf/gsettings/gvfs-dns-sd.convert
@@ -141,7 +133,7 @@ cdda() {
 	cd "$pkgdir"
 	_mv_files \
 		usr/share/gvfs/mounts/cdda.mount \
-		usr/lib/gvfs/gvfsd-cdda
+		usr/libexec/gvfs/gvfsd-cdda
 }
 
 dav() {
@@ -150,7 +142,7 @@ dav() {
 	_mv_files \
 		usr/share/gvfs/mounts/dav.mount \
 		usr/share/gvfs/mounts/dav+sd.mount \
-		usr/lib/gvfs/gvfsd-dav
+		usr/libexec/gvfs/gvfsd-dav
 }
 
 nfs() {
@@ -158,7 +150,27 @@ nfs() {
 	cd "$pkgdir"
 	_mv_files \
 		usr/share/gvfs/mounts/nfs.mount \
-		usr/lib/gvfs/gvfsd-nfs
+		usr/libexec/gvfs/gvfsd-nfs
+}
+
+goa() {
+	pkgdesc="GNOME Online Accounts support for gvfs"
+	cd "$pkgdir"
+	_mv_files \
+		usr/libexec/gvfs/gvfs-goa-volume-monitor \
+		usr/libexec/gvfs/gvfsd-google \
+		usr/share/gvfs/mounts/google.mount \
+		usr/share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service \
+		usr/share/gvfs/remote-volume-monitors/goa.monitor
 }
 
-sha512sums="c5ffc3d36ad1f438c245877d94924aa22c4edf9d89be0a990ad03897d462459229e576064797e53a62063f4aaf91ad30870f0b57df3731a69951f4ceb61db0db  gvfs-1.36.2.tar.xz"
+afc() {
+	pkgdesc="Apple mobile devices support for gvfs"
+	cd "$pkgdir"
+	_mv_files \
+		usr/libexec/gvfs/gvfsd-afc \
+		usr/libexec/gvfs/gvfs-afc-volume-monitor \
+		usr/share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service \
+		usr/share/gvfs/remote-volume-monitors/afc.monitor
+}
+sha512sums="de7fbcce5783c807ab4d7d56fa246244fbe2baf271c43a2abd9f332e41975026842f66423a5e0781d11ba04802a29358a6863e087120b76471c3bdd47f7a6a29  gvfs-1.40.1.tar.xz"
diff --git a/community/gvfs/gvfs.trigger b/community/gvfs/gvfs.trigger
index e1d7906823..ce2bc64a3f 100644
--- a/community/gvfs/gvfs.trigger
+++ b/community/gvfs/gvfs.trigger
@@ -3,4 +3,3 @@
 # Reload .mount files
 killall -USR1 gvfsd >&/dev/null
 exit 0
-