[gvfs] Add patch to fix gvfs build against libgphoto2 (inspired by SUSE)add patch to fix gvfs build against
Jindrich Novy
jnovy at fedoraproject.org
Sun Aug 5 10:15:44 UTC 2012
commit cd0c6218df85bf3de101402c1aa9d79aae7c3019
Author: Jindrich Novy <jnovy at redhat.com>
Date: Sun Aug 5 12:18:32 2012 +0200
Add patch to fix gvfs build against libgphoto2 (inspired by SUSE)add patch to fix gvfs build against libgphoto2 (inspired by SUSE)
gvfs-gphoto25.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
gvfs.spec | 7 +++++-
2 files changed, 63 insertions(+), 1 deletions(-)
---
diff --git a/gvfs-gphoto25.patch b/gvfs-gphoto25.patch
new file mode 100644
index 0000000..bd5847c
--- /dev/null
+++ b/gvfs-gphoto25.patch
@@ -0,0 +1,57 @@
+diff -up gvfs-1.13.3/configure.ac.gphoto25 gvfs-1.13.3/configure.ac
+--- gvfs-1.13.3/configure.ac.gphoto25 2012-07-16 17:57:18.000000000 +0200
++++ gvfs-1.13.3/configure.ac 2012-08-04 20:05:19.466122563 +0200
+@@ -436,6 +436,9 @@ if test "x$enable_gphoto2" != "xno" -a \
+ if test "x$msg_gphoto2" = "xyes"; then
+ if test "x$use_gphoto2" = "xyes"; then
+ AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
++ PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
++ AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available])
++ )
+ else
+ if test "x$enable_gphoto2" = "xyes"; then
+ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
+diff -up gvfs-1.13.3/daemon/gvfsbackendgphoto2.c.gphoto25 gvfs-1.13.3/daemon/gvfsbackendgphoto2.c
+--- gvfs-1.13.3/daemon/gvfsbackendgphoto2.c.gphoto25 2012-07-16 17:31:26.000000000 +0200
++++ gvfs-1.13.3/daemon/gvfsbackendgphoto2.c 2012-08-04 20:02:26.887280094 +0200
+@@ -1647,7 +1647,7 @@ do_mount (GVfsBackend *backend,
+ return;
+ }
+
+- DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename);
++ /*DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename);*/
+
+ /* set port */
+ rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
+@@ -2590,7 +2590,11 @@ do_slow_file_rename_in_same_dir (GVfsBac
+ }
+ }
+
++#ifdef HAVE_GPHOTO25
++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
++#else
+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context);
++#endif
+ if (rc != 0)
+ goto out;
+
+@@ -3222,14 +3226,18 @@ commit_write_handle (GVfsBackendGphoto2
+ if (rc != 0)
+ goto out;
+
+- gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
+ gp_file_set_name (file, write_handle->name);
+ gp_file_set_mtime (file, time (NULL));
+ gp_file_set_data_and_size (file,
+ dup_for_gphoto2 (write_handle->data, write_handle->size),
+ write_handle->size);
+
++#ifdef HAVE_GPHOTO25
++ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context);
++#else
++ gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
+ rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context);
++#endif
+ if (rc != 0)
+ {
+ gp_file_unref (file);
diff --git a/gvfs.spec b/gvfs.spec
index 8b6509a..60b6730 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
Version: 1.13.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -37,6 +37,7 @@ BuildRequires: libtool
# http://bugzilla.gnome.org/show_bug.cgi?id=567235
Patch0: gvfs-archive-integration.patch
+Patch1: gvfs-gphoto25.patch
Obsoletes: gnome-mount <= 0.8
Obsoletes: gnome-mount-nautilus-properties <= 0.8
@@ -151,6 +152,7 @@ to applications using gvfs.
%prep
%setup -q
%patch0 -p1 -b .archive-integration
+%patch1 -p1 -b .gphoto25
%build
@@ -325,6 +327,9 @@ killall -USR1 gvfsd >&/dev/null || :
%{_datadir}/gvfs/mounts/afp-browse.mount
%changelog
+* Sun Aug 5 2012 Jindrich Novy <jnovy at redhat.com> - 1.13.3-3
+- add patch to fix gvfs build against libgphoto2 (inspired by SUSE)
+
* Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list