diff options
| author | drochner <drochner> | 2007-01-10 14:57:33 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2007-01-10 14:57:33 +0000 |
| commit | b9094156bbafb2463e6d3bf113c0e1099581353b (patch) | |
| tree | ce05a41b735657717f225c92e2e24c9b62c8b011 /devel/glib2 | |
| parent | 0501740405909a245d04e2c2fd0fce9430a824d1 (diff) | |
| download | pkgsrc-b9094156bbafb2463e6d3bf113c0e1099581353b.tar.gz | |
fix a locking botch: g_main_context_iterate() must leave the context
locked on return
bump PKGREVISION
Diffstat (limited to 'devel/glib2')
| -rw-r--r-- | devel/glib2/Makefile | 3 | ||||
| -rw-r--r-- | devel/glib2/distinfo | 3 | ||||
| -rw-r--r-- | devel/glib2/patches/patch-ai | 28 |
3 files changed, 32 insertions, 2 deletions
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 7f583a8faec..b204001dc67 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.111 2007/01/08 15:56:14 drochner Exp $ +# $NetBSD: Makefile,v 1.112 2007/01/10 14:57:33 drochner Exp $ DISTNAME= glib-2.12.7 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/glib/glib2/} CATEGORIES= devel MASTER_SITES= ftp://ftp.gtk.org/pub/glib/2.12/ \ diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index b84a33d399d..641fc89a42a 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.76 2007/01/08 15:56:14 drochner Exp $ +$NetBSD: distinfo,v 1.77 2007/01/10 14:57:33 drochner Exp $ SHA1 (glib-2.12.7.tar.bz2) = 42024d775f5b1550c0f86091609cd1c7d1440413 RMD160 (glib-2.12.7.tar.bz2) = 0c95bd3a5970263b72be9cacfc64c0e7f4bbe254 @@ -10,4 +10,5 @@ SHA1 (patch-ad) = c926d96bdc9ddf4f434fc57af0adbe11002cffc3 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 SHA1 (patch-af) = 192998d1e2188c0210d7a471786495b758c437ae SHA1 (patch-ah) = 8b65c137b07659351b97089c10db0dac61f04905 +SHA1 (patch-ai) = baf3466a38ed09e956c4e8423a64415395690de7 SHA1 (patch-tb) = fd559f4cb3e7a0c3b23a705875df539bce53be1e diff --git a/devel/glib2/patches/patch-ai b/devel/glib2/patches/patch-ai new file mode 100644 index 00000000000..e82cf9b0942 --- /dev/null +++ b/devel/glib2/patches/patch-ai @@ -0,0 +1,28 @@ +$NetBSD: patch-ai,v 1.13 2007/01/10 14:57:33 drochner Exp $ + +--- glib/gmain.c.orig 2007-01-10 14:36:51.000000000 +0100 ++++ glib/gmain.c +@@ -2619,13 +2619,13 @@ g_main_context_iterate (GMainContext *co + { + gboolean got_ownership; + ++ LOCK_CONTEXT (context); ++ + g_return_val_if_fail (g_thread_supported (), FALSE); + + if (!block) + return FALSE; + +- LOCK_CONTEXT (context); +- + if (!context->cond) + context->cond = g_cond_new (); + +@@ -2635,7 +2635,6 @@ g_main_context_iterate (GMainContext *co + + if (!got_ownership) + { +- UNLOCK_CONTEXT (context); + return FALSE; + } + } |