diff options
Diffstat (limited to 'devel/gnome-vfs/files')
| -rw-r--r-- | devel/gnome-vfs/files/patch-Makefile.in | 10 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-ac | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-config.h.in | 12 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-configure | 54 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in | 9 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in | 9 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c | 26 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c | 18 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c | 33 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h | 12 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_file-method-acl.c | 11 |
13 files changed, 227 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..7865fc3fb --- /dev/null +++ b/devel/gnome-vfs/files/patch-configure @@ -0,0 +1,54 @@ +--- configure.orig 2009-10-10 11:55:11.000000000 -0400 ++++ configure 2009-10-10 11:55:14.000000000 -0400 +@@ -8433,7 +8433,7 @@ fi + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h ++ inttypes.h stdint.h unistd.h sys/sysmacros.h + do + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -14864,6 +14864,8 @@ $as_echo_n "checking for LC_MESSAGES... + if test "${am_cv_val_LC_MESSAGES+set}" = set; then + $as_echo_n "(cached) " >&6 + else ++ ac_check_lib_save_LIBS=$LIBS ++ LIBS="-lintl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -14911,6 +14913,7 @@ fi + rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi + { $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 + $as_echo "$am_cv_val_LC_MESSAGES" >&6; } +@@ -16395,6 +16398,7 @@ as_val=`eval 'as_val=${'$as_ac_var'} + cat >>confdefs.h <<_ACEOF + #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 + _ACEOF ++ LIBS="-lintl $LIBS" + have_ngettext=yes + else + { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +@@ -26068,7 +26072,7 @@ if test "${openssl_libs+set}" = set; the + $as_echo_n "(cached) " >&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 +@@ -26363,7 +26367,7 @@ if test "${openssl_libs+set}" = set; the + $as_echo_n "(cached) " >&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 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-filesystem-type.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c new file mode 100644 index 000000000..90fb33a41 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-filesystem-type.c @@ -0,0 +1,18 @@ +--- libgnomevfs/gnome-vfs-filesystem-type.c.orig 2009-10-08 10:03:36.000000000 -0400 ++++ libgnomevfs/gnome-vfs-filesystem-type.c 2009-10-10 11:57:06.000000000 -0400 +@@ -70,6 +70,7 @@ static struct FSInfo fs_data[] = { + { "nfs" , N_("NFS Network Volume"), 1 }, + { "ntfs" , N_("Windows NT Volume"), 0 }, + { "ntfs-3g" , N_("Windows NT Volume"), 1 }, ++ { "nullfs" , N_("BSD Loopback Volume"), 1 }, + { "nilfs2" , N_("NILFS Linux Volume"), 1 }, + { "nwfs" , N_("Netware Volume"), 0 }, + { "proc" , N_("System Volume"), 0 }, +@@ -90,6 +91,7 @@ static struct FSInfo fs_data[] = { + { "xenix" , N_("Xenix Volume"), 0 }, + { "xfs" , N_("XFS Linux Volume"), 1 }, + { "xiafs" , N_("XIAFS Volume"), 0 }, ++ { "zfs" , N_("ZFS Volume"), 1 }, + { "cifs" , N_("CIFS Volume"), 1 }, + }; + 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..f50e1cb81 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c @@ -0,0 +1,33 @@ +--- 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 +@@ -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_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c new file mode 100644 index 000000000..a9879578a --- /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/"; + + ptr = xdg_data_dirs; + 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..7d987f400 --- /dev/null +++ b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmimecache.h @@ -0,0 +1,12 @@ +--- libgnomevfs/xdgmimecache.h.orig 2008-06-12 10:25:40.000000000 -0400 ++++ libgnomevfs/xdgmimecache.h 2008-06-14 00:49:59.000000000 -0400 +@@ -46,6 +46,9 @@ typedef struct _XdgMimeCache XdgMimeCach + #define _xdg_mime_cache_get_icon XDG_RESERVED_ENTRY(cache_get_icon) + #define _xdg_mime_cache_get_generic_icon XDG_RESERVED_ENTRY(cache_get_generic_icon) + #define _xdg_mime_cache_glob_dump XDG_RESERVED_ENTRY(cache_glob_dump) ++#define _xdg_mime_cache_is_valid_mime_type XDG_RESERVED_ENTRY(cache_is_valid_mime_type) ++#define _xdg_mime_cache_mime_type_equal XDG_RESERVED_ENTRY(cache_mime_type_equal) ++#define _xdg_mime_cache_media_type_equal XDG_RESERVED_ENTRY(cache_media_type_equal) + #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 + |