diff --git a/desktop/gnome/base/gvfs/actions.py b/desktop/gnome/base/gvfs/actions.py index 75cde1a3fe..d450a51559 100644 --- a/desktop/gnome/base/gvfs/actions.py +++ b/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.copy("daemon/trashlib/COPYING", "COPYING.GPL3") - pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING*", "NEWS", "README") + shelltools.cd("build") + shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) + + shelltools.cd("..") + pisitools.dodoc("COPYING*", "AUTHORS", "NEWS", "README") diff --git a/desktop/gnome/base/gvfs/pspec.xml b/desktop/gnome/base/gvfs/pspec.xml index 147f2bb85e..1e6bdb7f43 100644 --- a/desktop/gnome/base/gvfs/pspec.xml +++ b/desktop/gnome/base/gvfs/pspec.xml @@ -13,8 +13,9 @@ library New generation gnome-virtual-file-system 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. - mirrors://gnome/gvfs/1.34/gvfs-1.34.2.tar.xz + mirrors://gnome/gvfs/1.36/gvfs-1.36.2.tar.xz + meson gtk-doc gtk3-devel fuse-devel @@ -31,6 +32,7 @@ unifdef gettext-devel m4 + openssh gcr-devel udisks2-devel libgudev-devel @@ -296,6 +298,13 @@ + + 2019-04-25 + 1.36.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2018-01-02 1.34.2