Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (bdcc6e391b84b361a39f93c1f13f582fc4619cf8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (bdcc6e391b84b361a39f93c1f13f582fc4619cf8)
  • Date: Sat, 8 Sep 2012 19:30:31 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

gnome2-libs/gvfs/HISTORY | 4 ++
gnome2-libs/gvfs/PRE_BUILD | 3 +
gnome2-libs/gvfs/gvfs-gphoto25.patch | 59
+++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+)

New commits:
commit e9eb48d0ceffd61716ea6663914b75c0a5885149
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gvfs: apply patch to build with gphoto 2.5

diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index d0cf1e5..5a13287 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,7 @@
+2012-09-08 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch to work with gphoto 2.5
+ based on this one -
http://pkgs.fedoraproject.org/cgit/gvfs.git/commit/?id=cd0c6218df85bf3de101402c1aa9d79aae7c3019
+
2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected dependency for HTTP/FTP support

diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
new file mode 100755
index 0000000..26612f4
--- /dev/null
+++ b/gnome2-libs/gvfs/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY
+patch -p1 < $SPELL_DIRECTORY/gvfs-gphoto25.patch
diff --git a/gnome2-libs/gvfs/gvfs-gphoto25.patch
b/gnome2-libs/gvfs/gvfs-gphoto25.patch
new file mode 100644
index 0000000..361fcb7
--- /dev/null
+++ b/gnome2-libs/gvfs/gvfs-gphoto25.patch
@@ -0,0 +1,59 @@
+diff -ur gvfs-1.12.3/configure.ac gvfs-mod/configure.ac
+--- gvfs-1.12.3/configure.ac 2012-05-15 13:04:27.000000000 -0500
++++ gvfs-mod/configure.ac 2012-09-08 19:15:26.998713492 -0500
+@@ -397,6 +397,9 @@
+ if test "x$use_gphoto2" = "xyes"; then
+ PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
+ 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
+ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal
volume monitor.])
+ msg_gphoto2=no
+diff -ur gvfs-1.12.3/daemon/gvfsbackendgphoto2.c
gvfs-mod/daemon/gvfsbackendgphoto2.c
+--- gvfs-1.12.3/daemon/gvfsbackendgphoto2.c 2012-05-15 13:01:50.000000000
-0500
++++ gvfs-mod/daemon/gvfsbackendgphoto2.c 2012-09-08 19:22:51.463710301
-0500
+@@ -1647,7 +1647,7 @@
+ 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 @@
+ }
+ }
+
+- rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest,
gphoto2_backend->context);
++ #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 @@
+ 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);
+
+- rc = gp_camera_folder_put_file (gphoto2_backend->camera,
write_handle->dir, file, gphoto2_backend->context);
++ #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);



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (bdcc6e391b84b361a39f93c1f13f582fc4619cf8), Robin Cook, 09/08/2012

Archive powered by MHonArc 2.6.24.

Top of Page