From 5fc50827f3cab63f1f7deaa3c0210526d7a09daf Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 17 Dec 2017 19:21:37 +0100 Subject: gvfs: update 1.32.1 -> 1.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * --with-archive-includes and --with-archive-libs were removed in [1] * --enable-gtk was removed in [2] * build tested with full (except cdda) and empty PACKAGECONFIG * run tested with PACKAGECONFIG = "archive gcr libmtp libgphoto2 samba systemd" * fixes long delay when unmounting memory sticks [1] https://git.gnome.org/browse/gvfs/commit/configure.ac?id=03fbe16aebced70118f070f898d7b459e1125580 [2] https://git.gnome.org/browse/gvfs/commit/configure.ac?id=dff13283c943c8b10265bd3925d86f17cdc4be6f Signed-off-by: Andreas Müller Signed-off-by: Armin Kuster --- meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb | 66 ---------------------------- meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb | 63 ++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 66 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb create mode 100644 meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb deleted file mode 100644 index d38068836c..0000000000 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.32.1.bb +++ /dev/null @@ -1,66 +0,0 @@ -DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" - -inherit gnome bash-completion gettext - -DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native" - -SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" - -SRC_URI[archive.md5sum] = "cbe766b46f324e17d7abcfb4a89a1684" -SRC_URI[archive.sha256sum] = "d0b6c9edab09d52472355657a2f0a14831b2e6c58caba395f721ab683f836ade" - -EXTRA_OECONF = " \ - --disable-gdu \ - --enable-udisks2 \ - --disable-documentation \ - --with-archive-includes=${STAGING_INCDIR} \ - --with-archive-libs=${STAGING_LIBDIR} \ -" - -PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" - -FILES_${PN} += " \ - ${datadir}/glib-2.0 \ - ${datadir}/GConf \ - ${datadir}/dbus-1/services \ - ${libdir}/gio/modules/*.so \ - ${libdir}/tmpfiles.d \ - ${systemd_user_unitdir} \ -" -RDEPENDS_${PN} = "udisks2" - -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" -FILES_${PN}-dev += "${libdir}/gio/modules/*.la" - -FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" -FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" -FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" - -RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" - -PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist" -PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive" -PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi" -PACKAGECONFIG[gcr] = "--enable-gcr, --disable-gcr, gcr" -PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+3" -PACKAGECONFIG[http] = "--enable-http, --disable-http, libsoup-2.4" -PACKAGECONFIG[libmtp] = "--enable-libmtp, --disable-libmtp, libmtp" -PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" -PACKAGECONFIG[samba] = "--enable-samba, --disable-samba, samba" -PACKAGECONFIG[systemd] = "--with-systemduserunitdir=${systemd_user_unitdir},--without-systemduserunitdir,systemd" - -# needs meta-filesystems -PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse" - -# libcdio-paranoia recipe doesn't exist yet -PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio-paranoia" - -# Fix up permissions on polkit rules.d to work with rpm4 constraints -do_install_append() { - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d -} diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb new file mode 100644 index 0000000000..8d7865fd6f --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.34.1.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +inherit gnome bash-completion gettext + +DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2 polkit shadow-native" + +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "44012824aa75797a7d272cd60f07b488" +SRC_URI[archive.sha256sum] = "7ef9b2aec234004271a575118a0e35b3c36ce3309e5f9da109635651843372b4" + +EXTRA_OECONF = " \ + --disable-gdu \ + --enable-udisks2 \ + --disable-documentation \ +" + +PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash" + +FILES_${PN} += " \ + ${datadir}/glib-2.0 \ + ${datadir}/GConf \ + ${datadir}/dbus-1/services \ + ${libdir}/gio/modules/*.so \ + ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ +" +RDEPENDS_${PN} = "udisks2" + +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*" +FILES_${PN}-dev += "${libdir}/gio/modules/*.la" + +FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${datadir}/gvfs/mounts/ftp.mount" +FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${datadir}/gvfs/mounts/sftp.mount" +FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.mount" + +RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" + +PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist" +PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive" +PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi" +PACKAGECONFIG[gcr] = "--enable-gcr, --disable-gcr, gcr" +PACKAGECONFIG[http] = "--enable-http, --disable-http, libsoup-2.4" +PACKAGECONFIG[libmtp] = "--enable-libmtp, --disable-libmtp, libmtp" +PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" +PACKAGECONFIG[samba] = "--enable-samba, --disable-samba, samba" +PACKAGECONFIG[systemd] = "--with-systemduserunitdir=${systemd_user_unitdir},--without-systemduserunitdir,systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "--enable-cdda, --disable-cdda, libcdio-paranoia" + +# Fix up permissions on polkit rules.d to work with rpm4 constraints +do_install_append() { + chmod 700 ${D}/${datadir}/polkit-1/rules.d + chown polkitd:root ${D}/${datadir}/polkit-1/rules.d +} -- cgit 1.2.3-korg