[ooo-build-commit] patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Fri Aug 14 02:53:11 PDT 2009


 patches/dev300/apply               |    2 --
 patches/dev300/vcl-extra-sync.diff |   12 ------------
 2 files changed, 14 deletions(-)

New commits:
commit 14d6abe3bb07c5d8285183a856dade1883048cab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 14 12:52:33 2009 +0300

    vcl-extra-sync.diff is upstream
    
    * patches/dev300/vcl-extra-sync.diff: Delete.
    * patches/dev300/apply: Drop it.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 13c2e8c..2e93c4c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2929,8 +2929,6 @@ sfx2-qstart-nocrashhack.diff, i#101245, pmladek
 # Disabled because it caused bug n#497708
 #svtools-transferable-fix.diff, thorsten
 
-# CWS metropatch01
-vcl-extra-sync.diff, thorsten
 # Disabled because it caused bug n#497708
 #sd-ooo320-backports.diff, thorsten
 svx-ooo320-backports.diff, thorsten
diff --git a/patches/dev300/vcl-extra-sync.diff b/patches/dev300/vcl-extra-sync.diff
deleted file mode 100644
index 19eb270..0000000
--- a/patches/dev300/vcl-extra-sync.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- vcl/unx/source/window/salframe.cxx	2009-04-02 12:44:26.000000000 +0200
-+++ vcl/unx/source/window/salframe.cxx	2009-03-25 18:07:23.000000000 +0100
-@@ -1334,6 +1335,9 @@
-                 XUngrabPointer( GetXDisplay(),
-                                 CurrentTime );
-         }
-+        // flush here; there may be a very seldom race between
-+        // the display connection used for clipboard and our connection
-+        Flush();
- 	}
- }
- 


More information about the ooo-build-commit mailing list