diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-01-17 19:09:19 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-01-17 19:09:19 +0000 |
| commit | 4a8ee477e6fba392f4febbeb358593676a3fc648 (patch) | |
| tree | 89a3cf4913dd78772a9dc3b1aa583b000fbd576f /devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c | |
| parent | - Set EXTRACT_SUFX and dismiss USE_ZIP (diff) | |
Fix build with new gphoto2. [1]
While here:
Use new LIB_DEPENDS syntax, use USES=pathfix.
Add portscout macro, strip and stagify.
Obtained from: Gentoo [1]
Diffstat (limited to 'devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c')
| -rw-r--r-- | devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c b/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c new file mode 100644 index 000000000000..d2a369967729 --- /dev/null +++ b/devel/gvfs/files/patch-daemon_gvfsbackendgphoto2.c @@ -0,0 +1,44 @@ +--- daemon/gvfsbackendgphoto2.c.orig 2012-05-16 02:01:50.000000000 +0800 ++++ daemon/gvfsbackendgphoto2.c 2014-01-18 01:43:32.000000000 +0800 +@@ -1647,7 +1647,9 @@ + return; + } + ++#ifndef HAVE_GPHOTO25 + DEBUG (" '%s' '%s' '%s'", info.name, info.path, info.library_filename); ++#endif + + /* set port */ + rc = gp_camera_set_port_info (gphoto2_backend->camera, info); +@@ -2590,7 +2592,11 @@ + } + } + ++#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 +3228,18 @@ + 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); |
