diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-26 07:28:25 +0000 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-02 10:54:37 +0000 |
commit | c1be2c6b8b667697b23b2405637a24bb8888e72a (patch) | |
tree | e929aad6dd4fbd9aebe9a9b4107094814bbcf9f9 /gnu/packages/patches | |
parent | a1ab329f33c666aa1eaa7444320b641487b8419c (diff) | |
download | guix-patches-c1be2c6b8b667697b23b2405637a24bb8888e72a.tar guix-patches-c1be2c6b8b667697b23b2405637a24bb8888e72a.tar.gz |
gnu: gvfs: Update to 1.48.1.
* gnu/packages/patches/gvfs-add-support-for-libplist-2.2.patch: Remove it.
* gnu/local.mk (DIST_PATCH_DATA): Update it.
* gnu/packages/gnome.scm (gvfs)[source]: Remove the patch.
[inputs]: Switch to fuse@3 and add gsettings-desktop-schemas.
[properties]: Remove it.
[description]: Wrap it.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/gvfs-add-support-for-libplist-2.2.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/gnu/packages/patches/gvfs-add-support-for-libplist-2.2.patch b/gnu/packages/patches/gvfs-add-support-for-libplist-2.2.patch deleted file mode 100644 index 250eef2c8b..0000000000 --- a/gnu/packages/patches/gvfs-add-support-for-libplist-2.2.patch +++ /dev/null @@ -1,34 +0,0 @@ -Source: https://gitlab.gnome.org/GNOME/gvfs/-/commit/13551f3f40d41f1357126ac5a26d0fa012cd8123 - -Note: This change should be incorporated into stable version 1.46.x of gvfs. - -From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Tue, 16 Jun 2020 13:28:35 +0200 -Subject: [PATCH] afc: Add support for libplist-2.2 - -Which changed name from libplist to libplist-2.0 to embed its API -version number in the library name. ---- - meson.build | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1750f65ca..187bfd55f 100644 ---- a/meson.build -+++ b/meson.build -@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind) - enable_afc = get_option('afc') - if enable_afc - libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2') -- libplist_dep = dependency('libplist', version: '>= 0.15') -+ libplist_dep = dependency('libplist-2.0', required: false) -+ if not libplist_dep.found() -+ libplist_dep = dependency('libplist', version: '>= 0.15') -+ endif - endif - - # *** Check if we should build with GOA volume monitor *** --- -GitLab - |