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

[rengelhard svn gnome org]

Author: rengelhard
Date: Sun May 11 21:49:09 2008
New Revision: 12516
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12516&view=rev

Log:
dev300-m12, second step

Added:
   trunk/patches/dev300/fix-system-hunspell-m11.diff
      - copied unchanged from r12514, /trunk/patches/dev300/fix-system-hunspell.diff
   trunk/patches/dev300/odf-flatxml-import-export-m11.diff
      - copied unchanged from r12514, /trunk/patches/dev300/odf-flatxml-import-export.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/fix-system-hunspell.diff
   trunk/patches/dev300/odf-flatxml-import-export.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sun May 11 21:49:09 2008
@@ -946,6 +946,10 @@
 # double qulification
 buildfix-sdext-double-qualification.diff, i#88584
 
+[ BuildBits < dev300-m12 ]
+# fix build with system-hunspell
+fix-system-hunspell-m11.diff, i#87604
+[ BuildBits >= dev300-m12 ]
 # fix build with system-hunspell
 fix-system-hunspell.diff, i#87604
 
@@ -1023,11 +1027,17 @@
 # should use --with-system-openssl
 default-openssl-no-idea-alg.diff, pmladek
 
-[ Features ]
+[ Features < dev300-m12 ]
+# load and save also odf documents in flat xml format as opposed to the
+# compressed ones (conforming to the odf specifications)
+odf-flatxml-import-export-m11.diff
+
+[ Features >= dev300-m12 ]
 # load and save also odf documents in flat xml format as opposed to the
 # compressed ones (conforming to the odf specifications)
 odf-flatxml-import-export.diff
 
+[ Features ]
 # ask user on logout/shutdown to save documents
 session-management.diff, i#63156, rodo
 

Modified: trunk/patches/dev300/fix-system-hunspell.diff
==============================================================================
--- trunk/patches/dev300/fix-system-hunspell.diff	(original)
+++ trunk/patches/dev300/fix-system-hunspell.diff	Sun May 11 21:49:09 2008
@@ -5,13 +5,9 @@
 diff -u -r1.18 makefile.mk
 --- lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	25 Mar 2008 16:49:16 -0000	1.18
 +++ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk	30 Mar 2008 11:13:00 -0000
-@@ -104,16 +104,13 @@
- 		$(UCBHELPERLIB)	\
- 		$(UNOTOOLSLIB)	\
+@@ -92,9 +92,7 @@
  		$(LNGLIB) \
--		$(HNJLIB)
-+		$(HNJLIB) \
-+		$(ULINGULIB)
+ 		$(HNJLIB)
  
 -.IF "$(SYSTEM_HUNSPELL)" != "YES"
 -SHL1STDLIBS+=   $(ULINGULIB)
@@ -20,11 +16,6 @@
  SHL1STDLIBS+=   $(HUNSPELL_LIBS)
  .ENDIF
  
--
--
- # build DLL
- SHL1LIBS=		$(SLB)$/$(TARGET).lib
- SHL1IMPLIB=		i$(TARGET)
 Index: source/lingutil/makefile.mk
 ===================================================================
 RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v

Modified: trunk/patches/dev300/odf-flatxml-import-export.diff
==============================================================================
--- trunk/patches/dev300/odf-flatxml-import-export.diff	(original)
+++ trunk/patches/dev300/odf-flatxml-import-export.diff	Sun May 11 21:49:09 2008
@@ -1,36 +1,37 @@
 --- filter/prj/d.lst	25 Apr 2005 08:49:30 -0000	1.24
 +++ filter/prj/d.lst	2 Jul 2007 09:47:13 -0000
 @@ -20,6 +20,7 @@
- mkdir: %_DEST%\bin%_EXT%\xslt\import\common
  mkdir: %_DEST%\bin%_EXT%\xslt\import\spreadsheetml
+ mkdir: %_DEST%\bin%_EXT%\xslt\export\uof
  mkdir: %_DEST%\bin%_EXT%\xslt\import\wordml
 +mkdir: %_DEST%\bin%_EXT%\xslt\odfflatxml
  mkdir: %_DEST%\xml%_EXT%\registry
  mkdir: %_DEST%\xml%_EXT%\registry\spool
  ..\source\xslt\common\*.xsl %_DEST%\bin%_EXT%\xslt\common\*.xsl
 @@ -32,6 +33,7 @@
- ..\source\xslt\import\common\*.xsl %_DEST%\bin%_EXT%\xslt\import\common\*.xsl
  ..\source\xslt\import\spreadsheetml\*.xsl %_DEST%\bin%_EXT%\xslt\import\spreadsheetml\*.xsl
  ..\source\xslt\import\wordml\*.xsl %_DEST%\bin%_EXT%\xslt\import\wordml\*.xsl
+ ..\source\xslt\import\uof\*.xsl %_DEST%\bin%_EXT%\xslt\import\uof\*.xsl
 +..\source\odfflatxml\*.xsl %_DEST%\bin%_EXT%\xslt\odfflatxml\*.xsl
  ..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
  ..\%__SRC%\bin\*.xsl %_DEST%\bin%_EXT%\*.xsl
  ..\%__SRC%\bin\*.stw %_DEST%\bin%_EXT%\*.stw
 --- filter/source/config/fragments/fcfg_xslt.mk	21 Mar 2005 11:48:40 -0000	1.7
 +++ filter/source/config/fragments/fcfg_xslt.mk	2 Jul 2007 09:34:15 -0000
-@@ -3,13 +3,21 @@
+@@ -3,7 +3,11 @@
  # -----------------------------------------------
- # count = 3
+ # count = 5
  T4_XSLT = \
 +    calc_ODS_FlatXML \
 +    draw_ODG_FlatXML \
 +    impress_ODP_FlatXML \
      writer_DocBook_File \
 +    writer_ODT_FlatXML \
-     XHTML_File
- 
- # -----------------------------------------------
- # count = 7
+     XHTML_File \
+     Unified_Office_Format_text \
+     Unified_Office_Format_spreadsheet \
+@@ -13,6 +17,10 @@
+ # count = 8
  F4_XSLT = \
      DocBook_File \
 +    ODG_FlatXML \