diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-03-28 17:48:24 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-03-28 17:48:24 +0800 |
| commit | 206257a0c42b041afec1c48983234f608c770afb (patch) | |
| tree | 182dbb962d0a28c05ed3d150a6f60ea322cb07d9 /devel | |
| parent | afbdc45dbc40eef02000f58b67fb33306f7e323c (diff) | |
| download | freebsd-ports-gnome-206257a0c42b041afec1c48983234f608c770afb.tar.gz freebsd-ports-gnome-206257a0c42b041afec1c48983234f608c770afb.tar.zst freebsd-ports-gnome-206257a0c42b041afec1c48983234f608c770afb.zip | |
devel/glib20: drop adaptive mutex workaround
PR: 168317
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib20/Makefile | 2 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gthread-posix.c | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index a54546d26d0d..efd8e95e0d1e 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,7 +3,7 @@ PORTNAME= glib PORTVERSION= 2.46.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c deleted file mode 100644 index 3334a19ba25a..000000000000 --- a/devel/glib20/files/patch-glib_gthread-posix.c +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/gthread-posix.c.orig 2014-09-22 15:42:12.000000000 +0200 -+++ glib/gthread-posix.c 2014-09-28 09:46:56.659280343 +0200 -@@ -98,7 +98,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_init (&attr); - pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); - pattr = &attr; -@@ -107,7 +107,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 - |