diff options
author | avl <avl@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-27 21:38:33 +0800 |
---|---|---|
committer | avl <avl@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-01-27 21:38:33 +0800 |
commit | 86decc59e319fd0f4e787d982ddcaa83c9f66e48 (patch) | |
tree | 89de99557898a4b4948270dc3f6f4f88781ea682 /devel/gvfs/files | |
parent | 1b7dec522f6fce0c5f883b20e8d9442501fa7308 (diff) | |
download | marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar.gz marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar.bz2 marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar.lz marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar.xz marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.tar.zst marcuscom-ports-86decc59e319fd0f4e787d982ddcaa83c9f66e48.zip |
Update to 1.5.2.
Temporary exclude lib/gio/modules/giomodule.cache from pkg-plist.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13504 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gvfs/files')
-rw-r--r-- | devel/gvfs/files/patch-Makefile.in | 10 | ||||
-rw-r--r-- | devel/gvfs/files/patch-client_Makefile.in | 11 | ||||
-rw-r--r-- | devel/gvfs/files/patch-client_gvfsfusedaemon.c | 12 | ||||
-rw-r--r-- | devel/gvfs/files/patch-configure | 30 | ||||
-rw-r--r-- | devel/gvfs/files/patch-daemon_gvfswritechannel.c | 10 | ||||
-rw-r--r-- | devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c | 14 |
6 files changed, 87 insertions, 0 deletions
diff --git a/devel/gvfs/files/patch-Makefile.in b/devel/gvfs/files/patch-Makefile.in new file mode 100644 index 000000000..658cccd6a --- /dev/null +++ b/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 = \ diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in new file mode 100644 index 000000000..ffbfd5878 --- /dev/null +++ b/devel/gvfs/files/patch-client_Makefile.in @@ -0,0 +1,11 @@ +--- client/Makefile.in.orig 2008-02-11 20:05:14.000000000 -0500 ++++ client/Makefile.in 2008-02-11 20:05:42.000000000 -0500 +@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@ + F77 = @F77@ + FFLAGS = @FFLAGS@ + FUSE_CFLAGS = @FUSE_CFLAGS@ +-FUSE_LIBS = @FUSE_LIBS@ ++FUSE_LIBS = @FUSE_LIBS@ -lfuse + GCONF_CFLAGS = @GCONF_CFLAGS@ + GCONF_LIBS = @GCONF_LIBS@ + GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c new file mode 100644 index 000000000..3733aa7e3 --- /dev/null +++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c @@ -0,0 +1,12 @@ +--- client/gvfsfusedaemon.c.orig 2007-11-06 18:06:41.000000000 -0500 ++++ client/gvfsfusedaemon.c 2007-11-06 18:07:30.000000000 -0500 +@@ -28,7 +28,9 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/un.h> ++#ifdef __linux__ + #include <sys/vfs.h> ++#endif + #include <sys/time.h> + #include <unistd.h> + #include <stdlib.h> diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure new file mode 100644 index 000000000..0b1b2a2ab --- /dev/null +++ b/devel/gvfs/files/patch-configure @@ -0,0 +1,30 @@ +--- configure.orig 2009-04-24 00:15:09.000000000 -0400 ++++ configure 2009-04-24 00:16:04.000000000 -0400 +@@ -26973,6 +26973,9 @@ fi + *-linux*) + use_gphoto2=yes + ;; ++ *-freebsd*) ++ use_gphoto2=yes ++ ;; + *) + use_gphoto2=no + ;; +@@ -28018,7 +28021,7 @@ if test "${ac_cv_lib_archive_archive_ent + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-larchive $LIBS" ++LIBS="-larchive -lcrypto -lmd $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28094,7 +28097,7 @@ _ACEOF + 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:$LINENO: checking for archive_entry_filetype in -larchive" >&5 diff --git a/devel/gvfs/files/patch-daemon_gvfswritechannel.c b/devel/gvfs/files/patch-daemon_gvfswritechannel.c new file mode 100644 index 000000000..54c421687 --- /dev/null +++ b/devel/gvfs/files/patch-daemon_gvfswritechannel.c @@ -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> diff --git a/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c new file mode 100644 index 000000000..6686b28ae --- /dev/null +++ b/devel/gvfs/files/patch-monitor_gphoto2_ggphoto2volume.c @@ -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; + |