Skip to content

Commit

Permalink
Major update to gvfs-1.4.0.
Browse files Browse the repository at this point in the history
All main features successfully tested.

ok jasper@
  • Loading branch information
ajacoutot committed Oct 11, 2009
1 parent 0b57409 commit a754a86
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 61 deletions.
97 changes: 51 additions & 46 deletions x11/gnome/gvfs/Makefile
Original file line number Diff line number Diff line change
@@ -1,58 +1,63 @@
# $OpenBSD: Makefile,v 1.15 2009/09/11 18:56:35 naddy Exp $
# $OpenBSD: Makefile,v 1.16 2009/10/11 13:32:27 ajacoutot Exp $

COMMENT-main= GNOME virtual file system
COMMENT-smb= samba module for GVFS
COMMENT-main= GNOME virtual file system
COMMENT-smb= samba module for GVFS

GNOME_PROJECT= gvfs
GNOME_VERSION= 1.0.3
SHARED_LIBS += gvfscommon 1.0 # .0.0
GNOME_PROJECT= gvfs
GNOME_VERSION= 1.4.0

PKGNAME-main= ${DISTNAME}p8
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}p3
PKGNAME-main= ${DISTNAME}
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}

SHARED_LIBS += gvfscommon 2.0 # .0.0
SHARED_LIBS += gvfscommon-dnssd 0.0 # .0.0

# LGPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes

MULTI_PACKAGES= -main -smb

MODULES= devel/gettext \
x11/gnome

WANTLIB= ORBit-2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread \
util

LIB_DEPENDS= gnome-keyring::x11/gnome/keyring

WANTLIB-main= ${WANTLIB} bz2 gcrypt gnutls gpg-error lzma m \
tasn1 xml2 z crypto
LIB_DEPENDS-main= ${LIB_DEPENDS} \
archive::archivers/libarchive \
soup-2.4.>=1::devel/libsoup \
avahi-client,avahi-common,avahi-glib::net/avahi
RUN_DEPENDS-main= :glib2-fam->=2.18.3:devel/glib2,-fam

LIB_DEPENDS-smb= ${LIB_DEPENDS} \
gvfscommon.>=1::${BASE_PKGPATH},-main \
smbclient::net/samba

CONFIGURE_ARGS+= --disable-gtk-doc \
--disable-cdda \
--disable-fuse \
--disable-hal \
--disable-obexftp \
--disable-gphoto2 \
--enable-archive \
--enable-avahi \
--enable-gconf \
--enable-http \
--enable-keyring \
--enable-samba \
--with-bash-completion-dir="${PREFIX}/share/gvfs"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MULTI_PACKAGES= -main -smb

MODULES= devel/gettext \
x11/gnome

WANTLIB += ORBit-2 c dbus-1 dbus-glib-1 gconf-2 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 pcre pthread util

LIB_DEPENDS= gnome-keyring::x11/gnome/keyring

WANTLIB-main += ${WANTLIB}
WANTLIB-main += bz2 crypto gcrypt gnutls gpg-error lzma m proxy soup-2.4
WANTLIB-main += sqlite3 tasn1 xml2 z

LIB_DEPENDS-main= ${LIB_DEPENDS} \
archive::archivers/libarchive \
soup-gnome-2.4.>=1::devel/libsoup,-gnome \
avahi-client,avahi-common,avahi-glib::net/avahi
RUN_DEPENDS-main= :glib2-fam->=2.18.3:devel/glib2,-fam

LIB_DEPENDS-smb= ${LIB_DEPENDS} \
gvfscommon.>=2::${BASE_PKGPATH},-main \
smbclient::net/samba

CONFIGURE_ARGS= --disable-gtk-doc \
--disable-cdda \
--disable-fuse \
--disable-hal \
--disable-obexftp \
--disable-gphoto2 \
--disable-gudev \
--disable-udev \
--enable-archive \
--enable-avahi \
--enable-gconf \
--enable-http \
--enable-keyring \
--enable-samba \
--with-bash-completion-dir="${PREFIX}/share/gvfs"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

.include <bsd.port.mk>
10 changes: 5 additions & 5 deletions x11/gnome/gvfs/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MD5 (gnome/gvfs-1.0.3.tar.bz2) = pB6LfZnjkM74MS985fMSpQ==
RMD160 (gnome/gvfs-1.0.3.tar.bz2) = LRLh9mkHc+Oq1dWcgmxQn6QKlEM=
SHA1 (gnome/gvfs-1.0.3.tar.bz2) = K+tzasx7OOmcn8sFhd5pGPrV57c=
SHA256 (gnome/gvfs-1.0.3.tar.bz2) = F+zN7W4JYggYHix2JYAlJhEq8j9bLHsqZyq5zP86Vf0=
SIZE (gnome/gvfs-1.0.3.tar.bz2) = 920742
MD5 (gnome/gvfs-1.4.0.tar.bz2) = XFCGdjhzu8YjmvhHIr8a/g==
RMD160 (gnome/gvfs-1.4.0.tar.bz2) = JH18sIUdszKmDwxs7Y9M4o0rqvc=
SHA1 (gnome/gvfs-1.4.0.tar.bz2) = y2bnK/kqIs3gfamHXRDZyeuBojw=
SHA256 (gnome/gvfs-1.4.0.tar.bz2) = eoS1Hqkh2GtRCO+SSaU0jY80RKjIs3nK4IEhhILA+Ls=
SIZE (gnome/gvfs-1.4.0.tar.bz2) = 1260218
18 changes: 10 additions & 8 deletions x11/gnome/gvfs/patches/patch-daemon_gvfsbackenddav_c
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
$OpenBSD: patch-daemon_gvfsbackenddav_c,v 1.1 2009/08/07 08:40:07 ajacoutot Exp $
$OpenBSD: patch-daemon_gvfsbackenddav_c,v 1.2 2009/10/11 13:32:27 ajacoutot Exp $

Fix unmounting webdav share:
http://bugzilla.gnome.org/show_bug.cgi?id=567664

--- daemon/gvfsbackenddav.c.orig Fri Aug 7 10:21:57 2009
+++ daemon/gvfsbackenddav.c Fri Aug 7 10:23:13 2009
@@ -2124,11 +2124,11 @@ do_set_display_name (GVfsBackend *backend,
--- daemon/gvfsbackenddav.c.orig Tue Jul 14 13:07:59 2009
+++ daemon/gvfsbackenddav.c Sun Oct 11 11:37:38 2009
@@ -2304,13 +2304,13 @@ do_set_display_name (GVfsBackend *backend,
soup_uri_free (source);
}

-static gboolean
-try_unmount (GVfsBackend *backend,
+static void
+static void
+do_unmount (GVfsBackend *backend,
GVfsJobUnmount *job)
GVfsJobUnmount *job,
GMountUnmountFlags flags,
GMountSource *mount_source)
{
- _exit (0);
+ g_vfs_job_succeeded (G_VFS_JOB (job));
+ g_vfs_job_succeeded (G_VFS_JOB (job));
}

/* ************************************************************************* */
@@ -2156,5 +2156,5 @@ g_vfs_backend_dav_class_init (GVfsBackendDavClass *kla
@@ -2338,5 +2338,5 @@ g_vfs_backend_dav_class_init (GVfsBackendDavClass *kla
backend_class->make_directory = do_make_directory;
backend_class->delete = do_delete;
backend_class->set_display_name = do_set_display_name;
Expand Down
12 changes: 12 additions & 0 deletions x11/gnome/gvfs/patches/patch-daemon_gvfsftpdircache_c
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$OpenBSD: patch-daemon_gvfsftpdircache_c,v 1.1 2009/10/11 13:32:27 ajacoutot Exp $
--- daemon/gvfsftpdircache.c.orig Sun Oct 11 11:57:49 2009
+++ daemon/gvfsftpdircache.c Sun Oct 11 12:02:41 2009
@@ -586,7 +586,7 @@ g_vfs_ftp_dir_cache_funcs_process (GInputStream *
type == 'l' ? G_FILE_TYPE_SYMBOLIC_LINK :
G_FILE_TYPE_DIRECTORY);

- if (unix)
+ if (is_unix)
g_file_info_set_is_hidden (info, result.fe_fnlen > 0 &&
result.fe_fname[0] == '.');

12 changes: 12 additions & 0 deletions x11/gnome/gvfs/patches/patch-metadata_metatree_c
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
$OpenBSD: patch-metadata_metatree_c,v 1.1 2009/10/11 13:32:27 ajacoutot Exp $
--- metadata/metatree.c.orig Tue Sep 8 10:02:00 2009
+++ metadata/metatree.c Sun Oct 11 12:21:27 2009
@@ -303,7 +303,7 @@ is_on_nfs (char *filename)
sizeof (statfs_buffer), 0);
# endif
if (statfs_result == 0)
- res = statfs_buffer.f_type == 0x6969;
+ res = statfs_buffer.f_fstypename == 0x6969;

#elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
statfs_result = statvfs (dirname, &statfs_buffer);
3 changes: 2 additions & 1 deletion x11/gnome/gvfs/pkg/PFRAG.shared-main
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.shared-main,v 1.1 2008/11/24 16:15:42 ajacoutot Exp $
@comment $OpenBSD: PFRAG.shared-main,v 1.2 2009/10/11 13:32:28 ajacoutot Exp $
lib/gio/modules/libgiogconf.so
lib/gio/modules/libgioremote-volume-monitor.so
lib/gio/modules/libgvfsdbus.so
@lib lib/libgvfscommon-dnssd.so.${LIBgvfscommon-dnssd_VERSION}
@lib lib/libgvfscommon.so.${LIBgvfscommon_VERSION}
25 changes: 24 additions & 1 deletion x11/gnome/gvfs/pkg/PLIST-main
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2009/06/03 17:18:30 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2009/10/11 13:32:28 ajacoutot Exp $
@pkgpath ${BASE_PKGPATH}
%%SHARED%%
@bin bin/gvfs-cat
Expand All @@ -15,6 +15,7 @@ bin/gvfs-less
@bin bin/gvfs-rename
@bin bin/gvfs-rm
@bin bin/gvfs-save
@bin bin/gvfs-set-attribute
@bin bin/gvfs-trash
@bin bin/gvfs-tree
include/gvfs-client/
Expand All @@ -29,6 +30,8 @@ lib/gio/modules/libgioremote-volume-monitor.a
lib/gio/modules/libgioremote-volume-monitor.la
lib/gio/modules/libgvfsdbus.a
lib/gio/modules/libgvfsdbus.la
lib/libgvfscommon-dnssd.a
lib/libgvfscommon-dnssd.la
lib/libgvfscommon.a
lib/libgvfscommon.la
@bin libexec/gvfsd
Expand All @@ -40,12 +43,14 @@ lib/libgvfscommon.la
@bin libexec/gvfsd-ftp
@bin libexec/gvfsd-http
@bin libexec/gvfsd-localtest
@bin libexec/gvfsd-metadata
@bin libexec/gvfsd-network
@bin libexec/gvfsd-sftp
@bin libexec/gvfsd-trash
share/dbus-1/
share/dbus-1/services/
share/dbus-1/services/gvfs-daemon.service
share/dbus-1/services/gvfs-metadata.service
share/gvfs/
@sample ${SYSCONFDIR}/bash_completion.d/
share/gvfs/gvfs-bash-completion.sh
Expand All @@ -54,6 +59,7 @@ share/gvfs/mounts/
share/gvfs/mounts/archive.mount
@comment share/gvfs/mounts/burn.mount
share/gvfs/mounts/computer.mount
share/gvfs/mounts/dav+sd.mount
share/gvfs/mounts/dav.mount
share/gvfs/mounts/dns-sd.mount
share/gvfs/mounts/ftp.mount
Expand All @@ -66,14 +72,23 @@ share/gvfs/remote-volume-monitors/
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/as/
share/locale/as/LC_MESSAGES/
share/locale/as/LC_MESSAGES/gvfs.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/gvfs.mo
share/locale/bg/LC_MESSAGES/gvfs.mo
share/locale/bn/
share/locale/bn/LC_MESSAGES/
share/locale/bn/LC_MESSAGES/gvfs.mo
share/locale/bn_IN/
share/locale/bn_IN/LC_MESSAGES/
share/locale/bn_IN/LC_MESSAGES/gvfs.mo
share/locale/ca/LC_MESSAGES/gvfs.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/gvfs.mo
share/locale/cs/LC_MESSAGES/gvfs.mo
share/locale/da/LC_MESSAGES/gvfs.mo
share/locale/de/LC_MESSAGES/gvfs.mo
Expand Down Expand Up @@ -108,6 +123,10 @@ share/locale/ku/LC_MESSAGES/gvfs.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/gvfs.mo
share/locale/lv/LC_MESSAGES/gvfs.mo
share/locale/mai/
share/locale/mai/LC_MESSAGES/
share/locale/mai/LC_MESSAGES/gvfs.mo
share/locale/mk/
share/locale/mk/LC_MESSAGES/
share/locale/mk/LC_MESSAGES/gvfs.mo
Expand All @@ -120,12 +139,16 @@ share/locale/mr/LC_MESSAGES/gvfs.mo
share/locale/nb/LC_MESSAGES/gvfs.mo
share/locale/nl/LC_MESSAGES/gvfs.mo
share/locale/nn/LC_MESSAGES/gvfs.mo
share/locale/or/
share/locale/or/LC_MESSAGES/
share/locale/or/LC_MESSAGES/gvfs.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/gvfs.mo
share/locale/pl/LC_MESSAGES/gvfs.mo
share/locale/pt/LC_MESSAGES/gvfs.mo
share/locale/pt_BR/LC_MESSAGES/gvfs.mo
share/locale/ro/LC_MESSAGES/gvfs.mo
share/locale/ru/LC_MESSAGES/gvfs.mo
share/locale/sk/LC_MESSAGES/gvfs.mo
share/locale/sl/LC_MESSAGES/gvfs.mo
Expand Down

0 comments on commit a754a86

Please sign in to comment.