[ooo-build-commit] patches/dev300

Tor Lillqvist tml at kemper.freedesktop.org
Fri Oct 16 03:31:20 PDT 2009


 patches/dev300/apply |   23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

New commits:
commit 90936f43e45890e0f33bd73a0b2709ff704a423f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Oct 16 13:27:59 2009 +0300

    Move webdav-locking.diff back to the WebDAV set

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 42a0428..f19862a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -539,22 +539,17 @@ cws-webdavandgvfslocking1-tools.diff
 cws-webdavandgvfslocking1-ucb.diff
 cws-webdavandgvfslocking1-unotools.diff
 
-[ Win32Only ]
-SectionOwner => jholesov
+[ WebDAV ]
+SectionOwner => tml
 SectionIssue => i#29152
 
-# WebDAV locking implementation - the original version
-# This was originally forward-ported from ooo-build-2-4-1,
-# but has now been modified significantly, so the name of
-# this diff is a bit misleading.
-
-# FIXME: 2009-10-05: "now" above means 3.0 and 3.1.1. This doesn't
-# apply against dev300-m60. Upstream code has changed significantly.
-# Probably best to just re-start from scratch... --tml
-# webdav-locking-from-ooo-build-2-4-1.diff
-
-# Fresh attempt... no idea what shape this will be in before 3.2 is
-# upon us.
+# Rework of the webdav-locking-from-ooo-build-2-4-1.diff. Even seems
+# to work, just that saving is quite slow (at least against Novell
+# Teaming) with lots of odd things going on (as can be seen if one
+# builds the webdav ucp with debug=true). But it was like that in
+# 3.1.1, too. I definitely don't think it makes sense to attempt to
+# upstream this any longer, as I don't really understand the code, and
+# it probably works by now just by accident.
 webdav-locking.diff, tml
 
 # Fix saving files on Novell teaming via WebDaV


More information about the ooo-build-commit mailing list