Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

FL-127, decrease udisks version, gvfs fork

  • Loading branch information...
commit 7e6e97d31eb34f04b27978ae81b80dcf60f969b1 1 parent 994a5a3
Oleg authored October 03, 2012
77  gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-1.patch
... ...
@@ -0,0 +1,77 @@
  1
+From 259a09183f7c96b5fb0f6453bb4b0bcf92e3eaa2 Mon Sep 17 00:00:00 2001
  2
+From: Cosimo Cecchi <cosimoc@gnome.org>
  3
+Date: Wed, 8 Aug 2012 13:14:19 +0200
  4
+Subject: [PATCH] gphoto: build with libgphoto 2.5 API
  5
+
  6
+Patch taken from the Fedora package
  7
+Author: Jindrich Novy <jnovy@redhat.com>
  8
+
  9
+http://pkgs.fedoraproject.org/cgit/gvfs.git/commit/?id=cd0c6218df85bf3de101402c1aa9d79aae7c3019
  10
+---
  11
+ configure.ac                |  3 +++
  12
+ daemon/gvfsbackendgphoto2.c | 12 +++++++++++-
  13
+ 2 files changed, 14 insertions(+), 1 deletion(-)
  14
+
  15
+diff --git a/configure.ac b/configure.ac
  16
+index 3215694..3280666 100644
  17
+--- a/configure.ac
  18
++++ b/configure.ac
  19
+@@ -436,6 +436,9 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
  20
+   if test "x$msg_gphoto2" = "xyes"; then
  21
+     if test "x$use_gphoto2" = "xyes"; then
  22
+       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
  23
++      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
  24
++         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available])
  25
++      )
  26
+     else
  27
+       if test "x$enable_gphoto2" = "xyes"; then
  28
+         AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
  29
+diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c
  30
+index 0d2c594..75b4b02 100644
  31
+--- a/daemon/gvfsbackendgphoto2.c
  32
++++ b/daemon/gvfsbackendgphoto2.c
  33
+@@ -1647,7 +1647,9 @@ do_mount (GVfsBackend *backend,
  34
+       return;
  35
+     }
  36
+ 
  37
++#ifndef HAVE_GPHOTO25
  38
+   DEBUG ("  '%s' '%s' '%s'",  info.name, info.path, info.library_filename);
  39
++#endif
  40
+   
  41
+   /* set port */
  42
+   rc = gp_camera_set_port_info (gphoto2_backend->camera, info);
  43
+@@ -2590,7 +2592,11 @@ do_slow_file_rename_in_same_dir (GVfsBackendGphoto2 *gphoto2_backend,
  44
+         }
  45
+     }
  46
+ 
  47
++#ifdef HAVE_GPHOTO25
  48
++  rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, new_name, GP_FILE_TYPE_NORMAL, file_dest, gphoto2_backend->context);
  49
++#else
  50
+   rc = gp_camera_folder_put_file (gphoto2_backend->camera, dir, file_dest, gphoto2_backend->context);
  51
++#endif
  52
+   if (rc != 0)
  53
+     goto out;
  54
+ 
  55
+@@ -3222,14 +3228,18 @@ commit_write_handle (GVfsBackendGphoto2 *gphoto2_backend, WriteHandle *write_han
  56
+   if (rc != 0)
  57
+     goto out;
  58
+ 
  59
+-  gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
  60
+   gp_file_set_name (file, write_handle->name);
  61
+   gp_file_set_mtime (file, time (NULL));
  62
+   gp_file_set_data_and_size (file, 
  63
+                              dup_for_gphoto2 (write_handle->data, write_handle->size), 
  64
+                              write_handle->size);
  65
+   
  66
++#ifdef HAVE_GPHOTO25
  67
++  rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, write_handle->name, GP_FILE_TYPE_NORMAL, file, gphoto2_backend->context);
  68
++#else
  69
++  gp_file_set_type (file, GP_FILE_TYPE_NORMAL);
  70
+   rc = gp_camera_folder_put_file (gphoto2_backend->camera, write_handle->dir, file, gphoto2_backend->context);
  71
++#endif
  72
+   if (rc != 0)
  73
+     {
  74
+       gp_file_unref (file);
  75
+-- 
  76
+1.7.12
  77
+
33  gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-2.5-2.patch
... ...
@@ -0,0 +1,33 @@
  1
+From ef1578c9fef421a22c030d728fb5ef77bb7b86f6 Mon Sep 17 00:00:00 2001
  2
+From: Dominique Leuenberger <dimstar@opensuse.org>
  3
+Date: Wed, 8 Aug 2012 15:11:24 +0200
  4
+Subject: [PATCH] gphoto: support 2.5, but do not require it.
  5
+
  6
+Using GPHOTO2 for a 2nd PKG_CHECK_MODULE does not give the expected
  7
+result, as the flag 'FOUND' is already set and the higher version
  8
+requirement will not be honored.
  9
+
  10
+https://bugzilla.gnome.org/show_bug.cgi?id=681448
  11
+---
  12
+ configure.ac | 5 +++--
  13
+ 1 file changed, 3 insertions(+), 2 deletions(-)
  14
+
  15
+diff --git a/configure.ac b/configure.ac
  16
+index c32d425..6ffe06d 100644
  17
+--- a/configure.ac
  18
++++ b/configure.ac
  19
+@@ -436,8 +436,9 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
  20
+   if test "x$msg_gphoto2" = "xyes"; then
  21
+     if test "x$use_gphoto2" = "xyes"; then
  22
+       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
  23
+-      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.5.0,
  24
+-         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available])
  25
++      PKG_CHECK_MODULES(GPHOTO25, libgphoto2 >= 2.5.0,
  26
++         AC_DEFINE(HAVE_GPHOTO25, 1, [Define to 1 if libgphoto2 2.5 is available]),
  27
++	 []
  28
+       )
  29
+     else
  30
+       if test "x$enable_gphoto2" = "xyes"; then
  31
+-- 
  32
+1.7.12
  33
+
48  gnome-base/gvfs/files/gvfs-1.12.3-gphoto2-stricter-checks.patch
... ...
@@ -0,0 +1,48 @@
  1
+From 7d0127ee181c0b282b8f99f461d26fce1c3a27b0 Mon Sep 17 00:00:00 2001
  2
+From: Arun Raghavan <arun@accosted.net>
  3
+Date: Mon, 30 Apr 2012 11:15:49 +0100
  4
+Subject: [PATCH] build: Bail if gphoto support is requested but not available
  5
+
  6
+https://bugzilla.gnome.org/show_bug.cgi?id=578027
  7
+---
  8
+ configure.ac | 13 ++++++++++---
  9
+ 1 file changed, 10 insertions(+), 3 deletions(-)
  10
+
  11
+diff --git a/configure.ac b/configure.ac
  12
+index e55ab58..91621a9 100644
  13
+--- a/configure.ac
  14
++++ b/configure.ac
  15
+@@ -402,7 +402,7 @@ GPHOTO2_LIBS=
  16
+ GPHOTO2_CFLAGS=
  17
+ 
  18
+ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev" = "xyes" \); then
  19
+-  PKG_CHECK_EXISTS(libgphoto2, msg_gphoto2=yes)
  20
++  PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0, [msg_gphoto2=yes])
  21
+ 
  22
+   # Need OS tweaks in hal volume monitor backend
  23
+   case "$host" in
  24
+@@ -414,12 +414,19 @@ if test "x$enable_gphoto2" != "xno" -a \( "x$msg_hal" = "xyes" -o "x$msg_gudev"
  25
+       ;;
  26
+   esac
  27
+ 
  28
++  if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
  29
++    AC_MSG_ERROR([gphoto2 support requested but not available])
  30
++  fi
  31
++
  32
+   if test "x$msg_gphoto2" = "xyes"; then
  33
+     if test "x$use_gphoto2" = "xyes"; then
  34
+-      PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
  35
+       AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
  36
+     else
  37
+-      AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
  38
++      if test "x$enable_gphoto2" = "xyes"; then
  39
++        AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
  40
++      else
  41
++        AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
  42
++      fi
  43
+       msg_gphoto2=no
  44
+     fi
  45
+   fi
  46
+-- 
  47
+1.7.12
  48
+
56  gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
... ...
@@ -0,0 +1,56 @@
  1
+Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora)
  2
+Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829
  3
+----
  4
+Index: mount-archive.desktop.in.in
  5
+===================================================================
  6
+--- mount-archive.desktop.in.in	(revision 0)
  7
++++ mount-archive.desktop.in.in	(revision 0)
  8
+@@ -0,0 +1,14 @@
  9
++[Desktop Entry]
  10
++Encoding=UTF-8
  11
++_Name=Archive Mounter
  12
++Exec=@libexecdir@/gvfsd-archive file=%u
  13
++X-Gnome-Vfs-System=gio
  14
++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
  15
++Terminal=false
  16
++StartupNotify=false
  17
++Type=Application
  18
++NoDisplay=true
  19
++X-GNOME-Bugzilla-Bugzilla=GNOME
  20
++X-GNOME-Bugzilla-Product=gvfs
  21
++X-GNOME-Bugzilla-Component=archive-backend
  22
++X-GNOME-Bugzilla-Version=@VERSION@
  23
+Index: Makefile.am
  24
+===================================================================
  25
+--- Makefile.am.orig	2008-07-22 15:35:49.000000000 +0200
  26
++++ Makefile.am	2008-07-22 17:56:59.417180064 +0200
  27
+@@ -1,5 +1,20 @@
  28
+ NULL =
  29
+ 
  30
++@INTLTOOL_DESKTOP_RULE@
  31
++
  32
++desktop_in_files = mount-archive.desktop.in
  33
++
  34
++mount-archive.desktop.in: mount-archive.desktop.in.in
  35
++	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
  36
++
  37
++desktopdir       = $(datadir)/applications
  38
++if HAVE_ARCHIVE
  39
++desktop_DATA     = mount-archive.desktop
  40
++else
  41
++desktop_DATA     = 
  42
++endif	
  43
++
  44
++
  45
+ SUBDIRS = \
  46
+ 	common \
  47
+ 	client \
  48
+@@ -15,6 +30,8 @@
  49
+ 
  50
+ EXTRA_DIST = \
  51
+ 	MAINTAINERS		\
  52
++	mount-archive.desktop.in.in \
  53
++	$(desktop_in_files)     \
  54
+ 	$(NULL)
  55
+ 
  56
+ DISTCLEANFILES = \
125  gnome-base/gvfs/gvfs-1.12.3-r1.ebuild
... ...
@@ -0,0 +1,125 @@
  1
+# Copyright 1999-2012 Gentoo Foundation
  2
+# Distributed under the terms of the GNU General Public License v2
  3
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.3-r1.ebuild,v 1.1 2012/09/26 10:54:41 ssuominen Exp $
  4
+
  5
+EAPI=4
  6
+GCONF_DEBUG=no
  7
+GNOME2_LA_PUNT=yes
  8
+
  9
+inherit autotools bash-completion-r1 eutils gnome2
  10
+
  11
+[[ ${PV} = 9999 ]] && inherit gnome2-live
  12
+
  13
+DESCRIPTION="GNOME Virtual Filesystem Layer"
  14
+HOMEPAGE="http://www.gnome.org"
  15
+
  16
+LICENSE="LGPL-2+"
  17
+SLOT="0"
  18
+
  19
+if [[ ${PV} = 9999 ]]; then
  20
+	KEYWORDS=""
  21
+	DOCS=""
  22
+else
  23
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
  24
+	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
  25
+fi
  26
+
  27
+SRC_URI="${SRC_URI}
  28
+	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
  29
+
  30
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
  31
+
  32
+RDEPEND=">=dev-libs/glib-2.31.0:2
  33
+	sys-apps/dbus
  34
+	dev-libs/libxml2
  35
+	net-misc/openssh
  36
+	afp? ( >=dev-libs/libgcrypt-1.2.2 )
  37
+	archive? ( app-arch/libarchive )
  38
+	avahi? ( >=net-dns/avahi-0.6 )
  39
+	bluetooth? (
  40
+		>=app-mobilephone/obex-data-server-0.4.5
  41
+		dev-libs/dbus-glib
  42
+		net-wireless/bluez
  43
+		dev-libs/expat )
  44
+	bluray? ( media-libs/libbluray )
  45
+	fuse? ( >=sys-fs/fuse-2.8.0 )
  46
+	gdu? ( || (
  47
+		>=gnome-base/libgdu-3.0.2
  48
+		=sys-apps/gnome-disk-utility-3.0.2-r300
  49
+		=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
  50
+	gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
  51
+	gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
  52
+	ios? (
  53
+		>=app-pda/libimobiledevice-1.1.0
  54
+		>=app-pda/libplist-1 )
  55
+	udev? (
  56
+		cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
  57
+		|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
  58
+	udisks? ( =sys-fs/udisks-1.0.4-r2 )
  59
+	http? ( >=net-libs/libsoup-gnome-2.26.0 )
  60
+	samba? ( >=net-fs/samba-3.4.6[smbclient] )"
  61
+DEPEND="${RDEPEND}
  62
+	>=dev-util/intltool-0.40
  63
+	virtual/pkgconfig
  64
+	dev-util/gtk-doc-am
  65
+	doc? ( >=dev-util/gtk-doc-1 )"
  66
+
  67
+REQUIRED_USE="cdda? ( udev )"
  68
+
  69
+pkg_setup() {
  70
+	G2CONF="${G2CONF}
  71
+		--disable-bash-completion
  72
+		--disable-hal
  73
+		--disable-schemas-compile
  74
+		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
  75
+		$(use_enable afp)
  76
+		$(use_enable archive)
  77
+		$(use_enable avahi)
  78
+		$(use_enable bluetooth obexftp)
  79
+		$(use_enable bluray)
  80
+		$(use_enable cdda)
  81
+		$(use_enable fuse)
  82
+		$(use_enable gdu)
  83
+		$(use_enable gphoto2)
  84
+		$(use_enable ios afc)
  85
+		$(use_enable udev)
  86
+		$(use_enable udev gudev)
  87
+		$(use_enable http)
  88
+		$(use_enable gnome-keyring keyring)
  89
+		$(use_enable samba)
  90
+		$(use_enable udisks)"
  91
+}
  92
+
  93
+src_prepare() {
  94
+	# Conditional patching purely to avoid eautoreconf
  95
+	if use gphoto2; then
  96
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-stricter-checks.patch
  97
+		epatch "${FILESDIR}"/${PN}-1.12.3-gphoto2-2.5-{1,2}.patch
  98
+	fi
  99
+
  100
+	if use archive; then
  101
+		epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
  102
+		echo mount-archive.desktop.in >> po/POTFILES.in
  103
+		echo mount-archive.desktop.in.in >> po/POTFILES.in
  104
+	fi
  105
+
  106
+	if ! use udev; then
  107
+		sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
  108
+		sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
  109
+		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
  110
+	fi
  111
+
  112
+	if use gphoto2 || use archive || ! use udev; then
  113
+		# libgcrypt.m4 needed for eautoreconf, bug #399043
  114
+		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
  115
+
  116
+		AT_M4DIR=. eautoreconf
  117
+	fi
  118
+
  119
+	gnome2_src_prepare
  120
+}
  121
+
  122
+src_install() {
  123
+	gnome2_src_install
  124
+	newbashcomp programs/gvfs-bash-completion.sh ${PN}
  125
+}

0 notes on commit 7e6e97d

Please sign in to comment.
Something went wrong with that request. Please try again.