From fae12cab32703ee68f116beef9570ceddb5a6bc4 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 30 Oct 2018 15:59:25 +0800 Subject: gvfs: 1.36.2 -> 1.39.1 Upgrade gvfs from 1.36.2 to 1.39.1. * autotools has been removed, use meson instead * add packageconfigs dnssd and logind * disable options bluray, goa, google and nfs Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb | 68 --------------------------- meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb | 70 ++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 68 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb create mode 100644 meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb deleted file mode 100644 index 1e8f8d180..000000000 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.36.2.bb +++ /dev/null @@ -1,68 +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] = "10b84073fe5f3d540abd9d36ed342b37" -SRC_URI[archive.sha256sum] = "c4e279a33dd9cd208135e8bfc4788ceaf264c61a24a85255f6696a934a0101f7" - -do_configure_prepend() { - # make automake happy.. - touch ${S}/ABOUT-NLS -} - -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 -} diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb new file mode 100644 index 000000000..ca1eb6aa7 --- /dev/null +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.39.1.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "gvfs is a userspace virtual filesystem" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" + +GNOMEBASEBUILDCLASS = "meson" +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] = "4c68899cfd80d57a153771534193bb9a" +SRC_URI[archive.sha256sum] = "6e7213570389b17b67433695f515f3b17705ba976168a4c8828fc177cce50223" + + +EXTRA_OEMESON = " \ + -Dbluray=false \ + -Dgdu=false \ + -Dgoa=false \ + -Dgoogle=false \ + -Dnfs=false \ + -Dudisks2=true \ + -Ddocumentation=false \ +" + +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] = "-Dafc=true, -Dafc=false, libimobiledevice libplist" +PACKAGECONFIG[archive] = "-Darchive=true, -Darchive=false, libarchive" +PACKAGECONFIG[dnssd] = "-Ddnssd=true, -Ddnssd=false, avahi" +PACKAGECONFIG[gcr] = "-Dgcr=true, -Dgcr=false, gcr" +PACKAGECONFIG[http] = "-Dhttp=true, -Dhttp=false, libsoup-2.4" +PACKAGECONFIG[libmtp] = "-Dmtp=true, -Dmtp=false, libmtp" +PACKAGECONFIG[logind] = "-Dlogind=true, -Dlogind=false, systemd" +PACKAGECONFIG[libgphoto2] = "-Dgphoto2=true, -Dgphoto2=false, libgphoto2" +PACKAGECONFIG[samba] = "-Dsmb=true, -Dsmb=false, samba" +PACKAGECONFIG[systemd] = "-Dsystemduserunitdir=${systemd_user_unitdir} -Dtmpfilesdir=${libdir}/tmpfiles.d, -Dsystemduserunitdir=no -Dtmpfilesdir=no, systemd" + +# needs meta-filesystems +PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse" + +# libcdio-paranoia recipe doesn't exist yet +PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, 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 v1.2.3-54-g00ecf