head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.26
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.24
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.22
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.20
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.18
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.16
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.14
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.12
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.10
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.8
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.6
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.4
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.2
	pkgsrc-2007Q2-base:1.3;
locks; strict;
comment	@# @;


1.3
date	2007.06.14.14.31.13;	author hira;	state dead;
branches;
next	1.2;

1.2
date	2007.06.10.04.55.06;	author hira;	state Exp;
branches;
next	1.1;

1.1
date	2007.04.22.23.15.25;	author hira;	state Exp;
branches;
next	;


desc
@@


1.3
log
@ - Remove my bogus patches.  It causes hang.
 - Disable systray quickstarter.  I can't fix it now.

Bump PKGREVISION.
@
text
@$NetBSD: patch-ck,v 1.2 2007/06/10 04:55:06 hira Exp $

--- vcl/unx/gtk/app/gtkinst.cxx.orig	2006-09-17 21:29:23.000000000 +0900
+++ vcl/unx/gtk/app/gtkinst.cxx	2007-06-10 11:50:10.000000000 +0900
@@@@ -221,6 +221,7 @@@@
 
 GtkYieldMutex::GtkYieldMutex()
 {
+	mutex_locked = 0;
 }
 
 void GtkYieldMutex::acquire()
@@@@ -237,7 +238,10 @@@@
     OMutex::release();
     
     // obtain gdk mutex
-    gdk_threads_enter();
+    // gdk_threads_enter();
+    /* XXX: With systray quickstarter, the mutex is already locking. */
+    if( g_mutex_trylock( gdk_threads_mutex ) )
+	mutex_locked = 1;
 
     // obtained gdk mutex, now lock count is one by definition
     OMutex::acquire();
@@@@ -257,7 +261,10 @@@@
         mnCount--;
         if( mnCount == 0 )
         {
-            gdk_threads_leave();
+	    if (mutex_locked) {
+                gdk_threads_leave();
+		mutex_locked = 0;
+            }
             mnThreadId = 0;
         }
     }
@@@@ -292,6 +299,7 @@@@
     
     // obtained gdk mutex, now lock count is one by definition
     OMutex::acquire();
+    mutex_locked = 1;
     mnCount = 1;
     mnThreadId = aCurrentThread;
     OMutex::release();
@


1.2
log
@ - Fix mutex handling in patch-ck.
 - Set PTHREAD_DIAGASSERT to "AEL" in startup script.
 - Remove PTHREAD_DIAGASSERT from build environment.

This should fix PR pkg/36364.  Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@ - Fix hang when clicking the systray icon.
 - Restore sensitivity of the systray menu when closing the open dialog.
 - Add missing two scripts and a symbolic link.

Bump PKGREVISION.
@
text
@d3 21
a23 4
--- vcl/unx/gtk/app/gtkinst.cxx.orig	2007-04-23 05:50:27.000000000 +0900
+++ vcl/unx/gtk/app/gtkinst.cxx	2007-04-23 05:51:07.000000000 +0900
@@@@ -329,7 +329,9 @@@@
     // that locked the mutex with Grab()
d25 19
a43 6
     mnCount = nGrabs;
-    if( mnCount == 0 )
+    if( mnCount == 0 ) {
+        gdk_threads_leave();
         mnThreadId = 0;
+    }
a44 1
 }
@