From debe4d85a35f74e9725158cde11fa85ca314aa04 Mon Sep 17 00:00:00 2001 From: chengguipeng Date: Wed, 12 Aug 2020 12:04:59 +0800 Subject: [PATCH 1/2] gvfs: Resolve the compilation failure caused by the libplist upgrade. Signed-off-by: chengguipeng --- gvfs.spec | 4 +++- ...tion-failure-caused-by-the-libplist-upgrade.patch | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch diff --git a/gvfs.spec b/gvfs.spec index 073e488..e061df0 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -31,6 +31,8 @@ URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.40/gvfs-%{version}.tar.xz +Patch0001: resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch + BuildRequires: /usr/bin/ssh BuildRequires: meson gcc pkgconfig pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(dbus-glib-1) pkgconfig(gcr-3) BuildRequires: openssl-devel gdb @@ -48,7 +50,7 @@ BuildRequires: pkgconfig(libgphoto2) >= %{libgphoto2_version} BuildRequires: libusb-devel >= %{libusb_version} libexif-devel BuildRequires: pkgconfig(fuse) >= %{fuse_version} BuildRequires: pkgconfig(libimobiledevice-1.0) >= %{libimobiledevice_version} -BuildRequires: pkgconfig(libplist) >= %{libplist_version} +BuildRequires: pkgconfig(libplist-2.0) >= %{libplist_version} BuildRequires: libgcrypt-devel >= %{libgcrypt_version} BuildRequires: pkgconfig(libmtp) >= %{libmtp_version} BuildRequires: pkgconfig(libnfs) >= %{libnfs_version} gdb diff --git a/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch b/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch new file mode 100644 index 0000000..c4751cb --- /dev/null +++ b/resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch @@ -0,0 +1,12 @@ +diff -Nuar gvfs-1.40.2.origin/meson.build gvfs-1.40.2/meson.build +--- gvfs-1.40.2.origin/meson.build 2020-08-12 10:56:28.913116340 +0800 ++++ gvfs-1.40.2/meson.build 2020-08-12 11:02:03.356989688 +0800 +@@ -355,7 +355,7 @@ + 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', version: '>= 0.15') + endif + + # *** Check if we should build with GOA volume monitor *** From 4a8de4090358b96a68a6da593dfad188472e636d Mon Sep 17 00:00:00 2001 From: chengguipeng_xian Date: Wed, 12 Aug 2020 15:29:20 +0800 Subject: [PATCH 2/2] update gvfs.spec. --- gvfs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gvfs.spec b/gvfs.spec index e061df0..df0fd99 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -24,7 +24,7 @@ Name: gvfs Version: 1.40.2 -Release: 6 +Release: 7 Summary: gvfs is a backends for the gio framework in GLib License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 URL: https://wiki.gnome.org/Projects/gvfs @@ -207,6 +207,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_mandir}/man1/gvfsd-fuse.1* %changelog +* Wed Aug 12 2020 chengguipeng - 1.40.2-7 +- Resolve the compilation failure caused by the libplist upgrade. + * Sat Mar 21 2020 songnannan - 1.40.2-6 - bugfix about update