[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Fridrich Strba]

 patches/dev300/libwpd-testing.diff        |    6 ++----
 patches/dev300/libwpg-testing.diff        |    6 ++----
 patches/dev300/libwps-testing.diff        |    6 ++----
 patches/dev300/writerperfect-testing.diff |   17 ++++++++++-------
 4 files changed, 16 insertions(+), 19 deletions(-)

New commits:
commit d1e105d2044d5158c9d4cad6716776d3e5cd7a93
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Sep 13 15:12:55 2010 +0200

    Revert "Massage unstable libwp* patches to apply, since GoOo builds use them."
    
    This reverts commit eeee73df049e580b7436e39bba3b09ced91379f1.

diff --git a/patches/dev300/libwpd-testing.diff b/patches/dev300/libwpd-testing.diff
index 6becd23..0a79fe1 100644
--- a/patches/dev300/libwpd-testing.diff
+++ b/patches/dev300/libwpd-testing.diff
@@ -1,16 +1,14 @@
 --- libwpd/makefile.mk	2008-04-07 14:04:18.000000000 +0200
 +++ libwpd/makefile.mk	2008-04-07 14:05:05.000000000 +0200
-@@ -45,8 +45,8 @@
+@@ -45,7 +45,7 @@
      @echo "Using system libwpd..."
  .ENDIF
  
 -TARFILE_NAME=libwpd-0.8.14
--TARFILE_MD5=64d66018897d759358f454010b6e75d2
 +TARFILE_NAME=libwpd-0.9.0~CVS20081118
-+TARFILE_MD5=32c8599f6f4cbb420e485288f74b398a
+ #PATCH_FILES=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src$/lib
- 
 --- libwpd/prj/d.lst	2008-04-07 14:04:18.000000000 +0200
 +++ libwpd/prj/d.lst	2008-04-07 14:19:27.000000000 +0200
 @@ -1,12 +1,15 @@
diff --git a/patches/dev300/libwpg-testing.diff b/patches/dev300/libwpg-testing.diff
index 063485f..bbe003a 100644
--- a/patches/dev300/libwpg-testing.diff
+++ b/patches/dev300/libwpg-testing.diff
@@ -1,6 +1,6 @@
 --- libwpg/makefile.mk	2008-04-07 14:04:33.000000000 +0200
 +++ libwpg/makefile.mk	2008-04-07 14:21:35.000000000 +0200
-@@ -54,10 +54,11 @@
+@@ -54,9 +54,10 @@
  INCPRE+=$(LIBWPD_CFLAGS)
  .ELSE
  INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
@@ -8,9 +8,7 @@
  .ENDIF
  
 -TARFILE_NAME=libwpg-0.1.3
--TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
 +TARFILE_NAME=libwpg-0.2.0~CVS20081118
-+TARFILE_MD5=6f0defec3c4342c0f3e1a1fe50f3f5f9
+ #PATCH_FILE_NAME=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib
- 
diff --git a/patches/dev300/libwps-testing.diff b/patches/dev300/libwps-testing.diff
index 34ad457..f01e2b6 100644
--- a/patches/dev300/libwps-testing.diff
+++ b/patches/dev300/libwps-testing.diff
@@ -1,6 +1,6 @@
 --- libwps/makefile.mk	2008-04-07 14:04:25.000000000 +0200
 +++ libwps/makefile.mk	2008-04-07 14:18:31.000000000 +0200
-@@ -54,10 +54,11 @@
+@@ -54,9 +54,10 @@
  INCPRE+=$(LIBWPD_CFLAGS)
  .ELSE
  INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
@@ -8,12 +8,10 @@
  .ENDIF
  
 -TARFILE_NAME=libwps-0.1.2
--TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
 +TARFILE_NAME=libwps-0.2.0~CVS20081118
-+TARFILE_MD5=3c77ef8cb348ab6f98ebf53961cc59ea
+ #PATCH_FILE_NAME=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib
- 
 --- libwps/prj/d.lst	2008-04-07 14:04:25.000000000 +0200
 +++ libwps/prj/d.lst	2008-04-07 14:23:26.000000000 +0200
 @@ -1,6 +1,5 @@
diff --git a/patches/dev300/writerperfect-testing.diff b/patches/dev300/writerperfect-testing.diff
index 0cd5aca..00c9ba4 100644
--- a/patches/dev300/writerperfect-testing.diff
+++ b/patches/dev300/writerperfect-testing.diff
@@ -2,8 +2,8 @@ diff -u -r -N writerperfect/prj/build.lst writerperfect/prj/build.lst
 --- writerperfect/prj/build.lst	2008-11-17 22:06:28.000000000 +0100
 +++ writerperfect/prj/build.lst	2008-11-17 23:37:06.000000000 +0100
 @@ -1,4 +1,4 @@
--wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools NULL
-+wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff svtools sfx2 NULL
+-wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff NULL
++wp      writerperfect : LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd sot comphelper xmloff sfx2 NULL
  wp	writerperfect			usr1	-	all	wp_mkout NULL
  wp	writerperfect\source\stream	nmake	-	all	wp_stream NULL
  wp	writerperfect\source\filter	nmake	-	all	wp_filter NULL
@@ -4019,7 +4019,7 @@ diff -u -r -N writerperfect/source/wpdimp/WordPerfectCollector.hxx writerperfect
 diff -u -r -N writerperfect/source/wpdimp/WordPerfectImportFilter.cxx writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
 --- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-11-17 22:06:28.000000000 +0100
 +++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-11-17 22:07:19.000000000 +0100
-@@ -29,24 +29,18 @@
+@@ -29,27 +29,19 @@
   */
  
  #include <osl/diagnose.h>
@@ -4041,6 +4041,9 @@ diff -u -r -N writerperfect/source/wpdimp/WordPerfectImportFilter.cxx writerperf
 -#ifndef _ATTRLIST_HPP_
  #include <xmloff/attrlist.hxx>
 -#endif
+-#ifndef _XMLKYWD_HPP
+ #include <xmloff/xmlkywd.hxx>
+-#endif
  #include <ucbhelper/content.hxx>
 +#include <sfx2/passwd.hxx>
  
@@ -4431,8 +4434,8 @@ diff -u -r -N writerperfect/source/wpgimp/makefile.mk writerperfect/source/wpgim
 diff -u -r -N writerperfect/source/wpgimp/WPGImportFilter.cxx writerperfect/source/wpgimp/WPGImportFilter.cxx
 --- writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-11-17 22:06:28.000000000 +0100
 +++ writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-11-17 22:07:19.000000000 +0100
-@@ -46,7 +46,7 @@
- #include <xmloff/attrlist.hxx>
+@@ -75,7 +75,7 @@
+ #endif
  
  #include "filter/DocumentHandler.hxx"
 -#include "OdgExporter.hxx"
@@ -4440,7 +4443,7 @@ diff -u -r -N writerperfect/source/wpgimp/WPGImportFilter.cxx writerperfect/sour
  #include "WPGImportFilter.hxx"
  #include "stream/WPXSvStream.h"
  
-@@ -119,16 +119,6 @@
+@@ -148,16 +148,6 @@
  
  	WPXInputStream* input = new WPXSvInputStream( xInputStream );
  
@@ -4457,7 +4460,7 @@ diff -u -r -N writerperfect/source/wpgimp/WPGImportFilter.cxx writerperfect/sour
  	OdgExporter exporter(&xHandler);
  	bool tmpParseResult = libwpg::WPGraphics::parse(input, &exporter);
  	if (input)
-@@ -178,16 +168,6 @@
+@@ -207,16 +197,6 @@
      
  	WPXInputStream* input = new WPXSvInputStream( xInputStream );