Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/files/
Date: Tue, 01 Jun 2021 19:02:15
Message-Id: 1622574091.98b2aaa63da9d188f201d671a9a823e9e482f144.mattst88@gentoo
1 commit: 98b2aaa63da9d188f201d671a9a823e9e482f144
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Jun 1 17:29:22 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 1 19:01:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b2aaa6
7
8 gnome-base/gvfs: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.19, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 gnome-base/gvfs/files/libplist-2.2.patch | 30 ------------------------------
15 1 file changed, 30 deletions(-)
16
17 diff --git a/gnome-base/gvfs/files/libplist-2.2.patch b/gnome-base/gvfs/files/libplist-2.2.patch
18 deleted file mode 100644
19 index 72634b58b69..00000000000
20 --- a/gnome-base/gvfs/files/libplist-2.2.patch
21 +++ /dev/null
22 @@ -1,30 +0,0 @@
23 -From 13551f3f40d41f1357126ac5a26d0fa012cd8123 Mon Sep 17 00:00:00 2001
24 -From: Bastien Nocera <hadess@××××××.net>
25 -Date: Tue, 16 Jun 2020 13:28:35 +0200
26 -Subject: [PATCH] afc: Add support for libplist-2.2
27 -
28 -Which changed name from libplist to libplist-2.0 to embed its API
29 -version number in the library name.
30 ----
31 - meson.build | 5 ++++-
32 - 1 file changed, 4 insertions(+), 1 deletion(-)
33 -
34 -diff --git a/meson.build b/meson.build
35 -index 1750f65c..187bfd55 100644
36 ---- a/meson.build
37 -+++ b/meson.build
38 -@@ -357,7 +357,10 @@ config_h.set('HAVE_LOGIND', enable_logind)
39 - enable_afc = get_option('afc')
40 - if enable_afc
41 - libimobiledevice_dep = dependency('libimobiledevice-1.0', version: '>= 1.2')
42 -- libplist_dep = dependency('libplist', version: '>= 0.15')
43 -+ libplist_dep = dependency('libplist-2.0', required: false)
44 -+ if not libplist_dep.found()
45 -+ libplist_dep = dependency('libplist', version: '>= 0.15')
46 -+ endif
47 - endif
48 -
49 - # *** Check if we should build with GOA volume monitor ***
50 ---
51 -2.20.1
52 -