gvfs: => 1.14.2

7 files changed, 6 insertions, 69 deletions

diff --git a/gnome2-libs/gvfs/DEPENDS b/gnome2-libs/gvfs/DEPENDS
index 04083de5b0..50c76ad024 100755
--- a/gnome2-libs/gvfs/DEPENDS
+++ b/gnome2-libs/gvfs/DEPENDS
@@ -41,11 +41,6 @@ optional_depends fuse                                \
                  "--disable-fuse"                    \
                  "build with FUSE support"           &&
 
-optional_depends gconf2                              \
-                 "--enable-gconf"                    \
-                 "--disable-gconf"                   \
-                 "build with GConf support"          &&
-
 optional_depends hal                                 \
                  "--enable-hal"                      \
                  "--disable-hal"                     \
diff --git a/gnome2-libs/gvfs/DETAILS b/gnome2-libs/gvfs/DETAILS
index 8e0cc5cef8..f0063ed536 100755
--- a/gnome2-libs/gvfs/DETAILS
+++ b/gnome2-libs/gvfs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=gvfs
-         VERSION=1.12.3
+         VERSION=1.14.2
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$SPELL-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/gnome2-libs/gvfs/HISTORY b/gnome2-libs/gvfs/HISTORY
index cad61a0ad0..5c7ed7406b 100644
--- a/gnome2-libs/gvfs/HISTORY
+++ b/gnome2-libs/gvfs/HISTORY
@@ -1,3 +1,8 @@
+2012-11-24 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 1.14.2
+	* DEPENDS: removed gconf2 deprecated dependency
+	* PRE_BUILD, gvfs-gphoto25.patch: dropped, fixed by upstream
+
 2012-09-22 Sukneet Basuta <sukneet@sourcemage.org>
 	* PRE_BUILD: run autoreconf to solve libtool version mismatch errors
 
diff --git a/gnome2-libs/gvfs/PRE_BUILD b/gnome2-libs/gvfs/PRE_BUILD
deleted file mode 100755
index ed491b2457..0000000000
--- a/gnome2-libs/gvfs/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
-patch -p1 < $SPELL_DIRECTORY/gvfs-gphoto25.patch &&
-autoreconf -f -i
diff --git a/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig b/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
deleted file mode 100644
index 704766468c..0000000000
--- a/gnome2-libs/gvfs/gvfs-1.12.3.tar.xz.sig
+++ /dev/null
diff --git a/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig b/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig
new file mode 100644
index 0000000000..5e7431e874
--- /dev/null
+++ b/gnome2-libs/gvfs/gvfs-1.14.2.tar.xz.sig
diff --git a/gnome2-libs/gvfs/gvfs-gphoto25.patch b/gnome2-libs/gvfs/gvfs-gphoto25.patch
deleted file mode 100644
index 361fcb7ac5..0000000000
--- a/gnome2-libs/gvfs/gvfs-gphoto25.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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);