[arch-commits] Commit in gvfs/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, September 5, 2018 @ 00:47:45
  Author: heftig
Revision: 333370

1.38.0+3+g7da3b0ba-1

Modified:
  gvfs/trunk/PKGBUILD	(contents, properties)
Deleted:
  gvfs/trunk/udisks2-fix-crashes-caused-by-missing-source-tag.patch

--------------------------------------------------------+
 PKGBUILD                                               |   18 ++++-----
 udisks2-fix-crashes-caused-by-missing-source-tag.patch |   29 ---------------
 2 files changed, 8 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-05 00:43:52 UTC (rev 333369)
+++ PKGBUILD	2018-09-05 00:47:45 UTC (rev 333370)
@@ -1,10 +1,10 @@
-# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 # 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=3
+pkgver=1.38.0+3+g7da3b0ba
+pkgrel=1
 pkgdesc="Virtual filesystem implementation for GIO"
 url="https://wiki.gnome.org/Projects/gvfs"
 arch=(x86_64)
@@ -14,18 +14,14 @@
 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
+_commit=7da3b0ba2e207ce0b8a1bdfe023d6cf6d3764ed9  # gnome-3-30
+source=("git+https://gitlab.gnome.org/GNOME/gvfs.git#commit=$_commit"
         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() {
@@ -34,7 +30,7 @@
 }
 
 build() {
-  arch-meson $pkgbase build -D man=true -D deprecated_programs=true
+  arch-meson $pkgbase build -D man=true
   ninja -C build
 }
 
@@ -164,3 +160,5 @@
 
   mv "$srcdir/google" "$pkgdir/usr"
 }
+
+# vim:set sw=2 et:


Property changes on: gvfs/trunk/PKGBUILD
___________________________________________________________________
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Deleted: udisks2-fix-crashes-caused-by-missing-source-tag.patch
===================================================================
--- udisks2-fix-crashes-caused-by-missing-source-tag.patch	2018-09-05 00:43:52 UTC (rev 333369)
+++ udisks2-fix-crashes-caused-by-missing-source-tag.patch	2018-09-05 00:47:45 UTC (rev 333370)
@@ -1,29 +0,0 @@
-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
-