packages/gvfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 gvfs: Resolve the compilation failure caused by the libplist upgrade.

Browse Source 
Merge pull request !9 from chengguipeng_xian/master
This commit is contained in:
openeuler-ci-bot 2020-08-12 16:08:44 +08:00 committed by Gitee
commit afb213b985
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gvfs.spec
View File

@ -24,13 +24,15 @@
Name: gvfs Name: gvfs
Version: 1.40.2 Version: 1.40.2
Release: 6 Release: 7
Summary: gvfs is a backends for the gio framework in GLib Summary: gvfs is a backends for the gio framework in GLib
License: GPLv3 and LGPLv2+ and BSD and MPLv2.0 License: GPLv3 and LGPLv2+ and BSD and MPLv2.0
URL: https://wiki.gnome.org/Projects/gvfs URL: https://wiki.gnome.org/Projects/gvfs
Source0: https://download.gnome.org/sources/gvfs/1.40/gvfs-%{version}.tar.xz 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: /usr/bin/ssh
BuildRequires: meson gcc pkgconfig pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(dbus-glib-1) pkgconfig(gcr-3) BuildRequires: meson gcc pkgconfig pkgconfig(glib-2.0) >= %{glib2_version} pkgconfig(dbus-glib-1) pkgconfig(gcr-3)
BuildRequires: openssl-devel gdb BuildRequires: openssl-devel gdb
@ -48,7 +50,7 @@ BuildRequires: pkgconfig(libgphoto2) >= %{libgphoto2_version}
BuildRequires: libusb-devel >= %{libusb_version} libexif-devel BuildRequires: libusb-devel >= %{libusb_version} libexif-devel
BuildRequires: pkgconfig(fuse) >= %{fuse_version} BuildRequires: pkgconfig(fuse) >= %{fuse_version}
BuildRequires: pkgconfig(libimobiledevice-1.0) >= %{libimobiledevice_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: libgcrypt-devel >= %{libgcrypt_version}
BuildRequires: pkgconfig(libmtp) >= %{libmtp_version} BuildRequires: pkgconfig(libmtp) >= %{libmtp_version}
BuildRequires: pkgconfig(libnfs) >= %{libnfs_version} gdb BuildRequires: pkgconfig(libnfs) >= %{libnfs_version} gdb
@ -205,6 +207,9 @@ killall -USR1 gvfsd >&/dev/null || :
%{_mandir}/man1/gvfsd-fuse.1* %{_mandir}/man1/gvfsd-fuse.1*
%changelog %changelog
* Wed Aug 12 2020 chengguipeng<chengguipeng1@huawei.com> - 1.40.2-7
- Resolve the compilation failure caused by the libplist upgrade.
* Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 1.40.2-6 * Sat Mar 21 2020 songnannan <songnannan2@huawei.com> - 1.40.2-6
- bugfix about update - bugfix about update

12
resolve-the-compilation-failure-caused-by-the-libplist-upgrade.patch Normal file
View File

@ -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 ***