diff options
| author | taca <taca@pkgsrc.org> | 2012-04-06 10:40:36 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-04-06 10:40:36 +0000 |
| commit | b1d216aa7896d49cd71ffd4b334dbebdb6acf968 (patch) | |
| tree | 4def5a7c50f7a2a00f55f4c60c56e3766bc3e1e0 /devel | |
| parent | 242202bc24740555b81bcc31f0782b3cc8f3bf34 (diff) | |
| download | pkgsrc-b1d216aa7896d49cd71ffd4b334dbebdb6acf968.tar.gz | |
Make sure to initialize mutex before use it. Should be fix PR pkg/46266
by me.
Bump PKGREVISION but no need to recursive bump since it simply fixes
internal problem of glib2 and no external interface at all.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib2/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 7 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ce | 19 |
3 files changed, 21 insertions, 8 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 77dbab13f9e..9fd18cfb900 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.197 2012/03/21 12:18:33 drochner Exp $ +# $NetBSD: Makefile,v 1.198 2012/04/06 10:40:36 taca Exp $ .include "Makefile.common" .include "options.mk" +PKGREVISION= 1 CATEGORIES= devel COMMENT= Some useful routines for C programming (glib2) diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 5be69144e1f..080b18f1611 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.164 2012/03/21 12:18:33 drochner Exp $ +$NetBSD: distinfo,v 1.165 2012/04/06 10:40:36 taca Exp $ SHA1 (glib-2.30.3.tar.xz) = ec97dd659862dca05d18093a6ea6c309dcff0cdd RMD160 (glib-2.30.3.tar.xz) = 0887b08e2fff75c325ed1fb1123baaf42dc9779b Size (glib-2.30.3.tar.xz) = 5642448 bytes -SHA1 (glib-gio-kqueue-2.28.8-v3.patch) = d50bee14ce72201c3ec2b82d0e498c8828fbd8c2 -RMD160 (glib-gio-kqueue-2.28.8-v3.patch) = ba4859d4336db50bacb6bdaace995ee761306a85 -Size (glib-gio-kqueue-2.28.8-v3.patch) = 89920 bytes SHA1 (patch-aa) = 44a3cc4b457ea75a3516d5c49155a3720bde515f SHA1 (patch-ab) = 757cfd7f686d3e3147d13f530d1c85c7835bf762 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 @@ -29,7 +26,7 @@ SHA1 (patch-ba) = 832c85a53565d323100da91ad514afd4960b38ca SHA1 (patch-cb) = 0f084c33fb67fbb8e12448034450699da26289ff SHA1 (patch-cc) = dd73079b727bca9013465204dc3b53b76a280e54 SHA1 (patch-cd) = 9006b880e94ae4a4fc564c1978178a296dd63024 -SHA1 (patch-ce) = 5da41dc0807b0594d895af9ec4c285537065f572 +SHA1 (patch-ce) = f21c72e1808845adf22908a9e86d1f58a39d0c21 SHA1 (patch-cf) = 41ed2146e19cf088456795d4f0e8dc4af4368e44 SHA1 (patch-cg) = f65c5a23102d3dee12bee68bd126385b3c3fe632 SHA1 (patch-ch) = df8444835b9954f902936c8b6fab5b44ac350db0 diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce index 95e811ebc2a..4d375860ab4 100644 --- a/devel/glib2/patches/patch-ce +++ b/devel/glib2/patches/patch-ce @@ -1,6 +1,12 @@ -$NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $ +$NetBSD: patch-ce,v 1.4 2012/04/06 10:40:37 taca Exp $ ---- glib/gatomic.c.orig 2011-10-14 03:47:57.000000000 +0000 +* Fix inconsistency of .hidden attributes, leading to link error on amd64, + reported by Tobias Nygren. +* Make sure to initialize mutex before use it since it is problem on platforms + without support of GCC bultin atomic operations, such as NetBSD 4. + It looks like this problem dosen't exist on glib 2.31.0 and later. + +--- glib/gatomic.c.orig 2012-03-11 21:43:28.000000000 +0000 +++ glib/gatomic.c @@ -22,6 +22,7 @@ #include "config.h" @@ -10,3 +16,12 @@ $NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $ /** * SECTION:atomic_operations +@@ -606,7 +606,7 @@ gsize + + #include "gthread.h" + +-static GStaticMutex g_atomic_lock; ++static GStaticMutex g_atomic_lock = G_STATIC_MUTEX_INIT; + + gint + (g_atomic_int_get) (volatile gint *atomic) |