- Remove my bogus patches. It causes hang.

 - Disable systray quickstarter.  I can't fix it now.

Bump PKGREVISION.

4 files changed, 6 insertions, 63 deletions

diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index 4928f5c5d4d..3db4895fce0 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/06/10 04:55:06 hira Exp $
+# $NetBSD: Makefile,v 1.20 2007/06/14 14:31:12 hira Exp $
 #
 
 OO_VER=			2.2.0
-PKGREVISION=		4
+PKGREVISION=		5
 DISTNAME=		openoffice-${OO_VER}
 PKGNAME=		openoffice2-${OO_VER}
 CATEGORIES=		misc
@@ -63,6 +63,9 @@ CONFIGURE_ARGS+=	--enable-epm --with-package-format=portable
 # XXX: Error in OOo internal libsndfile.
 CONFIGURE_ARGS+=	--disable-pasf --without-nas
 
+# systray quickstarter is broken with mutex handling.
+CONFIGURE_ARGS+=	--disable-systray
+
 # Disable Java.
 CONFIGURE_ARGS+=	--without-java --disable-odk --disable-gcjaot
 
diff --git a/misc/openoffice2/distinfo b/misc/openoffice2/distinfo
index 12352f1d90c..81cd3e0d1ef 100644
--- a/misc/openoffice2/distinfo
+++ b/misc/openoffice2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2007/06/10 04:55:06 hira Exp $
+$NetBSD: distinfo,v 1.18 2007/06/14 14:31:12 hira Exp $
 
 SHA1 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = d1fa827e2c08d7e3d67b2588b1136ed9e774ef42
 RMD160 (openoffice-2.2.0/OOo_2.2.0_src_binfilter.tar.bz2) = 1bb07f01e872ed003dbac3e11bc5732904076ae1
@@ -60,7 +60,5 @@ SHA1 (patch-by) = 1612b765467e51ca7498497d38a0bb6ac694f9a6
 SHA1 (patch-ch) = bcfeb99318a16e83f2e54fb94d275224c67182fb
 SHA1 (patch-ci) = 2861e8a4b21977cbc8abeabe4581093e966cdfa7
 SHA1 (patch-cj) = c54fd98e5302a86ec849b90c617ebfcf339c936d
-SHA1 (patch-ck) = aa283e89aa3139d560da6382c73a57987319472f
-SHA1 (patch-cl) = cf405103c2adc7df68d148ed58e8f5700ae16524
 SHA1 (patch-cm) = e39bf825affbd9c5a19c68f783cb95e52eb56994
 SHA1 (patch-cn) = 67afccde1d7bfa42ec4082067189da23ada97190
diff --git a/misc/openoffice2/patches/patch-ck b/misc/openoffice2/patches/patch-ck
deleted file mode 100644
index b21b6a768d9..00000000000
--- a/misc/openoffice2/patches/patch-ck
+++ /dev/null
@@ -1,44 +0,0 @@
-$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();
diff --git a/misc/openoffice2/patches/patch-cl b/misc/openoffice2/patches/patch-cl
deleted file mode 100644
index 876080c9a05..00000000000
--- a/misc/openoffice2/patches/patch-cl
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2007/04/22 23:15:25 hira Exp $
-
---- sfx2/source/appl/shutdownicon.cxx.orig	2007-04-23 06:14:32.000000000 +0900
-+++ sfx2/source/appl/shutdownicon.cxx	2007-04-23 06:15:48.000000000 +0900
-@@ -530,9 +530,7 @@
-         }
-     }
- 
--#ifdef WNT
-         LeaveModalMode();
--#endif
-     return 0;
- }
-