[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                               |    1 
 patches/dev300/filter-fix-build-FCFGMerge.cfg.diff |  129 +++++++++++++++++++++
 2 files changed, 130 insertions(+)

New commits:
commit 33699e2d52f0148205c8964fe473ad3d1609c904
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Oct 14 12:28:59 2009 +0200

    fix build, FCFGMerge.cfg was missing and required when building without java
    
    * patches/dev300/apply:
    * patches/dev300/filter-fix-build-FCFGMerge.cfg.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1aab217..dc7aee4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3395,3 +3395,4 @@ sw-no-macro-recorder-in-ui.diff, fridrich
 
 [ Fixes ]
 xmlhelp-build-without-java.diff, rodo
+filter-fix-build-FCFGMerge.cfg.diff, rodo
diff --git a/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff b/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff
new file mode 100644
index 0000000..bb967ee
--- /dev/null
+++ b/patches/dev300/filter-fix-build-FCFGMerge.cfg.diff
@@ -0,0 +1,129 @@
+diff -rupN filter-orig/source/config/tools/merge/FCFGMerge.cfg filter/source/config/tools/merge/FCFGMerge.cfg
+--- filter-orig/source/config/tools/merge/FCFGMerge.cfg	1970-01-01 01:00:00.000000000 +0100
++++ filter/source/config/tools/merge/FCFGMerge.cfg	2009-10-14 12:20:22.000000000 +0200
+@@ -0,0 +1,125 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++# 
++# Copyright 2008 by Sun Microsystems, Inc.
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile: FCFGMerge.cfg,v $
++#
++# $Revision: 1.5 $
++#
++# This file is part of OpenOffice.org.
++#
++# OpenOffice.org is free software: you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License version 3
++# only, as published by the Free Software Foundation.
++#
++# OpenOffice.org is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU Lesser General Public License version 3 for more details
++# (a copy is included in the LICENSE file that accompanied this code).
++#
++# You should have received a copy of the GNU Lesser General Public License
++# version 3 along with OpenOffice.org.  If not, see
++# <http://www.openoffice.org/license.html>
++# for a copy of the LGPLv3 License.
++#
++#*************************************************************************
++
++#************************************************
++# Specify the verbose mode of this tool.
++# 1 = show errors only
++# 2 = show errors/warnings (default)
++# 3 = show errors/warnings and some generic infos
++# 4 = show anything (including detailed infos)
++#
++# [OPTIONAL]
++#************************************************
++
++loglevel = 2
++
++#************************************************
++# This extension is used for all XML files. It doesnt
++# matter if its used for reading fragments or writing
++# XML packages.
++# Must be given without any additional signes like "."
++# or "*."!
++#
++# [REQUIRED]
++#************************************************
++
++extension_xcu=xcu
++
++#************************************************
++# This extension is used for all Package files. It doesnt
++# matter if its used for reading such files or writing
++# it.
++# Must be given without any additional signes like "."
++# or "*."!
++#
++# [REQUIRED]
++#************************************************
++
++extension_pkg=pkg
++
++#************************************************
++# These values are used to generate a correct XML
++# header.
++# Note: The property "xmlpackage" must be specified
++#       via command line. There exists more then one
++#      	possible value.
++#
++# [REQUIRED]
++#************************************************
++
++xmlversion	=	1.0
++xmlencoding	=	UTF-8
++xmlpath		=	org.openoffice.TypeDetection
++#xmlpackage	=
++
++#************************************************
++# These values are used to name the configuration
++# sets inside the generated XCM file for different
++# item groups like e.g. types, filters etcpp.
++#
++# [REQUIRED]
++#************************************************
++
++setname_types 			    = Types
++setname_filters 			  = Filters
++setname_frameloaders 	  = FrameLoaders
++setname_contenthandlers = ContentHandlers
++
++subdir_types 			    	= types
++subdir_filters 			  	= filters
++subdir_frameloaders 	  = frameloaders
++subdir_contenthandlers 	= contenthandlers
++
++#************************************************
++# This delimiter is used to split every
++# item list of the package configuration files
++# (which are temp. created  by the make proccess)
++# into its tokens.
++#
++# [REQUIRED]
++#************************************************
++delimiter=,
++
++#************************************************
++# Enable/disable removing of leading/trailing withespaces
++# during splitting stringlists.
++#
++# [REQUIRED]
++#************************************************
++trim=true
++
++#************************************************
++# Enable/disable removing of leading/trailing "-signs
++# during splitting stringlists.
++#
++# [REQUIRED]
++#************************************************
++decode=false