diff options
author | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:39:58 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:39:58 +0000 |
commit | 03af2187bd388708aa7234d923ec38192b6fc7a2 (patch) | |
tree | 7ce23e0d0c750d353ac0da5306ba035076e0adf0 /devel/gnome-vfs1/files/patch-ah | |
parent | - Fix on python2.1; (diff) |
Update to GNOME 1.4 -- massive changes all around, for the sake of
CVS repo bloat, I'll only list the updates.
graphics/imlib 1.9.9 -> 1.9.10
textproc/xml-i18n-tools 0.8 -> 0.8.1
x11/gnomelibs 1.2.11 -> 1.2.13
devel/oaf 0.6.2 -> 0.6.5
devel/gconf 0.12 -> 1.0.0
devel/gnomevfs 0.5 -> 1.0
graphics/gdk-pixbuf 0.9.0 -> 0.11.0
sysutils/gnomecontrolcenter 1.2.2 -> 1.4.0.1
print/gnomeprint 0.25 -> 0.28
devel/bonobo 0.37 -> 1.0.3
audio/gnomeaudio 1.0.0 -> 1.4.0
x11/gnomecore 1.2.4 -> 1.4.0.3
devel/libgtop 1.0.11 -> 1.0.12
x11/gnomeapplets 1.2.4 -> 1.4.0.1
misc/gnomeuserdocs NEW 1.4.1
misc/gnomeutils 1.2.1 -> 1.4.0
deskutils/gnomepim 1.2.0 -> 1.4.0
games/gnomegames 1.2.0 -> 1.4.0.1
print/ggv 0.95 -> 1.0
editors/ghex 1.1.4 -> 1.2
devel/bugbuddy 1.2 -> 2.0.1
devel/glade 0.5.11 -> 0.6.2
sysutils/gtop 1.0.12 -> 1.0.13
x11/xalf NEW 0.11
x11-toolkits/py-gtk 0.6.6 -> 0.6.7
x11-toolkits/py-gnome 1.0.53 -> 1.4.0
x11-toolkits/guile-gtk 0.19 -> 0.20
x11-toolkits/guile-gnome 0.10 -> 0.20
devel/libsigc++ 1.0.1 -> 1.0.3
x11-toolkits/gnome-- 1.1.15 -> 1.1.17
x11-toolkits/panel-- NEW 0.1
x11-fm/gnomemc 4.5.51 -> 4.5.54
Notes
Notes:
svn path=/head/; revision=42257
Diffstat (limited to 'devel/gnome-vfs1/files/patch-ah')
-rw-r--r-- | devel/gnome-vfs1/files/patch-ah | 139 |
1 files changed, 0 insertions, 139 deletions
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 */ |