diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2020-07-18 13:40:23 +0300 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2020-07-18 13:57:08 +0300 |
| commit | 2ca507c7d233cf27beab30e1bcf626026288203e (patch) | |
| tree | 4da33dae5900063e134a4778c754dd73d874f3d3 /gnome-base | |
| parent | gnome-base/dconf: bump to 0.36.0 (diff) | |
| download | gentoo-2ca507c7d233cf27beab30e1bcf626026288203e.tar.gz gentoo-2ca507c7d233cf27beab30e1bcf626026288203e.tar.bz2 gentoo-2ca507c7d233cf27beab30e1bcf626026288203e.zip | |
gnome-base/gvfs: fix compatibility with libplist-2.2
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gvfs/files/libplist-2.2.patch | 30 | ||||
| -rw-r--r-- | gnome-base/gvfs/gvfs-1.42.2.ebuild | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/gnome-base/gvfs/files/libplist-2.2.patch b/gnome-base/gvfs/files/libplist-2.2.patch new file mode 100644 index 000000000000..72634b58b69f --- /dev/null +++ b/gnome-base/gvfs/files/libplist-2.2.patch @@ -0,0 +1,30 @@ +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 1750f65c..187bfd55 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 *** +-- +2.20.1 + diff --git a/gnome-base/gvfs/gvfs-1.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild index 9d564417391f..799db1bc3d99 100644 --- a/gnome-base/gvfs/gvfs-1.42.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild @@ -76,6 +76,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}"/patches + "${FILESDIR}"/libplist-2.2.patch ) src_configure() { |