summaryrefslogtreecommitdiff
path: root/devel/glib20/files/patch-glib_gthread-posix.c
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-03-08 10:51:34 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-03-08 10:51:34 +0000
commit7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree961839899dce7f75292a08c079f548973bdbd40d /devel/glib20/files/patch-glib_gthread-posix.c
parent- Update to 0.27 (diff)
* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which
are the latest stable releases. * Update vala to the newest stable release 0.18.1, also update a few ports in the gtk/gnome stack. * The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles. * Remove pkg-config run depends from glib20 and freetype2. This doesn't eliminate pkg-config run dependency completely, a second phase is needed and is planned. * Support for .:run. and .:build. for USE_GNOME components was added. Currently only libxml2 and libxslt support this mechanism. * Updates of the telepathy stack and empathy. * Trim makefile headers, convert ports to new options, trim off library versions for some ports. * Fix other ports so they build with the new glib version. Thanks to miwi and crees for helping out with some exp-runs. Approved by: portmgr (miwi & bapt) Obtained from: gnome team repo
Diffstat (limited to 'devel/glib20/files/patch-glib_gthread-posix.c')
-rw-r--r--devel/glib20/files/patch-glib_gthread-posix.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
new file mode 100644
index 000000000000..f19007f8c636
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -0,0 +1,20 @@
+--- glib/gthread-posix.c.orig 2012-11-10 03:24:06.000000000 +0000
++++ glib/gthread-posix.c 2012-11-12 18:06:36.000000000 +0000
+@@ -89,7 +89,7 @@
+ if G_UNLIKELY (mutex == NULL)
+ g_thread_abort (errno, "malloc");
+
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
+ {
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init (&attr);
+@@ -101,7 +101,7 @@
+ if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
+ g_thread_abort (status, "pthread_mutex_init");
+
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__)
+ pthread_mutexattr_destroy (&attr);
+ #endif
+