Skip to content
This repository has been archived by the owner on Dec 4, 2020. It is now read-only.

Commit

Permalink
Try to fix gvfs on 10
Browse files Browse the repository at this point in the history
  • Loading branch information
Kris Moore committed Oct 28, 2013
1 parent c59238a commit 7e7a980
Show file tree
Hide file tree
Showing 10 changed files with 373 additions and 0 deletions.
94 changes: 94 additions & 0 deletions build-files/ports-overlay/devel/gvfs/Makefile
@@ -0,0 +1,94 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
# $FreeBSD: devel/gvfs/Makefile 327723 2013-09-20 17:04:43Z bapt $
# $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $

PORTNAME= gvfs
PORTVERSION= 1.12.3
PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3

MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME virtual file system

LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
gcrypt:${PORTSDIR}/security/libgcrypt \
gnome-keyring:${PORTSDIR}/security/libgnome-keyring

USES= gettext gmake pkgconfig
USE_XZ= yes
USE_GNOME= glib20 gnomehack gnomeprefix intlhack intltool
USE_LDCONFIG= yes
USE_GCC= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-obexftp \
--disable-bluray \
--disable-afc

OPTIONS_DEFINE= AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
CDDA_DESC= CDDA (enables HAL)
GPHOTO2_DESC= Gphoto 2 camera support (enables HAL)
SAMBA_DESC= Samba support

GLIB_SCHEMAS= org.gnome.system.gvfs.enums.xml

NO_STAGE= yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MFUSE}
USES+= fuse
PLIST_SUB+= FUSE=""
.else
CONFIGURE_ARGS+= --disable-fuse
PLIST_SUB+= FUSE="@comment "
.endif

.if ${PORT_OPTIONS:MSAMBA}
LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
GLIB_SCHEMAS+= org.gnome.system.smb.gschema.xml
PLIST_SUB+= SMB=""
.else
CONFIGURE_ARGS+= --disable-samba
PLIST_SUB+= SMB="@comment "
.endif

.if ${PORT_OPTIONS:MCDDA}
LIB_DEPENDS+= cdio_paranoia:${PORTSDIR}/sysutils/libcdio
PLIST_SUB+= CDDA=""
.else
CONFIGURE_ARGS+= --disable-cdda
PLIST_SUB+= CDDA="@comment "
.endif

.if ${PORT_OPTIONS:MGPHOTO2}
LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2
PLIST_SUB+= GPHOTO2=""
.else
CONFIGURE_ARGS+= --disable-gphoto2
PLIST_SUB+= GPHOTO2="@comment "
.endif

.if ${PORT_OPTIONS:MAVAHI}
LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app
GLIB_SCHEMAS+= org.gnome.system.dns_sd.gschema.xml
PLIST_SUB+= AVAHI=""
.else
CONFIGURE_ARGS+=--disable-avahi
PLIST_SUB+= AVAHI="@comment "
.endif

.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal
RUN_DEPENDS+= gnome-mount:${PORTSDIR}/sysutils/gnome-mount
PLIST_SUB+= HAL=""
.else
CONFIGURE_ARGS+=--disable-hal
PLIST_SUB+= HAL="@comment "
.endif

.include <bsd.port.mk>
2 changes: 2 additions & 0 deletions build-files/ports-overlay/devel/gvfs/distinfo
@@ -0,0 +1,2 @@
SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2
SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968
10 changes: 10 additions & 0 deletions build-files/ports-overlay/devel/gvfs/files/patch-Makefile.in
@@ -0,0 +1,10 @@
--- Makefile.in.orig 2008-07-22 23:17:58.000000000 -0400
+++ Makefile.in 2008-07-22 23:18:24.000000000 -0400
@@ -269,7 +269,6 @@ SUBDIRS = \
gconf \
po \
programs \
- test \
$(NULL)

EXTRA_DIST = \
@@ -0,0 +1,11 @@
--- client/Makefile.in.orig 2010-12-26 18:25:46.000000000 +0100
+++ client/Makefile.in 2010-12-26 18:26:12.000000000 +0100
@@ -196,7 +196,7 @@
EXPAT_LIBS = @EXPAT_LIBS@
FGREP = @FGREP@
FUSE_CFLAGS = @FUSE_CFLAGS@
-FUSE_LIBS = @FUSE_LIBS@
+FUSE_LIBS = @FUSE_LIBS@ -lfuse
GDU_CFLAGS = @GDU_CFLAGS@
GDU_LIBS = @GDU_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
@@ -0,0 +1,12 @@
--- client/gvfsfusedaemon.c.orig 2012-05-15 20:01:49.000000000 +0200
+++ client/gvfsfusedaemon.c 2012-05-31 14:00:26.000000000 +0200
@@ -2361,7 +2361,9 @@
subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL);

/* Indicate O_TRUNC support for open() */
+#ifdef FUSE_CAP_ATOMIC_O_TRUNC
conn->want |= FUSE_CAP_ATOMIC_O_TRUNC;
+#endif

return NULL;
}
29 changes: 29 additions & 0 deletions build-files/ports-overlay/devel/gvfs/files/patch-configure
@@ -0,0 +1,29 @@
--- configure.orig 2010-05-28 10:24:40.000000000 +0200
+++ configure 2010-05-28 10:25:59.000000000 +0200
@@ -16253,7 +16253,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-larchive $LIBS"
+LIBS="-larchive -lcrypto -lmd $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

@@ -16298,7 +16298,7 @@
if test x$with_archive_libs != x/usr/lib; then
ARCHIVE_LIBS="-L$with_archive_libs -larchive"
else
- ARCHIVE_LIBS="-larchive"
+ ARCHIVE_LIBS="-larchive -lcrypto -lmd"
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5
@@ -16307,7 +16307,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-larchive $LIBS"
+LIBS="-larchive -lcrypto -lmd $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

@@ -0,0 +1,10 @@
--- daemon/gvfswritechannel.c.orig 2007-12-22 18:50:10.000000000 -0500
+++ daemon/gvfswritechannel.c 2007-12-22 18:50:20.000000000 -0500
@@ -30,6 +30,7 @@
#include <sys/un.h>
#include <unistd.h>
#include <fcntl.h>
+#include <string.h>

#include <glib.h>
#include <glib-object.h>
@@ -0,0 +1,14 @@
--- monitor/gphoto2/ggphoto2volume.c.orig 2008-07-22 09:29:19.000000000 -0400
+++ monitor/gphoto2/ggphoto2volume.c 2008-07-22 23:22:30.000000000 -0400
@@ -277,7 +277,11 @@ g_gphoto2_volume_new (GVolumeMonitor *
return NULL;

/* TODO: other OS'es? Will address this with DK aka HAL 2.0 */
+#ifdef __FreeBSD__
+ device_path = hal_device_get_property_string (drive_device, "freebsd.device_file");
+#else
device_path = hal_device_get_property_string (drive_device, "linux.device_file");
+#endif
if (strlen (device_path) == 0)
device_path = NULL;

6 changes: 6 additions & 0 deletions build-files/ports-overlay/devel/gvfs/pkg-descr
@@ -0,0 +1,6 @@
GVFS allows applications and users to treat any number of file system
concepts as a part of the local filesystem. With GVFS, filesystems across
the internet, on connected devices, and in multiple formats are as simple
to access (and write code for) as any directory on the local machine.

WWW: http://www.gnome.org/
185 changes: 185 additions & 0 deletions build-files/ports-overlay/devel/gvfs/pkg-plist
@@ -0,0 +1,185 @@
bin/gvfs-cat
bin/gvfs-copy
bin/gvfs-info
bin/gvfs-less
bin/gvfs-ls
bin/gvfs-mime
bin/gvfs-mkdir
bin/gvfs-monitor-dir
bin/gvfs-monitor-file
bin/gvfs-mount
bin/gvfs-move
bin/gvfs-open
bin/gvfs-rename
bin/gvfs-rm
bin/gvfs-save
bin/gvfs-set-attribute
bin/gvfs-trash
bin/gvfs-tree
etc/profile.d/gvfs-bash-completion.sh
include/gvfs-client/gvfs/gvfsurimapper.h
include/gvfs-client/gvfs/gvfsuriutils.h
lib/gio/modules/libgioremote-volume-monitor.la
lib/gio/modules/libgioremote-volume-monitor.so
lib/gio/modules/libgvfsdbus.la
lib/gio/modules/libgvfsdbus.so
%%AVAHI%%lib/libgvfscommon-dnssd.la
%%AVAHI%%lib/libgvfscommon-dnssd.so
%%AVAHI%%lib/libgvfscommon-dnssd.so.0
lib/libgvfscommon.la
lib/libgvfscommon.so
lib/libgvfscommon.so.0
libexec/gvfsd-afp
libexec/gvfsd-afp-browse
%%FUSE%%libexec/gvfs-fuse-daemon
%%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
%%HAL%%libexec/gvfs-hal-volume-monitor
libexec/gvfsd
libexec/gvfsd-archive
libexec/gvfsd-burn
%%CDDA%%libexec/gvfsd-cdda
libexec/gvfsd-computer
libexec/gvfsd-dav
%%AVAHI%%libexec/gvfsd-dnssd
libexec/gvfsd-ftp
%%GPHOTO2%%libexec/gvfsd-gphoto2
libexec/gvfsd-http
libexec/gvfsd-localtest
libexec/gvfsd-metadata
libexec/gvfsd-network
libexec/gvfsd-sftp
%%SMB%%libexec/gvfsd-smb
%%SMB%%libexec/gvfsd-smb-browse
libexec/gvfsd-trash
%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
%%SMB%%share/GConf/gsettings/gvfs-smb.convert
share/dbus-1/services/gvfs-daemon.service
share/dbus-1/services/gvfs-metadata.service
%%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
%%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
share/gvfs/mounts/afp-browse.mount
share/gvfs/mounts/afp.mount
%%DATADIR%%/mounts/archive.mount
%%DATADIR%%/mounts/burn.mount
%%CDDA%%%%DATADIR%%/mounts/cdda.mount
%%DATADIR%%/mounts/computer.mount
%%DATADIR%%/mounts/dav.mount
%%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount
%%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount
%%DATADIR%%/mounts/ftp.mount
%%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount
%%DATADIR%%/mounts/http.mount
%%DATADIR%%/mounts/localtest.mount
%%DATADIR%%/mounts/network.mount
%%DATADIR%%/mounts/sftp.mount
%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
%%SMB%%%%DATADIR%%/mounts/smb.mount
%%DATADIR%%/mounts/trash.mount
%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor
share/locale/af/LC_MESSAGES/gvfs.mo
share/locale/ar/LC_MESSAGES/gvfs.mo
share/locale/as/LC_MESSAGES/gvfs.mo
share/locale/ast/LC_MESSAGES/gvfs.mo
share/locale/be/LC_MESSAGES/gvfs.mo
share/locale/be@latin/LC_MESSAGES/gvfs.mo
share/locale/bg/LC_MESSAGES/gvfs.mo
share/locale/bn/LC_MESSAGES/gvfs.mo
share/locale/bn_IN/LC_MESSAGES/gvfs.mo
share/locale/ca/LC_MESSAGES/gvfs.mo
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
share/locale/el/LC_MESSAGES/gvfs.mo
share/locale/en@shaw/LC_MESSAGES/gvfs.mo
share/locale/en_GB/LC_MESSAGES/gvfs.mo
share/locale/eo/LC_MESSAGES/gvfs.mo
share/locale/es/LC_MESSAGES/gvfs.mo
share/locale/et/LC_MESSAGES/gvfs.mo
share/locale/eu/LC_MESSAGES/gvfs.mo
share/locale/fa/LC_MESSAGES/gvfs.mo
share/locale/fi/LC_MESSAGES/gvfs.mo
share/locale/fr/LC_MESSAGES/gvfs.mo
share/locale/ga/LC_MESSAGES/gvfs.mo
share/locale/gl/LC_MESSAGES/gvfs.mo
share/locale/gu/LC_MESSAGES/gvfs.mo
share/locale/he/LC_MESSAGES/gvfs.mo
share/locale/hi/LC_MESSAGES/gvfs.mo
share/locale/hu/LC_MESSAGES/gvfs.mo
share/locale/id/LC_MESSAGES/gvfs.mo
share/locale/it/LC_MESSAGES/gvfs.mo
share/locale/ja/LC_MESSAGES/gvfs.mo
share/locale/kk/LC_MESSAGES/gvfs.mo
share/locale/kn/LC_MESSAGES/gvfs.mo
share/locale/ko/LC_MESSAGES/gvfs.mo
share/locale/ku/LC_MESSAGES/gvfs.mo
share/locale/lt/LC_MESSAGES/gvfs.mo
share/locale/lv/LC_MESSAGES/gvfs.mo
share/locale/mai/LC_MESSAGES/gvfs.mo
share/locale/mk/LC_MESSAGES/gvfs.mo
share/locale/ml/LC_MESSAGES/gvfs.mo
share/locale/mr/LC_MESSAGES/gvfs.mo
share/locale/nb/LC_MESSAGES/gvfs.mo
share/locale/nds/LC_MESSAGES/gvfs.mo
share/locale/nl/LC_MESSAGES/gvfs.mo
share/locale/nn/LC_MESSAGES/gvfs.mo
share/locale/or/LC_MESSAGES/gvfs.mo
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
share/locale/sq/LC_MESSAGES/gvfs.mo
share/locale/sr/LC_MESSAGES/gvfs.mo
share/locale/sr@latin/LC_MESSAGES/gvfs.mo
share/locale/sv/LC_MESSAGES/gvfs.mo
share/locale/ta/LC_MESSAGES/gvfs.mo
share/locale/te/LC_MESSAGES/gvfs.mo
share/locale/th/LC_MESSAGES/gvfs.mo
share/locale/tr/LC_MESSAGES/gvfs.mo
share/locale/ug/LC_MESSAGES/gvfs.mo
share/locale/uk/LC_MESSAGES/gvfs.mo
share/locale/vi/LC_MESSAGES/gvfs.mo
share/locale/zh_CN/LC_MESSAGES/gvfs.mo
share/locale/zh_HK/LC_MESSAGES/gvfs.mo
share/locale/zh_TW/LC_MESSAGES/gvfs.mo
@dirrm %%DATADIR%%/remote-volume-monitors
@dirrm %%DATADIR%%/mounts
@dirrm %%DATADIR%%
@dirrm include/gvfs-client/gvfs
@dirrm include/gvfs-client
@dirrmtry etc/profile.d
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/ug/LC_MESSAGES
@dirrmtry share/locale/ug
@dirrmtry share/locale/te/LC_MESSAGES
@dirrmtry share/locale/te
@dirrmtry share/locale/sr@latin/LC_MESSAGES
@dirrmtry share/locale/sr@latin
@dirrmtry share/locale/nds/LC_MESSAGES
@dirrmtry share/locale/nds
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mai/LC_MESSAGES
@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
@dirrmtry share/locale/en@shaw/LC_MESSAGES
@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/ca@valencia/LC_MESSAGES
@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as

0 comments on commit 7e7a980

Please sign in to comment.