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-aa | 89 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-ac | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-devel-docs::Makefile.in | 14 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in | 13 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in | 12 | ||||
| -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 | 29 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c | 38 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c | 13 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_sftp-method.c | 12 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_smb-method.c | 11 |
15 files changed, 0 insertions, 296 deletions
diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in deleted file mode 100644 index 8c0d2a13160c..000000000000 --- a/devel/gnome-vfs/files/patch-Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig Tue Nov 30 02:05:26 2004 -+++ Makefile.in Tue Nov 30 02:05:34 2004 -@@ -230,7 +230,6 @@ - devel-docs \ - doc \ - programs \ -- test \ - monikers \ - po - diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa deleted file mode 100644 index caf6411ffeaa..000000000000 --- a/devel/gnome-vfs/files/patch-aa +++ /dev/null @@ -1,89 +0,0 @@ ---- configure.orig Tue Jun 1 03:53:13 2004 -+++ configure Tue Jun 1 03:53:13 2004 -@@ -22815,6 +22815,8 @@ - if eval "test \"\${$as_ac_var+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 -@@ -22897,6 +22899,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: `eval echo '${'$as_ac_var'}'`" >&5 - echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -@@ -22904,6 +22907,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 -@@ -26876,8 +26880,8 @@ - done - fi - --echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5 --echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 -+echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5 -+echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 - if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else -@@ -26896,11 +26900,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit (); -+char BZ2_bzCompressInit (); - int - main () - { --bzCompressInit (); -+BZ2_bzCompressInit (); - ; - return 0; - } -@@ -28031,7 +28035,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 -@@ -29660,6 +29664,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 -@@ -29700,6 +29707,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 -@@ -31338,6 +31348,7 @@ - s,@ORBIT_IDL@,$ORBIT_IDL,;t t - s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t - s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t -+s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t - s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t - s,@USE_NLS@,$USE_NLS,;t t - s,@MSGFMT@,$MSGFMT,;t t diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac deleted file mode 100644 index 9362cac1715f..000000000000 --- a/devel/gnome-vfs/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/Makefile.in.orig Tue May 6 15:39:48 2003 -+++ modules/Makefile.in Tue May 6 15:41:28 2003 -@@ -210,7 +210,7 @@ - @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la - @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_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 = \ diff --git a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in deleted file mode 100644 index b02290aa2ebb..000000000000 --- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- devel-docs/Makefile.in 2002/02/16 16:44:53 1.1 -+++ devel-docs/Makefile.in 2002/02/16 16:45:47 -@@ -168,7 +168,7 @@ - TEXT_FILES = gnome-vfs-mime-type-handling.txt - - --docdir = $(prefix)/doc -+docdir = $(prefix)/share/doc - doc_DATA = - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h 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 deleted file mode 100644 index 4acd9a1bc552..000000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome-vfs-2.0.pc.in.orig Thu Oct 28 13:25:35 2004 -+++ gnome-vfs-2.0.pc.in Thu Oct 28 13:25:51 2004 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system libraries - Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-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 deleted file mode 100644 index f9b09d46b7a3..000000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 -+++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system module include info - Version: @VERSION@ - Requires: bonobo-activation-2.0,gthread-2.0,gmodule-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 deleted file mode 100644 index 063376961823..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index bd679de032d2..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 07:31:15 1.1 -+++ libgnomevfs/gnome-vfs-application-registry.c 2002/06/13 08:25:24 -@@ -940,6 +940,8 @@ - static void - gnome_vfs_application_registry_init (void) - { -+ gchar *tmp; -+ - if (gnome_vfs_application_registry_initialized) - return; - -@@ -961,6 +963,14 @@ - gnome_registry_dir.dirname = g_strdup (DATADIR "/application-registry"); - 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_strconcat (g_get_home_dir(), "/.gnome/application-info", NULL); - user_registry_dir.system_dir = FALSE; - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c deleted file mode 100644 index a61e83417651..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime-info.c.orig Wed Aug 4 13:41:52 2004 -+++ libgnomevfs/gnome-vfs-mime-info.c Wed Aug 4 13:42:10 2004 -@@ -149,7 +149,7 @@ - - xdg_data_dirs = g_getenv ("XDG_DATA_DIRS"); - if (!xdg_data_dirs) { -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - } - - split_data_dirs = g_strsplit (xdg_data_dirs, ":", 0); diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c deleted file mode 100644 index 698150125205..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-mime.c +++ /dev/null @@ -1,38 +0,0 @@ ---- libgnomevfs/gnome-vfs-mime.c.orig Sat Mar 19 18:59:45 2005 -+++ libgnomevfs/gnome-vfs-mime.c Sat Mar 19 19:02:24 2005 -@@ -167,7 +167,9 @@ - GnomeVFSResult result = GNOME_VFS_OK; - const char *mime_type; - -+ G_LOCK (mime_mutex); - max_extents = xdg_mime_get_max_buffer_extents (); -+ G_UNLOCK (mime_mutex); - max_extents = CLAMP (max_extents, 0, MAX_SNIFF_BUFFER_ALLOWED); - - if (!buffer->read_whole_file) { -@@ -592,7 +594,9 @@ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - -+ G_LOCK (mime_mutex); - xdg_mime_mime_type_equal (a, b); -+ G_UNLOCK (mime_mutex); - - return FALSE; - } -@@ -626,8 +630,13 @@ - - if (gnome_vfs_mime_type_is_equal (mime_type, base_mime_type)) { - return GNOME_VFS_MIME_IDENTICAL; -- } else if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -- return GNOME_VFS_MIME_PARENT; -+ } else { -+ G_LOCK (mime_mutex); -+ if (xdg_mime_mime_type_subclass (mime_type, base_mime_type)) { -+ G_UNLOCK (mime_mutex); -+ return GNOME_VFS_MIME_PARENT; -+ } -+ G_UNLOCK (mime_mutex); - } - - return GNOME_VFS_MIME_UNRELATED; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c deleted file mode 100644 index c58be91fa94b..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Sat Jul 31 17:52:23 2004 -+++ libgnomevfs/gnome-vfs-resolve.c Sat Jul 31 17:52:45 2004 -@@ -171,8 +171,10 @@ - switch (error) { - - case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#if defined(EAI_ADDRFAMILY) && defined(EAI_NODATA) - case EAI_ADDRFAMILY: - case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; -+#endif - case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - case EAI_FAIL: - case EAI_AGAIN: return GNOME_VFS_ERROR_NAMESERVER; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c deleted file mode 100644 index 9788a89f060e..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Mon Aug 16 11:11:09 2004 -+++ libgnomevfs/gnome-vfs-utils.c Mon Aug 16 11:11:16 2004 -@@ -871,7 +871,7 @@ - paths = g_strsplit (gnome_var, ":", 0); - - for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { -- full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL); -+ full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL); - if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) { - g_strfreev (paths); - return full_filename; diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c b/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c deleted file mode 100644 index 472a4b5f6c19..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/xdgmime.c.orig Thu Jul 22 11:20:13 2004 -+++ libgnomevfs/xdgmime.c Thu Jul 22 11:20:52 2004 -@@ -189,7 +189,7 @@ - - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - - ptr = xdg_data_dirs; - diff --git a/devel/gnome-vfs/files/patch-modules_sftp-method.c b/devel/gnome-vfs/files/patch-modules_sftp-method.c deleted file mode 100644 index e1255db179c1..000000000000 --- a/devel/gnome-vfs/files/patch-modules_sftp-method.c +++ /dev/null @@ -1,12 +0,0 @@ ---- modules/sftp-method.c.orig Tue May 11 01:53:30 2004 -+++ modules/sftp-method.c Tue May 11 01:54:07 2004 -@@ -1081,7 +1081,9 @@ - if (io_status == G_IO_STATUS_NORMAL) { - buffer[len] = 0; - if (g_str_has_suffix (buffer, "password: ") || -+ g_str_has_suffix (buffer, "password:") || - g_str_has_suffix (buffer, "Password: ") || -+ g_str_has_suffix (buffer, "Password:") || - g_str_has_prefix (buffer, "Enter passphrase for key")) { - if (invoke_full_auth (uri, done_auth, buffer, &password) && password != NULL) { - g_io_channel_write_chars (tty_channel, password, -1, &len, NULL); diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c deleted file mode 100644 index 9c7cb9232cab..000000000000 --- a/devel/gnome-vfs/files/patch-modules_smb-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 -+++ modules/smb-method.c Tue Jan 11 18:25:03 2005 -@@ -1345,7 +1345,7 @@ - GnomeVFSContext *context) - { - FileHandle *handle = (FileHandle *)method_handle; -- GnomeVFSResult res = GNOME_VFS_OK;; -+ GnomeVFSResult res = GNOME_VFS_OK; - SmbAuthContext actx; - ssize_t n = 0; - |