[arch-commits] Commit in gvfs/repos/extra-x86_64 (7 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Jun 7 08:28:48 UTC 2018
Date: Thursday, June 7, 2018 @ 08:28:48
Author: foutrelis
Revision: 326205
archrelease: copy trunk to extra-x86_64
Added:
gvfs/repos/extra-x86_64/PKGBUILD
(from rev 326204, gvfs/trunk/PKGBUILD)
gvfs/repos/extra-x86_64/gvfs-nfs.install
(from rev 326204, gvfs/trunk/gvfs-nfs.install)
gvfs/repos/extra-x86_64/gvfsd.hook
(from rev 326204, gvfs/trunk/gvfsd.hook)
gvfs/repos/extra-x86_64/udisks2-fix-crashes-caused-by-missing-source-tag.patch
(from rev 326204, gvfs/trunk/udisks2-fix-crashes-caused-by-missing-source-tag.patch)
Deleted:
gvfs/repos/extra-x86_64/PKGBUILD
gvfs/repos/extra-x86_64/gvfs-nfs.install
gvfs/repos/extra-x86_64/gvfsd.hook
--------------------------------------------------------+
PKGBUILD | 328 +++++++--------
gvfs-nfs.install | 14
gvfsd.hook | 22 -
udisks2-fix-crashes-caused-by-missing-source-tag.patch | 29 +
4 files changed, 213 insertions(+), 180 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-07 08:28:38 UTC (rev 326204)
+++ PKGBUILD 2018-06-07 08:28:48 UTC (rev 326205)
@@ -1,162 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgbase=gvfs
-pkgname=(gvfs gvfs-{smb,afc,gphoto2,goa,mtp,nfs,google})
-pkgver=1.36.2
-pkgrel=1
-pkgdesc="Virtual filesystem implementation for GIO"
-url="https://wiki.gnome.org/Projects/gvfs"
-arch=(x86_64)
-license=(LGPL)
-depends=(avahi dconf fuse libarchive libcdio-paranoia libsoup udisks2 libsecret
- libbluray libgudev gcr psmisc)
-makedepends=(dbus libgphoto2 libimobiledevice smbclient docbook-xsl gtk3 libmtp
- gnome-online-accounts libnfs libgdata git gtk-doc python meson openssh)
-groups=(gnome)
-_commit=eb283f2ff47432cc66976c0ad66e267b9b0c8305 # tags/1.36.2^0
-source=("git+https://git.gnome.org/browse/gvfs#commit=$_commit"
- gvfsd.hook)
-sha256sums=('SKIP'
- '478b9cf7b4c242959fc640dbf0cd4935f16c59b81f5828a3af102d608d7a9d72')
-
-prepare() {
- cd $pkgbase
-}
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/-/+/g'
-}
-
-build() {
- arch-meson $pkgbase build -D man=true -D deprecated_programs=true
- ninja -C build
-}
-
-check() {
- cd build
- meson test
-}
-
-_split() {
- local name="$1" src dest
- shift
- for src do
- echo "$name: /usr/$src"
- dest="$srcdir/$name/$src"
- mkdir -p "${dest%/*}"
- mv -T "$src" "$dest"
- done
-}
-
-package_gvfs() {
- replaces=(gvfs-{obexftp,afp})
- optdepends=('gvfs-afc: AFC (mobile devices) support'
- 'gvfs-smb: SMB/CIFS (Windows client) support'
- 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
- 'gvfs-mtp: MTP device support'
- 'gvfs-goa: gnome-online-accounts (e.g. OwnCloud) support'
- 'gvfs-nfs: NFS support'
- 'gvfs-google: Google Drive support'
- 'gtk3: Recent files support')
- options=(!emptydirs)
-
- DESTDIR="$pkgdir" ninja -C build install
-
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
- install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
-
- cd "$pkgdir/usr"
-
- _split smb \
- lib/gvfsd-smb{,-browse} \
- share/GConf/gsettings/gvfs-smb.convert \
- share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml \
- share/gvfs/mounts/smb{,-browse}.mount
-
- _split afc \
- lib/gvfs{-afc-volume-monitor,d-afc} \
- lib/systemd/user/gvfs-afc-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service \
- share/gvfs/mounts/afc.mount \
- share/gvfs/remote-volume-monitors/afc.monitor
-
- _split gphoto2 \
- lib/gvfs{-gphoto2-volume-monitor,d-gphoto2} \
- lib/systemd/user/gvfs-gphoto2-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service \
- share/gvfs/mounts/gphoto2.mount \
- share/gvfs/remote-volume-monitors/gphoto2.monitor
-
- _split mtp \
- lib/gvfs{-mtp-volume-monitor,d-mtp} \
- lib/systemd/user/gvfs-mtp-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service \
- share/gvfs/mounts/mtp.mount \
- share/gvfs/remote-volume-monitors/mtp.monitor
-
- _split goa \
- lib/gvfs-goa-volume-monitor \
- lib/systemd/user/gvfs-goa-volume-monitor.service \
- share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service \
- share/gvfs/remote-volume-monitors/goa.monitor
-
- _split nfs \
- lib/gvfsd-nfs \
- share/gvfs/mounts/nfs.mount
-
- _split google \
- lib/gvfsd-google \
- share/gvfs/mounts/google.mount
-}
-
-package_gvfs-smb() {
- pkgdesc+=" (SMB/CIFS backend; Windows client)"
- depends=("gvfs=$pkgver" smbclient)
-
- mv "$srcdir/smb" "$pkgdir/usr"
-}
-
-package_gvfs-afc() {
- pkgdesc+=" (AFC backend; Apple mobile devices)"
- depends=("gvfs=$pkgver" libimobiledevice usbmuxd)
-
- mv "$srcdir/afc" "$pkgdir/usr"
-}
-
-package_gvfs-gphoto2() {
- pkgdesc+=" (gphoto2 backend; PTP camera, MTP media player)"
- depends=("gvfs=$pkgver" libgphoto2)
-
- mv "$srcdir/gphoto2" "$pkgdir/usr"
-}
-
-package_gvfs-mtp() {
- pkgdesc+=" (MTP backend; Android, media player)"
- depends=("gvfs=$pkgver" libmtp)
-
- mv "$srcdir/mtp" "$pkgdir/usr"
-}
-
-package_gvfs-goa() {
- pkgdesc+=" (Gnome Online Accounts backend; cloud storage)"
- depends=("gvfs=$pkgver" gnome-online-accounts)
-
- mv "$srcdir/goa" "$pkgdir/usr"
-}
-
-package_gvfs-nfs() {
- pkgdesc+=" (NFS backend)"
- depends=("gvfs=$pkgver" libnfs)
- install=gvfs-nfs.install
-
- mv "$srcdir/nfs" "$pkgdir/usr"
-}
-
-package_gvfs-google() {
- pkgdesc+=" (Google Drive backend)"
- depends=("gvfs-goa=$pkgver" libgdata)
-
- mv "$srcdir/google" "$pkgdir/usr"
-}
Copied: gvfs/repos/extra-x86_64/PKGBUILD (from rev 326204, gvfs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-06-07 08:28:48 UTC (rev 326205)
@@ -0,0 +1,166 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgbase=gvfs
+pkgname=(gvfs gvfs-{smb,afc,gphoto2,goa,mtp,nfs,google})
+pkgver=1.36.2
+pkgrel=2
+pkgdesc="Virtual filesystem implementation for GIO"
+url="https://wiki.gnome.org/Projects/gvfs"
+arch=(x86_64)
+license=(LGPL)
+depends=(avahi dconf fuse libarchive libcdio-paranoia libsoup udisks2 libsecret
+ libbluray libgudev gcr psmisc)
+makedepends=(dbus libgphoto2 libimobiledevice smbclient docbook-xsl gtk3 libmtp
+ gnome-online-accounts libnfs libgdata git gtk-doc python meson openssh)
+groups=(gnome)
+_commit=eb283f2ff47432cc66976c0ad66e267b9b0c8305 # tags/1.36.2^0
+source=("git+https://git.gnome.org/browse/gvfs#commit=$_commit"
+ udisks2-fix-crashes-caused-by-missing-source-tag.patch
+ gvfsd.hook)
+sha256sums=('SKIP'
+ '5a7a1e2aa3d8a73fe7c692ac18c837d26286a49c493983af733790a69a4b6398'
+ '478b9cf7b4c242959fc640dbf0cd4935f16c59b81f5828a3af102d608d7a9d72')
+
+prepare() {
+ cd $pkgbase
+ # https://gitlab.gnome.org/GNOME/gvfs/issues/1
+ patch -Np1 -i ../udisks2-fix-crashes-caused-by-missing-source-tag.patch
+}
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/-/+/g'
+}
+
+build() {
+ arch-meson $pkgbase build -D man=true -D deprecated_programs=true
+ ninja -C build
+}
+
+check() {
+ cd build
+ meson test
+}
+
+_split() {
+ local name="$1" src dest
+ shift
+ for src do
+ echo "$name: /usr/$src"
+ dest="$srcdir/$name/$src"
+ mkdir -p "${dest%/*}"
+ mv -T "$src" "$dest"
+ done
+}
+
+package_gvfs() {
+ replaces=(gvfs-{obexftp,afp})
+ optdepends=('gvfs-afc: AFC (mobile devices) support'
+ 'gvfs-smb: SMB/CIFS (Windows client) support'
+ 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+ 'gvfs-mtp: MTP device support'
+ 'gvfs-goa: gnome-online-accounts (e.g. OwnCloud) support'
+ 'gvfs-nfs: NFS support'
+ 'gvfs-google: Google Drive support'
+ 'gtk3: Recent files support')
+ options=(!emptydirs)
+
+ DESTDIR="$pkgdir" ninja -C build install
+
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
+ install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d"
+
+ cd "$pkgdir/usr"
+
+ _split smb \
+ lib/gvfsd-smb{,-browse} \
+ share/GConf/gsettings/gvfs-smb.convert \
+ share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml \
+ share/gvfs/mounts/smb{,-browse}.mount
+
+ _split afc \
+ lib/gvfs{-afc-volume-monitor,d-afc} \
+ lib/systemd/user/gvfs-afc-volume-monitor.service \
+ share/dbus-1/services/org.gtk.vfs.AfcVolumeMonitor.service \
+ share/gvfs/mounts/afc.mount \
+ share/gvfs/remote-volume-monitors/afc.monitor
+
+ _split gphoto2 \
+ lib/gvfs{-gphoto2-volume-monitor,d-gphoto2} \
+ lib/systemd/user/gvfs-gphoto2-volume-monitor.service \
+ share/dbus-1/services/org.gtk.vfs.GPhoto2VolumeMonitor.service \
+ share/gvfs/mounts/gphoto2.mount \
+ share/gvfs/remote-volume-monitors/gphoto2.monitor
+
+ _split mtp \
+ lib/gvfs{-mtp-volume-monitor,d-mtp} \
+ lib/systemd/user/gvfs-mtp-volume-monitor.service \
+ share/dbus-1/services/org.gtk.vfs.MTPVolumeMonitor.service \
+ share/gvfs/mounts/mtp.mount \
+ share/gvfs/remote-volume-monitors/mtp.monitor
+
+ _split goa \
+ lib/gvfs-goa-volume-monitor \
+ lib/systemd/user/gvfs-goa-volume-monitor.service \
+ share/dbus-1/services/org.gtk.vfs.GoaVolumeMonitor.service \
+ share/gvfs/remote-volume-monitors/goa.monitor
+
+ _split nfs \
+ lib/gvfsd-nfs \
+ share/gvfs/mounts/nfs.mount
+
+ _split google \
+ lib/gvfsd-google \
+ share/gvfs/mounts/google.mount
+}
+
+package_gvfs-smb() {
+ pkgdesc+=" (SMB/CIFS backend; Windows client)"
+ depends=("gvfs=$pkgver" smbclient)
+
+ mv "$srcdir/smb" "$pkgdir/usr"
+}
+
+package_gvfs-afc() {
+ pkgdesc+=" (AFC backend; Apple mobile devices)"
+ depends=("gvfs=$pkgver" libimobiledevice usbmuxd)
+
+ mv "$srcdir/afc" "$pkgdir/usr"
+}
+
+package_gvfs-gphoto2() {
+ pkgdesc+=" (gphoto2 backend; PTP camera, MTP media player)"
+ depends=("gvfs=$pkgver" libgphoto2)
+
+ mv "$srcdir/gphoto2" "$pkgdir/usr"
+}
+
+package_gvfs-mtp() {
+ pkgdesc+=" (MTP backend; Android, media player)"
+ depends=("gvfs=$pkgver" libmtp)
+
+ mv "$srcdir/mtp" "$pkgdir/usr"
+}
+
+package_gvfs-goa() {
+ pkgdesc+=" (Gnome Online Accounts backend; cloud storage)"
+ depends=("gvfs=$pkgver" gnome-online-accounts)
+
+ mv "$srcdir/goa" "$pkgdir/usr"
+}
+
+package_gvfs-nfs() {
+ pkgdesc+=" (NFS backend)"
+ depends=("gvfs=$pkgver" libnfs)
+ install=gvfs-nfs.install
+
+ mv "$srcdir/nfs" "$pkgdir/usr"
+}
+
+package_gvfs-google() {
+ pkgdesc+=" (Google Drive backend)"
+ depends=("gvfs-goa=$pkgver" libgdata)
+
+ mv "$srcdir/google" "$pkgdir/usr"
+}
Deleted: gvfs-nfs.install
===================================================================
--- gvfs-nfs.install 2018-06-07 08:28:38 UTC (rev 326204)
+++ gvfs-nfs.install 2018-06-07 08:28:48 UTC (rev 326205)
@@ -1,7 +0,0 @@
-post_install() {
- setcap 'cap_net_bind_service=+ep' usr/lib/gvfsd-nfs
-}
-
-post_upgrade() {
- post_install
-}
Copied: gvfs/repos/extra-x86_64/gvfs-nfs.install (from rev 326204, gvfs/trunk/gvfs-nfs.install)
===================================================================
--- gvfs-nfs.install (rev 0)
+++ gvfs-nfs.install 2018-06-07 08:28:48 UTC (rev 326205)
@@ -0,0 +1,7 @@
+post_install() {
+ setcap 'cap_net_bind_service=+ep' usr/lib/gvfsd-nfs
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: gvfsd.hook
===================================================================
--- gvfsd.hook 2018-06-07 08:28:38 UTC (rev 326204)
+++ gvfsd.hook 2018-06-07 08:28:48 UTC (rev 326205)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/gvfs/*
-
-[Action]
-Description = Reloading GVFS config...
-When = PostTransaction
-Exec = /bin/sh -c 'killall -q -s USR1 gvfsd || true'
Copied: gvfs/repos/extra-x86_64/gvfsd.hook (from rev 326204, gvfs/trunk/gvfsd.hook)
===================================================================
--- gvfsd.hook (rev 0)
+++ gvfsd.hook 2018-06-07 08:28:48 UTC (rev 326205)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/gvfs/*
+
+[Action]
+Description = Reloading GVFS config...
+When = PostTransaction
+Exec = /bin/sh -c 'killall -q -s USR1 gvfsd || true'
Copied: gvfs/repos/extra-x86_64/udisks2-fix-crashes-caused-by-missing-source-tag.patch (from rev 326204, gvfs/trunk/udisks2-fix-crashes-caused-by-missing-source-tag.patch)
===================================================================
--- udisks2-fix-crashes-caused-by-missing-source-tag.patch (rev 0)
+++ udisks2-fix-crashes-caused-by-missing-source-tag.patch 2018-06-07 08:28:48 UTC (rev 326205)
@@ -0,0 +1,29 @@
+From 38831e4ea149a0b4731d123c63d8b493d30ad0be Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy at redhat.com>
+Date: Sat, 26 May 2018 08:16:02 +0200
+Subject: [PATCH] udisks2: Fix crashes caused by missing source tag
+
+GAsyncReadyCallback is never called from g_drive_stop, because
+source_tag is not set, but checked. This obviously causes issues
+for client applications. Add missing source_tag.
+
+Closes: https://gitlab.gnome.org/GNOME/gvfs/issues/1
+---
+ monitor/udisks2/gvfsudisks2drive.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/monitor/udisks2/gvfsudisks2drive.c b/monitor/udisks2/gvfsudisks2drive.c
+index 52e9b75..8765668 100644
+--- a/monitor/udisks2/gvfsudisks2drive.c
++++ b/monitor/udisks2/gvfsudisks2drive.c
+@@ -915,6 +915,7 @@ gvfs_udisks2_drive_stop (GDrive *_drive,
+ GTask *task;
+
+ task = g_task_new (drive, cancellable, callback, user_data);
++ g_task_set_source_tag (task, gvfs_udisks2_drive_stop);
+
+ /* This information is needed in GVfsDdisks2Volume when apps have
+ * open files on the device ... we need to know if the button should
+--
+libgit2 0.27.1
+
More information about the arch-commits
mailing list