diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-10 03:55:24 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-01-10 03:55:24 +0800 |
| commit | 1f54644c601db9102def6d2a04c4af7db9714511 (patch) | |
| tree | 7f88663aed80c12d3d352c2c12c2a2b012e07f3d /devel/glib20/files/patch-gthread_gthread-posix.c | |
| parent | 868ea39205fb83309080af61df139d23278b8dff (diff) | |
| download | marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.gz marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.bz2 marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.lz marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.xz marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.tar.zst marcuscom-ports-1f54644c601db9102def6d2a04c4af7db9714511.zip | |
Update glib20 to 2.15.1, and break out the GIO FAM backend into a separate
port (gio-fam-backend).
This requires a bit of trickery in bsd.gnome.mk to
avoid a dependency loop, so a new _glib20 component was added that should
only be required by FAM providers. To that end, add gamin, and make gamin
depend on _glib20.
Update gvfs to 0.1.1, and add a new gvfs component to bsd.gnome.mk.
gio-standalone is no longer needed as this code is now part of glib.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10030 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/glib20/files/patch-gthread_gthread-posix.c')
| -rw-r--r-- | devel/glib20/files/patch-gthread_gthread-posix.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c new file mode 100644 index 000000000..47c5ab8f1 --- /dev/null +++ b/devel/glib20/files/patch-gthread_gthread-posix.c @@ -0,0 +1,21 @@ +--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 ++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 +@@ -125,7 +129,8 @@ + g_thread_impl_init(void) + { + #ifdef _SC_THREAD_STACK_MIN +- g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0); ++ g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), ++ g_thread_min_stack_size); + #endif /* _SC_THREAD_STACK_MIN */ + #ifdef HAVE_PRIORITIES + # ifdef G_THREADS_IMPL_POSIX +@@ -176,7 +181,7 @@ + result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); + + #ifdef G_THREADS_IMPL_POSIX +- if (result == EBUSY) ++ if ((result == EBUSY) || (result == EDEADLK)) + return FALSE; + #else /* G_THREADS_IMPL_DCE */ + if (result == 0) |