diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:35:50 +0000 |
commit | f1bb12de8e50bf76ae21f37debda60994ec7fd99 (patch) | |
tree | 1671d4beef381f12d939e34b344eb385a3af4f19 /devel/glib20/files/patch-gthread_gthread-impl.c | |
parent | - Mark BROKEN on 6.x and below: this port uses posix_memalign(3) (diff) |
Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive
amount of work by the FreeBSD GNOME Team and our testers.
On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed. The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily. We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.
Back to GNOME 2.16. This release brings a huge amount of new functionality
to FreeBSD. The standard release notes can be read at
http://www.gnome.org/start/2.16/ . But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD. This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.
But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:
Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>
Enjoy!
Approved by: portmgr (implicit, kris)
Diffstat (limited to 'devel/glib20/files/patch-gthread_gthread-impl.c')
-rw-r--r-- | devel/glib20/files/patch-gthread_gthread-impl.c | 185 |
1 files changed, 0 insertions, 185 deletions
diff --git a/devel/glib20/files/patch-gthread_gthread-impl.c b/devel/glib20/files/patch-gthread_gthread-impl.c deleted file mode 100644 index 5f1b6dcbd7ec..000000000000 --- a/devel/glib20/files/patch-gthread_gthread-impl.c +++ /dev/null @@ -1,185 +0,0 @@ ---- gthread/gthread-impl.c.orig Fri Feb 14 16:08:46 2003 -+++ gthread/gthread-impl.c Wed Jul 20 19:44:08 2005 -@@ -37,9 +37,11 @@ - - #include <glib.h> - #include <gthreadinit.h> -+#include "gthreadprivate.h" - - #ifdef G_THREADS_ENABLED - -+static GSystemThread zero_thread; /* This is initialized to all zero */ - static gboolean thread_system_already_initialized = FALSE; - static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1]; - -@@ -76,7 +78,7 @@ - struct _ErrorCheckInfo - { - gchar *location; -- GThread *owner; -+ GSystemThread owner; - }; - - static GMutex * -@@ -94,7 +96,9 @@ - gchar *location) - { - ErrorCheckInfo *info; -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -116,14 +120,14 @@ - } - - info = G_MUTEX_DEBUG_INFO (mutex); -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); - - g_thread_functions_for_glib_use_default.mutex_lock (mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -133,7 +137,9 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; -@@ -145,7 +151,7 @@ - return TRUE; - } - -- if (info->owner == self) -+ if (g_system_thread_equal (info->owner, self)) - g_error ("Trying to recursivly lock a mutex at '%s', " - "previously locked at '%s'", - location, info->location); -@@ -153,7 +159,7 @@ - if (!g_thread_functions_for_glib_use_default.mutex_trylock (mutex)) - return FALSE; - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return TRUE; -@@ -165,20 +171,22 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to unlock an unlocked mutex at '%s'", location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_warning ("Trying to unlock a mutex at '%s', " - "previously locked by a different thread at '%s'", - location, info->location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - info->location = NULL; - - g_thread_functions_for_glib_use_default.mutex_unlock (mutex); -@@ -194,7 +202,7 @@ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (info && info->owner != NULL) -+ if (info && !g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to free a locked mutex at '%s', " - "which was previously locked at '%s'", - location, info->location); -@@ -211,25 +219,27 @@ - { - - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; -+ -+ g_thread_functions_for_glib_use.thread_self (&self); - - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - g_thread_functions_for_glib_use_default.cond_wait (cond, mutex); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - } - -@@ -242,28 +252,30 @@ - gchar *location) - { - ErrorCheckInfo *info = G_MUTEX_DEBUG_INFO (mutex); -- GThread *self = g_thread_self (); -+ GSystemThread self; - gboolean retval; - -+ g_thread_functions_for_glib_use.thread_self (&self); -+ - if (magic != G_MUTEX_DEBUG_MAGIC) - location = "unknown"; - -- if (!info || info->owner == NULL) -+ if (!info || g_system_thread_equal (info->owner, zero_thread)) - g_error ("Trying to use an unlocked mutex in g_cond_timed_wait() at '%s'", - location); - -- if (info->owner != self) -+ if (!g_system_thread_equal (info->owner, self)) - g_error ("Trying to use a mutex locked by another thread in " - "g_cond_timed_wait() at '%s'", location); - -- info->owner = NULL; -+ g_system_thread_assign (info->owner, zero_thread); - location = info->location; - - retval = g_thread_functions_for_glib_use_default.cond_timed_wait (cond, - mutex, - end_time); - -- info->owner = self; -+ g_system_thread_assign (info->owner, self); - info->location = location; - - return retval; |