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 | 64 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-ac | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-devel-docs::Makefile.in | 15 | ||||
| -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-resolve.c | 15 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c | 10 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules__http-neon-method.c | 21 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_bzip2-method.c | 11 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_file-method.c | 12 | ||||
| -rw-r--r-- | devel/gnome-vfs/files/patch-modules_sftp-method.c | 12 |
15 files changed, 0 insertions, 247 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 0f976d16a464..000000000000 --- a/devel/gnome-vfs/files/patch-aa +++ /dev/null @@ -1,64 +0,0 @@ ---- configure.orig Wed Oct 5 10:56:02 2005 -+++ configure Mon Nov 28 13:34:48 2005 -@@ -23119,6 +23119,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 -@@ -23201,6 +23203,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 -@@ -24292,6 +24295,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 -@@ -33558,7 +33562,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 -@@ -36964,6 +36968,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 -@@ -37005,6 +37012,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 -@@ -38439,6 +38449,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 383987654ef2..000000000000 --- a/devel/gnome-vfs/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-devel-docs::Makefile.in b/devel/gnome-vfs/files/patch-devel-docs::Makefile.in deleted file mode 100644 index 5d2778e291bf..000000000000 --- a/devel/gnome-vfs/files/patch-devel-docs::Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - $MCom: ports/devel/gnomevfs2/files/patch-devel-docs::Makefile.in,v 1.18 2005/06/28 05:40:02 adamw Exp $ - ---- 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 088433c51a28..000000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 -+++ gnome-vfs-2.0.pc.in Mon Oct 3 12:00:02 2005 -@@ -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-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 deleted file mode 100644 index c3f0d2c30ea2..000000000000 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ /dev/null @@ -1,9 +0,0 @@ ---- gnome-vfs-module-2.0.pc.in.orig Wed Sep 14 05:30:25 2005 -+++ gnome-vfs-module-2.0.pc.in Mon Oct 3 12:01:04 2005 -@@ -8,5 +8,5 @@ - Description: The GNOME virtual file-system module include info - Version: @VERSION@ - Requires: bonobo-activation-2.0 libbonobo-2.0 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 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 2747466f7bd9..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs::gnome-vfs-application-registry.c +++ /dev/null @@ -1,26 +0,0 @@ ---- 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-resolve.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c deleted file mode 100644 index 6e3660c845b0..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-resolve.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libgnomevfs/gnome-vfs-resolve.c.orig Tue Apr 19 07:54:52 2005 -+++ libgnomevfs/gnome-vfs-resolve.c Sun May 22 23:25:22 2005 -@@ -171,10 +171,12 @@ _gnome_vfs_result_from_gai_error (int er - switch (error) { - - case EAI_NONAME: return GNOME_VFS_ERROR_HOST_NOT_FOUND; -+#ifdef EAI_NODATA - #ifdef EAI_ADDRFAMILY - case EAI_ADDRFAMILY: - #endif - case EAI_NODATA: return GNOME_VFS_ERROR_HOST_HAS_NO_ADDRESS; -+#endif - #ifdef EAI_SYSTEM - case EAI_SYSTEM: return gnome_vfs_result_from_errno (); - #endif 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 068d1773a9e9..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 37cc69f1ea3b..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_xdgmime.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 = "%%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__http-neon-method.c b/devel/gnome-vfs/files/patch-modules__http-neon-method.c deleted file mode 100644 index 77e14080f5b0..000000000000 --- a/devel/gnome-vfs/files/patch-modules__http-neon-method.c +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/http-neon-method.c.orig Wed Jan 25 23:15:42 2006 -+++ modules/http-neon-method.c Wed Jan 25 23:17:47 2006 -@@ -1908,9 +1908,7 @@ - } - } - -- - result = resolve_result (res, req); -- ne_request_destroy (req); - - if (result == GNOME_VFS_OK) { - const char *name; -@@ -1929,6 +1927,8 @@ - } - - } -+ -+ ne_request_destroy (req); - - return result; - } diff --git a/devel/gnome-vfs/files/patch-modules_bzip2-method.c b/devel/gnome-vfs/files/patch-modules_bzip2-method.c deleted file mode 100644 index a1fd982c28bd..000000000000 --- a/devel/gnome-vfs/files/patch-modules_bzip2-method.c +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/bzip2-method.c.orig Wed Apr 13 21:58:54 2005 -+++ modules/bzip2-method.c Mon Nov 28 15:09:59 2005 -@@ -435,7 +435,7 @@ - - if (bzip2_handle->last_bz_result != BZ_OK) { - if (bzip2_handle->last_bz_result == BZ_STREAM_END) -- return GNOME_VFS_OK; -+ return GNOME_VFS_ERROR_EOF; - else - return result_from_bz_result (bzip2_handle->last_bz_result); - } else if (bzip2_handle->last_vfs_result != GNOME_VFS_OK) { diff --git a/devel/gnome-vfs/files/patch-modules_file-method.c b/devel/gnome-vfs/files/patch-modules_file-method.c deleted file mode 100644 index dbb237226e99..000000000000 --- a/devel/gnome-vfs/files/patch-modules_file-method.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 - 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); |