aboutsummaryrefslogtreecommitdiff
path: root/devel/gnome-vfs1/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/gnome-vfs1/files')
-rw-r--r--devel/gnome-vfs1/files/patch-aa7
-rw-r--r--devel/gnome-vfs1/files/patch-ab31
-rw-r--r--devel/gnome-vfs1/files/patch-ac15
-rw-r--r--devel/gnome-vfs1/files/patch-ae10
-rw-r--r--devel/gnome-vfs1/files/patch-ag11
-rw-r--r--devel/gnome-vfs1/files/patch-ah139
6 files changed, 0 insertions, 213 deletions
diff --git a/devel/gnome-vfs1/files/patch-aa b/devel/gnome-vfs1/files/patch-aa
deleted file mode 100644
index 98bb9e5f2b8d..000000000000
--- a/devel/gnome-vfs1/files/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
---- configure.orig Thu Nov 2 17:44:34 2000
-+++ configure Fri Nov 3 10:22:49 2000
-@@ -2196,3 +2196,3 @@
- VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
-- VFS_GLIB_CONFIG="glib-config"
-+ VFS_GLIB_CONFIG="$GLIB_CONFIG"
- else
diff --git a/devel/gnome-vfs1/files/patch-ab b/devel/gnome-vfs1/files/patch-ab
deleted file mode 100644
index 0b8cc0137d1e..000000000000
--- a/devel/gnome-vfs1/files/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.in.orig Wed Nov 29 15:02:07 2000
-+++ Makefile.in Wed Nov 29 15:04:28 2000
-@@ -169,9 +169,9 @@
- @USING_OAF_TRUE@SUBDIRS_OAF = libgnomevfs-corba
- @USING_OAF_FALSE@SUBDIRS_OAF =
- @PLATFORM_GNOME_2_TRUE@SUBDIRS_GNOME =
--@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = test mime-type-capplet
-+@PLATFORM_GNOME_2_FALSE@SUBDIRS_GNOME = mime-type-capplet
-
--SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man devel-docs $(SUBDIRS_GNOME) po
-+SUBDIRS = libgnomevfs libgnomevfs-pthread $(SUBDIRS_OAF) idl modules data man $(SUBDIRS_GNOME) po
-
-
- EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec vfsConf.sh.in vfscorbaConf.sh.in vfspthreadConf.sh.in gnome-vfs-config.in
-@@ -179,7 +179,7 @@
-
- bin_SCRIPTS = $(top_builddir)/gnome-vfs-config
-
--confexecdir = $(libdir)
-+confexecdir = $(sysconfdir)
- confexec_DATA = vfsConf.sh vfscorbaConf.sh vfspthreadConf.sh
-
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -539,6 +539,7 @@
-
- gnome-vfs-config: gnome-vfs-config.in Makefile
- sed -e 's?\@LIBDIR\@?$(libdir)?g' \
-+ -e 's?\@SYSCONFDIR\@?$(sysconfdir)?g' \
- -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \
- -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
- -e 's?\@VERSION\@?$(VERSION)?g' \
diff --git a/devel/gnome-vfs1/files/patch-ac b/devel/gnome-vfs1/files/patch-ac
deleted file mode 100644
index 01106d4b9978..000000000000
--- a/devel/gnome-vfs1/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- modules/Makefile.in.orig Thu Nov 2 17:45:41 2000
-+++ modules/Makefile.in Fri Nov 3 10:52:23 2000
-@@ -235,2 +235,3 @@
-
-+libftp_la_LDFLAGS = $(module_flags)
-
-@@ -283,3 +284,3 @@
- libfile_la_OBJECTS = file-method.lo
--libvfs_test_la_LDFLAGS =
-+libvfs_test_la_LDFLAGS = $(module_flags)
- libvfs_test_la_DEPENDENCIES =
-@@ -292,3 +293,2 @@
- libgzip_la_OBJECTS = gzip-method.lo
--libftp_la_LDFLAGS =
- libftp_la_LIBADD =
diff --git a/devel/gnome-vfs1/files/patch-ae b/devel/gnome-vfs1/files/patch-ae
deleted file mode 100644
index 736b9b64d1cb..000000000000
--- a/devel/gnome-vfs1/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- mime-type-capplet/nautilus-mime-type-capplet.c.orig Thu Nov 2 02:37:45 2000
-+++ mime-type-capplet/nautilus-mime-type-capplet.c Fri Nov 3 10:27:38 2000
-@@ -32,3 +32,7 @@
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <gnuregex.h>
-+#else
- #include <regex.h>
-+#endif
- #include <string.h>
diff --git a/devel/gnome-vfs1/files/patch-ag b/devel/gnome-vfs1/files/patch-ag
deleted file mode 100644
index da795f940c50..000000000000
--- a/devel/gnome-vfs1/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-vfs-config.in.orig Thu Aug 31 14:32:38 2000
-+++ gnome-vfs-config.in Wed Nov 29 15:04:43 2000
-@@ -3,7 +3,7 @@
- usage="\
- Usage: gnome-vfs-config [--version] [--config] [--cflags] [--libs]"
-
--config_file="@LIBDIR@/vfsConf.sh"
-+config_file="@SYSCONFDIR@/vfsConf.sh"
- . $config_file
-
- if test $# -eq 0; then
diff --git a/devel/gnome-vfs1/files/patch-ah b/devel/gnome-vfs1/files/patch-ah
deleted file mode 100644
index 66ce9c74c5aa..000000000000
--- a/devel/gnome-vfs1/files/patch-ah
+++ /dev/null
@@ -1,139 +0,0 @@
---- libgnomevfs-pthread/gnome-vfs-thread-pool.c.orig Tue Jan 16 15:46:59 2001
-+++ libgnomevfs-pthread/gnome-vfs-thread-pool.c Mon Jan 29 11:04:11 2001
-@@ -45,3 +45,7 @@
-
-+#ifdef __FreeBSD__
-+static pthread_mutex_t thread_list_lock;
-+#else
- static pthread_mutex_t thread_list_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#endif
-
-@@ -176,2 +180,19 @@
- GnomeVFSThreadState *available_thread;
-+
-+#ifdef __FreeBSD__
-+ static int init = 0;
-+
-+ if (init == 0) {
-+ pthread_mutexattr_t attr;
-+
-+ if (pthread_mutexattr_init(&attr) < 0)
-+ return -1;
-+ if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) < 0)
-+ return -1;
-+ if (pthread_mutex_init(&thread_list_lock, &attr) < 0)
-+ return -1;
-+
-+ init = 1;
-+ }
-+#endif
-
---- libgnomevfs-pthread/gnome-vfs-async-job-map.c.orig Fri Jan 19 12:10:09 2001
-+++ libgnomevfs-pthread/gnome-vfs-async-job-map.c Mon Jan 29 11:19:10 2001
-@@ -33,3 +33,7 @@
- static guint async_job_map_next_id;
-+#ifdef __FreeBSD__
-+static pthread_mutex_t async_job_map_lock;
-+#else
- static pthread_mutex_t async_job_map_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-+#endif
- gboolean async_job_map_locked;
-@@ -148,2 +152,28 @@
-
-+#ifdef __FreeBSD__
-+static void lock_and_load(pthread_mutex_t *mtx)
-+{
-+ static int init = 0;
-+ int rc;
-+
-+ if (init == 0) {
-+ pthread_mutexattr_t attr;
-+
-+ rc = pthread_mutexattr_init(&attr);
-+ g_assert(rc == 0);
-+
-+ rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-+ g_assert(rc == 0);
-+
-+ rc = pthread_mutex_init(mtx, &attr);
-+ g_assert(rc == 0);
-+
-+ init = 1;
-+ }
-+
-+ rc = pthread_mutex_lock(mtx);
-+ g_assert(rc == 0);
-+}
-+#endif
-+
- void
-@@ -151,3 +181,7 @@
- {
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_map_lock);
-+#else
- pthread_mutex_lock (&async_job_map_lock);
-+#endif
- async_job_map_locked = TRUE;
-@@ -180,3 +214,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
-
-@@ -209,3 +247,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_insert (async_job_callback_map, GUINT_TO_POINTER (notify_result->callback_id),
-@@ -221,3 +263,7 @@
- JOB_DEBUG (("removing callback %d ", callback_id));
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_remove (async_job_callback_map, GUINT_TO_POINTER (callback_id));
-@@ -250,3 +296,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_foreach (async_job_callback_map,
-@@ -261,3 +311,7 @@
-
-+#ifdef __FreeBSD__
-+ lock_and_load (&async_job_callback_map_lock);
-+#else
- pthread_mutex_lock (&async_job_callback_map_lock);
-+#endif
- g_hash_table_destroy (async_job_callback_map);
---- modules/ftp-method.c.orig Tue Jan 9 13:54:02 2001
-+++ modules/ftp-method.c Mon Jan 29 11:42:30 2001
-@@ -39,2 +39,3 @@
-
-+#include <sys/types.h>
- #include <ctype.h> /* for isspace */
---- modules/nfs-method.c.orig Sat Dec 30 09:50:36 2000
-+++ modules/nfs-method.c Mon Jan 29 11:44:59 2001
-@@ -127,2 +127,3 @@
- break;
-+#ifndef __FreeBSD__
- } else if (*success == ECOMM) {
-@@ -136,2 +137,3 @@
- */
-+#endif
- } else if ((rv == RPC_CANTSEND) || /* can't send */
-@@ -140,3 +142,5 @@
- (rv == RPC_SYSTEMERROR) || /* generic other problem at server */
-+#ifndef __FreeBSD__
- (rv == RPC_RPCBFAILURE) || /* portmapper failed in its call */
-+#endif
- (rv == RPC_CANTDECODEARGS) || /* can't decode arguments */