Merge pull request #6846 from Rmys/master

gvfs:ver.bump

desktop/gnome/base/gvfs/actions.py

@@ -2,37 +2,33 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/copyleft/gpl.txt.
+# See the file http://www.gnu.org/licenses/gpl.txt
 
-from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
 
 def setup():
-    autotools.autoreconf("-vfi")
+    shelltools.makedirs("build")
+    shelltools.cd("build")
+    shelltools.system("meson --prefix=/usr \
+                                -Ddbus_service_dir=/usr/share/dbus-1/services \
+                                -Dlogind=false \
+                                -Dnfs=false \
+                                -Dgoa=false \
+                                -Dman=true \
+                                -Dgoogle=false \
+                                -Dtmpfilesdir=lib/tmpfiles.d \
+                                -Dsystemduserunitdir=no ..")
     
-    autotools.configure("\
-                         --with-dbus-service-dir=/usr/share/dbus-1/services \
-                         --disable-silent-rules \
-                         --disable-static \
-                         --enable-afc \
-                         --enable-archive \
-                         --enable-bluray \
-                         --enable-gphoto2 \
-                         --enable-keyring \
-                         --enable-samba \
-                         --enable-udev \
-                         --enable-udisks2 \
-                        ")
-
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
-
 def build():
-    autotools.make()
+    shelltools.cd("build")
-
+    shelltools.system("ninja")
+    
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    shelltools.cd("build")
-
+    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
-    shelltools.copy("daemon/trashlib/COPYING", "COPYING.GPL3")
+    
-    pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README")
+    shelltools.cd("..")
+    pisitools.dodoc("COPYING*", "AUTHORS", "NEWS", "README")

desktop/gnome/base/gvfs/pspec.xml

@@ -13,8 +13,9 @@
         <IsA>library</IsA>
         <Summary>New generation gnome-virtual-file-system</Summary>
         <Description>GVFS is a userspace virtual filesystem designed to work with the I/O abstractions, especially HAL. It supports fuse for directly access for GVFS mounts. It installs several modules and backends that are automatically used by applications.</Description>
-        <Archive sha1sum="bef1fe8d0ab35c00e67660252dff224699273355" type="tarxz">mirrors://gnome/gvfs/1.34/gvfs-1.34.2.tar.xz</Archive>
+        <Archive sha1sum="fb5fe05f0661da8c88f5fa41014bcd526ad39993" type="tarxz">mirrors://gnome/gvfs/1.36/gvfs-1.36.2.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>gtk-doc</Dependency>
             <Dependency>gtk3-devel</Dependency>
             <Dependency>fuse-devel</Dependency>
@@ -31,6 +32,7 @@
             <Dependency>unifdef</Dependency>
             <Dependency>gettext-devel</Dependency>
             <Dependency>m4</Dependency>
+            <Dependency>openssh</Dependency>
             <Dependency>gcr-devel</Dependency>
             <Dependency>udisks2-devel</Dependency>
             <Dependency>libgudev-devel</Dependency>
@@ -296,6 +298,13 @@
     </Package>
 
     <History>
+        <Update release="7">
+            <Date>2019-04-25</Date>
+            <Version>1.36.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2018-01-02</Date>
             <Version>1.34.2</Version>