- Remove my bogus patches. It causes hang.

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

Bump PKGREVISION.

2 files changed, 0 insertions, 58 deletions

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;
- }
-