diff options
Diffstat (limited to 'devel/gnome-vfs/files')
16 files changed, 301 insertions, 0 deletions
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in new file mode 100644 index 000000000..7213df2fa --- /dev/null +++ b/devel/gnome-vfs/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Jul 11 09:30:02 2006 ++++ Makefile.in Tue Jul 11 09:30:32 2006 +@@ -352,7 +352,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + po + + EXTRA_DIST = \ diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac new file mode 100644 index 000000000..383987654 --- /dev/null +++ b/devel/gnome-vfs/files/patch-ac @@ -0,0 +1,11 @@ +--- modules/Makefile.in.orig Mon Oct 3 11:55:14 2005 ++++ modules/Makefile.in Mon Oct 3 11:55:55 2005 +@@ -465,7 +465,7 @@ + @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la + @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la + @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = +-module_flags = -export_dynamic -avoid-version -module -no-undefined ++module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB) + modulesdir = $(libdir)/gnome-vfs-2.0/modules + modules_LTLIBRARIES = \ + $(CDDA_LTLIBS) \ diff --git a/devel/gnome-vfs/files/patch-config.h.in b/devel/gnome-vfs/files/patch-config.h.in new file mode 100644 index 000000000..70edbcd45 --- /dev/null +++ b/devel/gnome-vfs/files/patch-config.h.in @@ -0,0 +1,12 @@ +--- config.h.in.orig Sun May 7 00:54:09 2006 ++++ config.h.in Sun May 7 00:54:46 2006 +@@ -121,6 +121,9 @@ + /* Define to 1 if you have the <fnmatch.h> header file. */ + #undef HAVE_FNMATCH_H + ++/* Define to 1 if you have the <sys/sysmacros.h> header file. */ ++#undef HAVE_SYS_SYSMACROS_H ++ + /* Define to 1 if you have the <fstab.h> header file. */ + #undef HAVE_FSTAB_H + diff --git a/devel/gnome-vfs/files/patch-configure b/devel/gnome-vfs/files/patch-configure new file mode 100644 index 000000000..75ee29e97 --- /dev/null +++ b/devel/gnome-vfs/files/patch-configure @@ -0,0 +1,74 @@ +--- configure.orig Tue Nov 7 04:08:31 2006 ++++ configure Mon Nov 20 10:52:37 2006 +@@ -21984,6 +21984,8 @@ + if test "${am_cv_val_LC_MESSAGES+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ ac_check_lib_save_LIBS=$LIBS ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22030,6 +22032,7 @@ + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi + echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 + echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 +@@ -23495,6 +23498,7 @@ + cat >>confdefs.h <<_ACEOF + #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++ LIBS="-lintl $LIBS" + have_ngettext=yes + else + echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +@@ -24892,7 +24896,7 @@ + + + +-for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h ++for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +@@ -33245,7 +33249,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -33543,7 +33547,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + +- LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" ++ LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -39124,6 +39128,9 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/statfs.h> + #include <sys/fstyp.h> + _ACEOF +@@ -39165,6 +39172,9 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/statfs.h> + #include <sys/vmount.h> + _ACEOF diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in new file mode 100644 index 000000000..eb0f45920 --- /dev/null +++ b/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in @@ -0,0 +1,9 @@ +--- gnome-vfs-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 ++++ gnome-vfs-2.0.pc.in Tue Jul 11 09:33:47 2006 +@@ -8,5 +8,5 @@ + Description: The GNOME virtual file-system libraries + Version: @VERSION@ + Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 +-Libs: -L${libdir} -lgnomevfs-2 ++Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ + Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in new file mode 100644 index 000000000..168fba882 --- /dev/null +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -0,0 +1,9 @@ +--- gnome-vfs-module-2.0.pc.in.orig Tue Jul 11 07:31:58 2006 ++++ gnome-vfs-module-2.0.pc.in Tue Jul 11 09:34:36 2006 +@@ -8,5 +8,5 @@ + Description: The GNOME virtual file-system module include info + Version: @VERSION@ + Requires: gconf-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 +-Libs: -L${libdir} -lgnomevfs-2 ++Libs: -L${libdir} -lgnomevfs-2 @PTHREAD_LIB@ + Cflags: -I${includedir}/gnome-vfs-2.0 -I${includedir}/gnome-vfs-module-2.0 -I${libdir}/gnome-vfs-2.0/include diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in new file mode 100644 index 000000000..063376961 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in @@ -0,0 +1,11 @@ +--- libgnomevfs/Makefile.in.orig Wed Oct 22 01:11:11 2003 ++++ libgnomevfs/Makefile.in Wed Oct 22 01:12:00 2003 +@@ -429,7 +429,7 @@ + # CLEANFILES = $(BUILT_SOURCES) + + # Platform specific includes +-libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include ++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c new file mode 100644 index 000000000..2747466f7 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c @@ -0,0 +1,26 @@ +--- libgnomevfs/gnome-vfs-application-registry.c.orig Sun May 22 23:09:39 2005 ++++ libgnomevfs/gnome-vfs-application-registry.c Sun May 22 23:14:22 2005 +@@ -943,6 +943,8 @@ load_application_info (void) + static void + gnome_vfs_application_registry_init (void) + { ++ gchar *tmp; ++ + if (gnome_vfs_application_registry_initialized) + return; + +@@ -963,6 +965,14 @@ gnome_vfs_application_registry_init (voi + "application-registry", + NULL); + gnome_registry_dir.system_dir = TRUE; ++ ++ tmp = g_strconcat (g_get_home_dir(), "/.gnome", NULL); ++ if (mkdir (tmp, 0700) && ++ errno != EEXIST) { ++ g_warning("Could not create per-user GNOME configuration directory: %s", ++ tmp); ++ } ++ g_free(tmp); + + user_registry_dir.dirname = g_build_filename (g_get_home_dir(), + ".gnome", diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c new file mode 100644 index 000000000..1636ca99d --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-address.c.orig Wed Apr 12 10:16:28 2006 ++++ libgnomevfs/gnome-vfs-address.c Thu Apr 20 09:52:12 2006 +@@ -32,6 +32,7 @@ + #include <sys/types.h> + + #ifndef G_OS_WIN32 ++#include <sys/socket.h> + #include <sys/select.h> + #include <netinet/in.h> + #include <arpa/inet.h> diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c new file mode 100644 index 000000000..5260a0f3e --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c @@ -0,0 +1,43 @@ +--- libgnomevfs/gnome-vfs-hal-mounts.c.orig Mon Aug 7 04:16:27 2006 ++++ libgnomevfs/gnome-vfs-hal-mounts.c Sun Sep 17 17:39:48 2006 +@@ -32,7 +32,9 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/stat.h> ++#ifdef HAVE_SYS_SYSMACROS_H + #include <sys/sysmacros.h> ++#endif + #include <sys/types.h> + #include <unistd.h> + #include <limits.h> +@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume + "/", + "/bin", + "/boot", ++ "/compat/linux/proc", ++ "/compat/linux/sys", + "/dev", + "/etc", + "/home", + "/lib", + "/lib64", ++ "/libexec", + "/media", + "/mnt", + "/opt", ++ "/rescue", + "/root", + "/sbin", + "/srv", + "/tmp", + "/usr", ++ "/usr/local", ++ "/usr/obj", ++ "/usr/ports", ++ "/usr/src", ++ "/usr/X11R6", + "/var", ++ "/var/tmp", + "/proc", + "/sbin", + NULL diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c new file mode 100644 index 000000000..068d1773a --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -0,0 +1,10 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Thu Sep 15 07:02:53 2005 ++++ libgnomevfs/gnome-vfs-utils.c Sat Oct 22 02:12:32 2005 +@@ -839,6 +839,7 @@ gnome_vfs_icon_path_from_filename (const + for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { + full_filename = g_build_filename (*temp_paths, + "share", ++ "gnome", + "pixmaps", + relative_filename, + NULL); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c new file mode 100644 index 000000000..7119f852f --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c @@ -0,0 +1,11 @@ +--- libgnomevfs/xdgmime.c.orig Wed Aug 24 16:52:03 2005 ++++ libgnomevfs/xdgmime.c Wed Aug 24 16:52:47 2005 +@@ -234,7 +234,7 @@ + + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%LOCALBASE%%/share/gnome/:%%X11BASE%%/share/gnome/:%%LOCALBASE%%/share/:%%X11BASE%%/share/:/usr/share/"; + + ptr = xdg_data_dirs; + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h new file mode 100644 index 000000000..218578c25 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.h @@ -0,0 +1,17 @@ +--- libgnomevfs/xdgmime.h.orig Sat Oct 7 10:42:32 2006 ++++ libgnomevfs/xdgmime.h Sat Oct 7 11:01:57 2006 +@@ -52,11 +52,14 @@ typedef void (*XdgMimeDestroy) (void *u + #define xdg_mime_get_mime_type_from_file_name XDG_ENTRY(get_mime_type_from_file_name) + #define xdg_mime_is_valid_mime_type XDG_ENTRY(is_valid_mime_type) + #define xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal) ++#define _xdg_mime_mime_type_equal XDG_ENTRY(mime_type_equal_p) + #define xdg_mime_media_type_equal XDG_ENTRY(media_type_equal) + #define xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass) ++#define _xdg_mime_mime_type_subclass XDG_ENTRY(mime_type_subclass_p) + #define xdg_mime_get_mime_parents XDG_ENTRY(get_mime_parents) + #define xdg_mime_list_mime_parents XDG_ENTRY(list_mime_parents) + #define xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type) ++#define _xdg_mime_unalias_mime_type XDG_ENTRY(unalias_mime_type_p) + #define xdg_mime_get_max_buffer_extents XDG_ENTRY(get_max_buffer_extents) + #define xdg_mime_shutdown XDG_ENTRY(shutdown) + #define xdg_mime_dump XDG_ENTRY(dump) diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h new file mode 100644 index 000000000..69292f2f1 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h @@ -0,0 +1,25 @@ +--- libgnomevfs/xdgmimecache.h.orig Mon May 29 20:04:24 2006 ++++ libgnomevfs/xdgmimecache.h Mon May 29 20:11:42 2006 +@@ -32,9 +32,19 @@ + typedef struct _XdgMimeCache XdgMimeCache; + + #ifdef XDG_PREFIX +-#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) +-#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) +-#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) ++#define _xdg_mime_cache_new_from_file XDG_ENTRY(cache_new_from_file) ++#define _xdg_mime_cache_ref XDG_ENTRY(cache_ref) ++#define _xdg_mime_cache_unref XDG_ENTRY(cache_unref) ++#define _xdg_mime_cache_get_mime_type_for_data XDG_ENTRY(cache_get_mime_type_for_data) ++#define _xdg_mime_cache_get_mime_type_for_file XDG_ENTRY(cache_get_mime_type_for_file) ++#define _xdg_mime_cache_get_mime_type_from_file_name XDG_ENTRY(cache_get_mime_type_from_file_name) ++#define _xdg_mime_cache_is_valid_mime_type XDG_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_ENTRY(cache_media_type_equal) ++#define _xdg_mime_cache_mime_type_subclass XDG_ENTRY(cache_mime_type_subclass) ++#define _xdg_mime_cache_list_mime_parents XDG_ENTRY(cache_list_mime_parents) ++#define _xdg_mime_cache_unalias_mime_type XDG_ENTRY(cache_unalias_mime_type) ++#define _xdg_mime_cache_get_max_buffer_extents XDG_ENTRY(cache_get_max_buffer_extents) + #endif + + extern XdgMimeCache **_caches; diff --git a/devel/gnome-vfs/files/patch-modules_file-method-acl.c b/devel/gnome-vfs/files/patch-modules_file-method-acl.c new file mode 100644 index 000000000..7ec9a33b8 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_file-method-acl.c @@ -0,0 +1,11 @@ +--- modules/file-method-acl.c.orig Mon Jul 24 18:47:12 2006 ++++ modules/file-method-acl.c Mon Jul 24 22:01:34 2006 +@@ -45,7 +45,7 @@ + #endif + + #ifdef HAVE_POSIX_ACL +-# include <acl/libacl.h> ++# include <sys/acl.h> + #define HAVE_ACL 1 + #endif + diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c new file mode 100644 index 000000000..dbb237226 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_file-method.c @@ -0,0 +1,12 @@ +--- modules/file-method.c.orig Sun May 22 23:30:16 2005 ++++ modules/file-method.c Sun May 22 23:31:08 2005 +@@ -66,6 +66,9 @@ + #if HAVE_SYS_VFS_H + #include <sys/vfs.h> + #elif HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif + #include <sys/mount.h> + #endif + |