diff options
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch | 49 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb (renamed from meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb) | 18 |
2 files changed, 7 insertions, 60 deletions
diff --git a/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch b/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch deleted file mode 100644 index 7ec9505582..0000000000 --- a/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 39be8b277c666db21965d54d5b72418ce57a450b Mon Sep 17 00:00:00 2001 -From: Michael Biebl <biebl@debian.org> -Date: Tue, 19 May 2015 23:38:11 +0200 -Subject: [PATCH] Add support for libsystemd - -In systemd v209 the various libsystemd-* libraries were merged into a -single libsystemd library. So first check for this library and fall back -to libsystemd-login if not found. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749603 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779766 - -Upstream-Status: Applied ---- - configure.ac | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee3475d..bd5c043 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -264,18 +264,20 @@ dnl ********************************** - dnl *** Check for libsystemd-login *** - dnl ********************************** - --AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login])) -+AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])) - msg_libsystemd_login=no - LIBSYSTEMD_LOGIN_LIBS= - LIBSYSTEMD_LOGIN_CFLAGS= - LIBSYSTEMD_LOGIN_REQUIRED=44 - - if test "x$enable_libsystemd_login" != "xno"; then -- PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes) -+ PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes], -+ [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)]) - - if test "x$msg_libsystemd_login" = "xyes"; then -- PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED]) -- AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available]) -+ PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],, -+ [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])]) -+ AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available]) - fi - fi - --- -2.5.0 - diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb index aa6207019f..fde57c1bf8 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb @@ -2,15 +2,12 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -inherit gnome +inherit gnome bash-completion DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2" -SRC_URI[archive.md5sum] = "83ed317eb2a5264715d4273e90a5cfd8" -SRC_URI[archive.sha256sum] = "0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228" -SRC_URI += " \ - file://0001-Add-support-for-libsystemd.patch \ -" +SRC_URI[archive.md5sum] = "d2399a1a217dd5030e8830c7e7c813c2" +SRC_URI[archive.sha256sum] = "458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17" EXTRA_OECONF = " \ --disable-gdu \ @@ -28,6 +25,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${libdir}/gio/modules/*.so \ ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ " RDEPENDS_${PN} = "udisks2" @@ -40,20 +38,18 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" -PACKAGES += "${PN}-bash-completion" -FILES_${PN}-bash-completion = "${datadir}/bash-completion" -RDEPENDS_${PN}-bash-completion = "bash-completion" - -PACKAGECONFIG ?= "libgphoto2" +PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '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" |