ooo-build r15521 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Mar 11 11:52:56 2009
New Revision: 15521
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15521&view=rev

Log:
2009-03-11  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Now that is seems to work, uncomment
	webdav-locking-from-ooo-build-2-4-1.diff.

	Skip mozilla-buildlibs-win32.diff on >= ooo310-m4 as it doesn't
	apply. Not that it is of much use on earlier milestones either, as
	we don't build Mozilla from source on Windows anyway.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar 11 11:52:56 2009
@@ -631,10 +631,11 @@
 SectionIssue => i#29152
 
 # WebDAV locking implementation - the original version
-# This is forward-ported from ooo-build-2-4-1, because the version for
-# up-streaming still does not work as expected :-(
-# FIXME 2008-12-04: doesn't apply to dev300-m37
-#webdav-locking-from-ooo-build-2-4-1.diff
+# 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.
+
+webdav-locking-from-ooo-build-2-4-1.diff
 
 # fix saving files on Novell teaming via WebDaV
 webdav-locking-local-temp-file.diff, bnc#440514, kendy
@@ -1564,8 +1565,15 @@
 win32-gw-send-mail.diff, i#34264, n#418407, tml
 # This is a pretty nasty IE problem i#19510, i#65209
 win32-activex-disable.diff, i#65209, i#19510, n#168534, tml
+
+[ Win32Only < ooo310-m4 ]
 # This enables building libIDL, glib and buildtools for mozilla from source
+# Something completely different is needed for >= ooo310-m4,
+# and of course we use prebuilt Mozilla anyway always, so this patch
+# doesn't necessarily make sense even on < ooo310-m4
 mozilla-buildlibs-win32.diff, i#58741, davidf
+
+[ Win32Only ]
 # This enables building scsolver on Win32
 boost-patch.diff, tml
 # Multi-language installer stuff