[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - patches/dev300 patches/ooxml

[Tor Lillqvist]

 patches/dev300/apply                                |    3 ++-
 patches/ooxml/buildfix-oox-depends-on-unotools.diff |   10 ++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit e4d9a9faa5ce5db4661fae2a76a7bd93c9dc0bbe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:20:00 2011 +0300

    Make buildfix-oox-depends-on-unotools.diff apply again

diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools.diff b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
index 8d7ce11..115bb91 100644
--- a/patches/ooxml/buildfix-oox-depends-on-unotools.diff
+++ b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
@@ -1,14 +1,8 @@
----
- oox/prj/build.lst |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git oox/prj/build.lst oox/prj/build.lst
-index 345c72e..60c4b02 100644
 --- oox/prj/build.lst
 +++ oox/prj/build.lst
 @@ -1,4 +1,4 @@
--oox	oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
-+oox	oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl NULL
+-oox	oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL
++oox	oox : cppu cppuhelper comphelper filter sal offapi sax basegfx svx xmlscript tools vcl unotools BOOST:boost OPENSSL:openssl LIBXSLT:libxslt NULL
  oox	oox				usr1	-   all	oox_mkout NULL
  oox	oox\prj				get	-   all	oox_prj NULL
  oox	oox\source\token		nmake	-   all	oox_token NULL
commit a4f1805e638a3e61e217efad34d0961d1970a7e9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Apr 4 16:17:17 2011 +0300

    Bypass docx-ugly-fix.diff for now

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 705f7cc..225e666 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1055,7 +1055,8 @@ win32-installer-register-moox-types.diff
 writerfilter-module-writer.diff #disabled
 
 # Ugly temporary fix
-docx-ugly-fix.diff, n#548701, cbosdo
+# FIXME 2011-04-04: Doesn't apply, unclear whether needed
+# docx-ugly-fix.diff, n#548701, cbosdo
 
 buildfix-oox-depends-on-unotools.diff