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

[Petr Mladek]

 patches/dev300/apply                                |    4 +---
 patches/ooxml/Makefile.am                           |    1 -
 patches/ooxml/buildfix-oox-depends-on-unotools.diff |    8 --------
 patches/ooxml/makelist.sh                           |    8 --------
 4 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 6adb0f6d7142e7cee643f604a6ff502ebec810e7
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 17:51:58 2011 +0200

    pushed buildfix-oox-depends-on-unotools.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b3a061c..deef804 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4,7 +4,7 @@
 
 # -------- Options --------
 
-PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
+PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../postgresql
 
 # might be space separated list to support more MWS
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
@@ -935,8 +935,6 @@ win32-installer-register-moox-types.diff
 # FIXME 2011-04-04: Doesn't apply, unclear whether needed
 # docx-ugly-fix.diff, n#548701, cbosdo
 
-buildfix-oox-depends-on-unotools.diff
-
 # FIXME dev300-m83 oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
 
 # FIXME: 2009-09-02: Applies but causes compilation errors. --tml
diff --git a/patches/ooxml/Makefile.am b/patches/ooxml/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/ooxml/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
diff --git a/patches/ooxml/buildfix-oox-depends-on-unotools.diff b/patches/ooxml/buildfix-oox-depends-on-unotools.diff
deleted file mode 100644
index 115bb91..0000000
--- a/patches/ooxml/buildfix-oox-depends-on-unotools.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 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
diff --git a/patches/ooxml/makelist.sh b/patches/ooxml/makelist.sh
deleted file mode 100755
index fa3e4f3..0000000
--- a/patches/ooxml/makelist.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-ls -l | grep -E "\.diff$" | sed \
-    -e "s/.*\ oox/oox/g" \
-    -e "s/.*\ xmlfilter/xmlfilter/g" \
-    -e "s/.*\ writerfilter/writerfilter/g" \
-    -e "s/.*\ ooxml/ooxml/g" \
-    | sort > list.txt