diff options
| author | martin <martin> | 2003-05-16 22:15:27 +0000 |
|---|---|---|
| committer | martin <martin> | 2003-05-16 22:15:27 +0000 |
| commit | bfb641dc6dc7b63f14975e748df0efd71d2c94a7 (patch) | |
| tree | afc5b095c3dcd57a0f2fd9cfa63f62f3816f6852 /x11/wxGTK | |
| parent | 8a0f7b09e7a171dd8214b639ee3b2256cc6492a8 (diff) | |
| download | pkgsrc-bfb641dc6dc7b63f14975e748df0efd71d2c94a7.tar.gz | |
Move initialization around a bit - locking the gdk mutex is a no-op before
gdk is initialized (via gtk_init). So lock it *after* initializiation.
Fixes PR pkg/21481, thanks to Nathan for debugging hints.
Diffstat (limited to 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/distinfo | 3 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ae | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index ae4e4d183b9..6ec65dab379 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2003/03/31 17:44:21 jmmv Exp $ +$NetBSD: distinfo,v 1.8 2003/05/16 22:15:27 martin Exp $ SHA1 (wxGTK-2.4.0.tar.gz) = fe01881af71c9f8ae9210d06cad7adf7f0b0662d Size (wxGTK-2.4.0.tar.gz) = 6605789 bytes @@ -6,3 +6,4 @@ SHA1 (patch-aa) = 5602ed3a9c15eab638f270990b91edc844a1e6e3 SHA1 (patch-ab) = 6417fc7faaa0b8db5f2bc6d54c7e0bf48b78370a SHA1 (patch-ac) = 3405f5d82ba84fabd555bc240fce47b166d8efc0 SHA1 (patch-ad) = 1ee314f895451dfab8bf56952ad2822b8530590f +SHA1 (patch-ae) = 4a9fef326b515ceae599a1536d0f9a5eb2096af2 diff --git a/x11/wxGTK/patches/patch-ae b/x11/wxGTK/patches/patch-ae new file mode 100644 index 00000000000..311832d0fd2 --- /dev/null +++ b/x11/wxGTK/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.1 2003/05/16 22:15:28 martin Exp $ + +--- src/gtk/app.cpp.orig 2003-05-17 00:06:30.000000000 +0200 ++++ src/gtk/app.cpp 2003-05-17 00:07:13.000000000 +0200 +@@ -799,10 +799,11 @@ + if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL; + #endif + +- gdk_threads_enter(); +- + gtk_init( &argc, &argv ); + ++ /* we can not enter threads before gtk_init is done */ ++ gdk_threads_enter(); ++ + wxSetDetectableAutoRepeat( TRUE ); + + if (!wxApp::Initialize()) |