rpms/openoffice.org/devel workspace.cmcfixes43.patch, 1.1, 1.2 .cvsignore, 1.153, 1.154 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.7, 1.8 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.24, 1.25 openoffice.org-2.0.3.ooo80816.selinux.bridges.patch, 1.3, 1.4 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.43, 1.44 openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch, 1.2, 1.3 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.7, 1.8 openoffice.org-2.2.0.rh232389.tango.patch, 1.5, 1.6 openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch, 1.6, 1.7 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.1, 1.2 openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch, 1.2, 1.3 openoffice.org-2.4.0.ooo85097.desktop.pagein.patch, 1.1, 1.2 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.1, 1.2 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.3, 1.4 openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch, 1.1, 1.2 openoffice.org.langpack-acor.template, 1.1, 1.2 openoffice.org.langpack-cjk.template, 1.1, 1.2 openoffice.org.langpack-common.template, 1.1, 1.2 openoffice.org.langpack-ctl.template, 1.1, 1.2 openoffice.org.langpack-help.template, 1.1, 1.2 openoffice.org.spec, 1.1455, 1.1456 pseudoworkspace.valgrind1.patch, 1.27, 1.28 sources, 1.276, 1.277 workspace.cairotext01.patch, 1.6, 1.7 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.8, NONE openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, 1.2, NONE openoffice.org-2.3.1.ooo81307.sw.word2.patch, 1.2, NONE openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch, 1.1, NONE openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch, 1.1, NONE openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch, 1.1, NONE openoffice.org-2.4.0.ooo86123.ucb.newneon.patch, 1.1, NONE openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch, 1.1, NONE workspace.gcc430two.patch, 1.7, NONE workspace.notes2.patch, 1.5, NONE workspace.unifysound01.patch, 1.11, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Mar 27 15:14:26 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384

Modified Files:
	.cvsignore 
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org-1.9.87.rh151357.setlangtolocale.patch 
	openoffice.org-2.0.3.ooo80816.selinux.bridges.patch 
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch 
	openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 
	openoffice.org-2.2.0.rh232389.tango.patch 
	openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch 
	openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 
	openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch 
	openoffice.org-2.4.0.ooo85097.desktop.pagein.patch 
	openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 
	openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 
	openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch 
	openoffice.org.langpack-acor.template 
	openoffice.org.langpack-cjk.template 
	openoffice.org.langpack-common.template 
	openoffice.org.langpack-ctl.template 
	openoffice.org.langpack-help.template openoffice.org.spec 
	pseudoworkspace.valgrind1.patch sources 
	workspace.cairotext01.patch 
Added Files:
	workspace.cmcfixes43.patch 
Removed Files:
	openoffice.org-1.9.114.rh161886.rpath.desktop.patch 
	openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch 
	openoffice.org-2.3.1.ooo81307.sw.word2.patch 
	openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch 
	openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch 
	openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch 
	openoffice.org-2.4.0.ooo86123.ucb.newneon.patch 
	openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch 
	workspace.gcc430two.patch workspace.notes2.patch 
	workspace.unifysound01.patch 
Log Message:
merge to HEAD

workspace.cmcfixes43.patch:

Index: workspace.cmcfixes43.patch
===================================================================
RCS file: workspace.cmcfixes43.patch
diff -N workspace.cmcfixes43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ workspace.cmcfixes43.patch	27 Mar 2008 15:13:51 -0000	1.2
@@ -0,0 +1,1244 @@
+Index: udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3.20.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx:1.3	Wed Dec 12 07:34:44 2007
++++ udk/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx	Fri Mar  7 08:56:40 2008
+@@ -34,6 +34,7 @@
+  ************************************************************************/
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2 udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2.6.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx:1.2	Wed Feb 27 01:52:03 2008
++++ udk/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx	Fri Mar  7 08:56:08 2008
+@@ -37,6 +37,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4 udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4.6.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx:1.4	Wed Feb 27 01:54:38 2008
++++ udk/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx	Fri Mar  7 08:58:11 2008
+@@ -44,12 +44,14 @@
+ #include "bridges/cpp_uno/shared/vtablefactory.hxx"
+ #include "share.hxx"
+ 
++#include <stdio.h>
++#include <string.h>
++
+ using namespace com::sun::star::uno;
+ 
+ //#define BRDEBUG
+ 
+ #ifdef BRDEBUG
+-#include <stdio.h>
+ #include <rtl/strbuf.hxx>
+ #include <rtl/ustrbuf.hxx>
+ #include <osl/diagnose.h>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2 udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2.28.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx:1.2	Fri Nov  2 08:21:34 2007
++++ udk/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx	Fri Mar  7 08:57:17 2008
+@@ -33,6 +33,7 @@
+  *
+  ************************************************************************/
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7 udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7.96.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx:1.7	Sat Sep 16 08:48:22 2006
++++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx	Fri Mar  7 08:54:36 2008
+@@ -37,6 +37,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3.6.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.3	Wed Feb 27 01:56:24 2008
++++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	Fri Mar  7 08:55:32 2008
+@@ -47,6 +47,7 @@
+ 
+ #include "share.hxx"
+ #include <stdio.h>
++#include <string.h>
+ 
+ 
+ using namespace ::com::sun::star::uno;
+Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3 udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3.6.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.3	Wed Feb 27 01:56:42 2008
++++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx	Fri Mar  7 08:54:56 2008
+@@ -37,6 +37,7 @@
+ #include "precompiled_bridges.hxx"
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+diff -u udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6 udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6.80.1
+--- udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx:1.6	Wed Nov 22 03:07:33 2006
++++ udk/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx	Fri Mar  7 08:58:40 2008
+@@ -36,6 +36,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_bridges.hxx"
+ #include <stdio.h>
++#include <string.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+Index: udk/testtools/source/bridgetest/component.LINUXIgcc3.map
+diff -u udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3 udk/testtools/source/bridgetest/component.LINUXIgcc3.map:removed
+--- udk/testtools/source/bridgetest/component.LINUXIgcc3.map:1.3	Fri Sep  9 05:21:49 2005
++++ udk/testtools/source/bridgetest/component.LINUXIgcc3.map	Mon Mar 10 06:32:43 2008
+@@ -1,46 +0,0 @@
+-#*************************************************************************
+-#
+-#   OpenOffice.org - a multi-platform office productivity suite
+-#
+-#   $RCSfile$
+-#
+-#   $Revision$
+-#
+-#   last change: $Author$ $Date$
+-#
+-#   The Contents of this file are made available subject to
+-#   the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-#     GNU Lesser General Public License Version 2.1
+-#     =============================================
+-#     Copyright 2005 by Sun Microsystems, Inc.
+-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-#     This library is free software; you can redistribute it and/or
+-#     modify it under the terms of the GNU Lesser General Public
+-#     License version 2.1, as published by the Free Software Foundation.
+-#
+-#     This library 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 for more details.
+-#
+-#     You should have received a copy of the GNU Lesser General Public
+-#     License along with this library; if not, write to the Free Software
+-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-#     MA  02111-1307  USA
+-#
+-#*************************************************************************
+-
+-UDK_3_0_0 {
+-    global:
+-        component_getFactory;
+-        component_getImplementationEnvironment;
+-        component_writeInfo;
+-
+-        _ZN4_STL7num_put*; # STLport
+-
+-    local:
+-        *;
+-};
+Index: udk/testtools/source/bridgetest/component.gcc3.map
+diff -u /dev/null udk/testtools/source/bridgetest/component.gcc3.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:32:43 2008
++++ udk/testtools/source/bridgetest/component.gcc3.map	Mon Mar  3 02:54:31 2008
+@@ -0,0 +1,46 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3_0_0 {
++    global:
++        component_getFactory;
++        component_getImplementationEnvironment;
++        component_writeInfo;
++
++        _ZN4_STL7num_put*; # STLport
++
++    local:
++        *;
++};
+Index: udk/testtools/source/bridgetest/makefile.mk
+diff -u udk/testtools/source/bridgetest/makefile.mk:1.34 udk/testtools/source/bridgetest/makefile.mk:1.34.8.1
+--- udk/testtools/source/bridgetest/makefile.mk:1.34	Thu Dec 13 09:13:36 2007
++++ udk/testtools/source/bridgetest/makefile.mk	Mon Mar  3 02:54:31 2008
+@@ -83,8 +83,8 @@
+ SHL1LIBS=	$(LIB1TARGET)
+ SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+ DEF1NAME=	$(SHL1TARGET)
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = component.LINUXIgcc3.map
++.IF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = component.gcc3.map
+ .ELSE
+ SHL1VERSIONMAP = component.map
+ .ENDIF
+@@ -106,8 +106,8 @@
+ SHL2LIBS=	$(LIB2TARGET)
+ SHL2DEF=	$(MISC)$/$(SHL2TARGET).def
+ DEF2NAME=	$(SHL2TARGET)
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL2VERSIONMAP = component.LINUXIgcc3.map
++.IF "$(COMNAME)" == "gcc3"
++SHL2VERSIONMAP = component.gcc3.map
+ .ELSE
+ SHL2VERSIONMAP = component.map
+ .ENDIF
+Index: udk/cppuhelper/qa/propertysetmixin/makefile.mk
+diff -u udk/cppuhelper/qa/propertysetmixin/makefile.mk:1.5 udk/cppuhelper/qa/propertysetmixin/makefile.mk:1.5.18.1
+--- udk/cppuhelper/qa/propertysetmixin/makefile.mk:1.5	Tue Nov  6 07:38:25 2007
++++ udk/cppuhelper/qa/propertysetmixin/makefile.mk	Mon Mar  3 01:51:55 2008
+@@ -62,8 +62,8 @@
+ SHL1IMPLIB = i$(SHL1TARGET)
+ DEF1NAME = $(SHL1TARGET)
+ 
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = test.LINUXIgcc3.map
++.IF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = test.gcc3.map
+ .ELSE
+ SHL1VERSIONMAP = test.map
+ .ENDIF
+Index: udk/cppuhelper/qa/propertysetmixin/test.gcc3.map
+diff -u /dev/null udk/cppuhelper/qa/propertysetmixin/test.gcc3.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:32:46 2008
++++ udk/cppuhelper/qa/propertysetmixin/test.gcc3.map	Mon Mar  3 01:51:55 2008
+@@ -0,0 +1,44 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3_0_0 {
++    global:
++        registerAllTestFunction;
++
++        _ZN4_STL7num_put*; # STLport
++
++    local:
++        *;
++};
+Index: porting/sal/qa/rtl/textenc/gcc3_export.map
+diff -u /dev/null porting/sal/qa/rtl/textenc/gcc3_export.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:32:58 2008
++++ porting/sal/qa/rtl/textenc/gcc3_export.map	Mon Mar  3 02:49:08 2008
+@@ -0,0 +1,44 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3_0_0 {
++    global:
++        registerAllTestFunction;
++
++        _ZN4_STL7num_put*; # STLport
++
++    local:
++        *;
++};
+Index: porting/sal/qa/rtl/textenc/linuxigcc3_export.map
+diff -u porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3 porting/sal/qa/rtl/textenc/linuxigcc3_export.map:removed
+--- porting/sal/qa/rtl/textenc/linuxigcc3_export.map:1.3	Thu Sep  8 08:52:16 2005
++++ porting/sal/qa/rtl/textenc/linuxigcc3_export.map	Mon Mar 10 06:32:58 2008
+@@ -1,44 +0,0 @@
+-#*************************************************************************
+-#
+-#   OpenOffice.org - a multi-platform office productivity suite
+-#
+-#   $RCSfile$
+-#
+-#   $Revision$
+-#
+-#   last change: $Author$ $Date$
+-#
+-#   The Contents of this file are made available subject to
+-#   the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-#     GNU Lesser General Public License Version 2.1
+-#     =============================================
+-#     Copyright 2005 by Sun Microsystems, Inc.
+-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-#     This library is free software; you can redistribute it and/or
+-#     modify it under the terms of the GNU Lesser General Public
+-#     License version 2.1, as published by the Free Software Foundation.
+-#
+-#     This library 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 for more details.
+-#
+-#     You should have received a copy of the GNU Lesser General Public
+-#     License along with this library; if not, write to the Free Software
+-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-#     MA  02111-1307  USA
+-#
+-#*************************************************************************
+-
+-UDK_3_0_0 {
+-    global:
+-        registerAllTestFunction;
+-
+-        _ZN4_STL7num_put*; # STLport
+-
+-    local:
+-        *;
+-};
+Index: porting/sal/qa/rtl/textenc/makefile.mk
+diff -u porting/sal/qa/rtl/textenc/makefile.mk:1.6 porting/sal/qa/rtl/textenc/makefile.mk:1.6.54.2
+--- porting/sal/qa/rtl/textenc/makefile.mk:1.6	Tue Nov 20 11:46:49 2007
++++ porting/sal/qa/rtl/textenc/makefile.mk	Thu Mar  6 01:54:37 2008
+@@ -57,8 +57,8 @@
+ 
+ SHL1IMPLIB= i$(SHL1TARGET)
+ DEF1NAME    =$(SHL1TARGET)
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = linuxigcc3_export.map
++.IF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = gcc3_export.map
+ .ELSE
+ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+ .ENDIF
+@@ -75,8 +75,8 @@
+ 
+ SHL2IMPLIB= i$(SHL2TARGET)
+ DEF2NAME    =$(SHL2TARGET)
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL2VERSIONMAP = linuxigcc3_export.map
++.IF "$(COMNAME)" == "gcc3"
++SHL2VERSIONMAP = gcc3_export.map
+ .ELSE
+ SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
+ .ENDIF
+Index: tools/testshl2/inc/cppunit/portability/config-auto.h
+diff -u tools/testshl2/inc/cppunit/portability/config-auto.h:1.1 tools/testshl2/inc/cppunit/portability/config-auto.h:1.1.170.1
+--- tools/testshl2/inc/cppunit/portability/config-auto.h:1.1	Thu Jan  9 03:05:54 2003
++++ tools/testshl2/inc/cppunit/portability/config-auto.h	Mon Mar  3 01:23:02 2008
+@@ -10,9 +10,9 @@
+ #define CPPUNIT_FUNC_STRING_COMPARE_STRING_FIRST  1 
+ #endif
+ 
+-/* define if the library defines strstream */
+-#ifndef CPPUNIT_HAVE_CLASS_STRSTREAM 
+-#define CPPUNIT_HAVE_CLASS_STRSTREAM  1 
++/* define if the library defines sstream */
++#ifndef CPPUNIT_HAVE_SSTREAM
++#define CPPUNIT_HAVE_SSTREAM 1 
+ #endif
+ 
+ /* Define if you have the <cmath> header file. */
+Index: installation/scp2/source/calc/file_calc.scp
+diff -u installation/scp2/source/calc/file_calc.scp:1.38 installation/scp2/source/calc/file_calc.scp:1.38.42.1
+--- installation/scp2/source/calc/file_calc.scp:1.38	Tue Feb  5 07:51:55 2008
++++ installation/scp2/source/calc/file_calc.scp	Mon Mar 10 05:19:09 2008
+@@ -37,10 +37,12 @@
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Solver, solver)
+ 
++#ifndef SYSTEM_LPSOLVE
+ File gid_File_Lib_Lpsolve
+     Name = SPECIAL_NAME(lpsolve55);
+     PACKED_LIB_FILE_BODY_PATCH;
+ End
++#endif
+ 
+ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Analysis, analysis)
+ 
+Index: installation/scp2/source/calc/makefile.mk
+diff -u installation/scp2/source/calc/makefile.mk:1.6 installation/scp2/source/calc/makefile.mk:1.6.1008.1
+--- installation/scp2/source/calc/makefile.mk:1.6	Thu Sep  8 18:21:34 2005
++++ installation/scp2/source/calc/makefile.mk	Mon Mar 10 05:19:09 2008
+@@ -49,6 +49,10 @@
+ SCPDEFS+=-DWITHOUT_BINFILTER
+ .ENDIF
+ 
++.IF "$(SYSTEM_LPSOLVE)" == "YES"
++SCPDEFS+=-DSYSTEM_LPSOLVE
++.ENDIF
++
+ SCP_PRODUCT_TYPE=osl
+ PARFILES= \
+         module_calc.par              \
+Index: util/xmlhelp/source/com/sun/star/help/makefile.mk
+diff -u util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32 util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32.2.1
+--- util/xmlhelp/source/com/sun/star/help/makefile.mk:1.32	Mon Feb 25 23:46:38 2008
++++ util/xmlhelp/source/com/sun/star/help/makefile.mk	Wed Mar  5 08:33:38 2008
+@@ -55,6 +55,10 @@
+ CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES)
+ .ENDIF
+ 
++.IF "$(SYSTEM_EXPAT)" == "YES"
++CFLAGS+=-DSYSTEM_EXPAT
++.ENDIF
++
+ OBJFILES=\
+         $(OBJ)$/HelpLinker.obj \
+         $(OBJ)$/HelpCompiler.obj
+Index: tools/config_office/configure.in
+diff -u tools/config_office/configure.in:1.249 tools/config_office/configure.in:1.249.12.3
+--- tools/config_office/configure.in:1.249	Tue Feb 19 04:37:37 2008
++++ tools/config_office/configure.in	Mon Mar 10 05:21:09 2008
+@@ -278,9 +278,15 @@
+ ],,)
+ AC_ARG_WITH(system-libs,
+ [  --with-system-libs      Use libs already on system -- enables all
+-                          --with-system-* flags except mozilla, python and
++                          --with-system-* flags except mozilla and
+                           odbc/sane/xrender-header(s)
+ ],,)
++AC_ARG_WITH(system-headers,
++[  --with-system-headers   Use headers already on system -- enables all
++                          --with-system-* flags for external packages
++                          whose headers are the only entities used i.e.
++                          boost/vigra/odbc/sane/xrender-header(s)
++],,)
+ AC_ARG_WITH(system-jars,
+ [  --without-system-jars   When building with --with-system-libs, also the
+                           needed jars are expected on the system. Use this to
+@@ -461,12 +467,16 @@
+ AC_ARG_WITH(system-altlinuxhyph,
+ [  --with-system-altlinuxhyph    Use ALTLinuxhyph already on system
+ ],,)
++AC_ARG_WITH(system-lpsolve,
++[  --with-system-lpsolve         Use lpsolve already on system
++],,)
+ AC_ARG_WITH(system-mozilla,
+ [  --with-system-mozilla   Use mozilla already on system. Note that some
+                           components cannot be built against a contemporary
+                           mozilla. The flavour used can be specified by
+                           --with-system-mozilla=<flavour>. Supported are:
+-                          xulrunner (default), firefox, seamonkey, mozilla
++                          libxul (default), xulrunner, firefox, seamonkey,
++                          mozilla
+ ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
+ AC_ARG_WITH(stlport,
+ [  --with-stlport         The location that STLport is installed in. The STL
+@@ -3151,10 +3161,12 @@
+ dnl ===================================================================
+ dnl Check for prelinked libgcc_s.so.1
+ dnl ===================================================================
+-if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
+-  with_system_stdlibs=yes
+-  AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
+-  echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++if test -z "$with_system_stdlibs" -a -z "$with_system_libs"; then
++  if test -n "$checkforprelink" -a -f /etc/rpm/macros.prelink; then
++    with_system_stdlibs=yes
++    AC_MSG_WARN([prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override])
++    echo "prelinked libgcc_s.so.1, enabling --with-system-stdlibs, use --without-system-stdlibs to override" >> warn
++  fi
+ fi
+ 
+ dnl ===================================================================
+@@ -3361,7 +3373,8 @@
+    with_system_python=yes
+ fi
+ AC_MSG_CHECKING([which python to use])
+-if test -n "$with_system_python" && test "$with_system_python" != "no"; then
++if test -n "$with_system_python" -o -n "$with_system_libs" && \
++	test "$with_system_python" != "no"; then
+    SYSTEM_PYTHON=YES
+    AC_MSG_RESULT([external])
+    AM_PATH_PYTHON([2.2])
+@@ -3669,7 +3682,8 @@
+ dnl Check for system boost
+ dnl ===================================================================
+ AC_MSG_CHECKING([which boost to use])
+-if test -n "$with_system_boost" && test "$with_system_boost" != "no"; then
++if test -n "$with_system_boost" -o -n "$with_system_headers" && \
++	test "$with_system_boost" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_BOOST=YES
+    AC_LANG_PUSH([C++])
+@@ -3689,7 +3703,8 @@
+ dnl Check for system vigra
+ dnl ===================================================================
+ AC_MSG_CHECKING([which vigra to use])
+-if test -n "$with_system_vigra" && test "$with_system_vigra" != "no"; then
++if test -n "$with_system_vigra" -o -n "$with_system_headers" && \
++	test "$with_system_vigra" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_VIGRA=YES
+    AC_LANG_PUSH([C++])
+@@ -3707,7 +3722,8 @@
+ dnl Check for system odbc
+ dnl ===================================================================
+ AC_MSG_CHECKING([which odbc headers to use])
+-if test -n "$with_system_odbc_headers" && test "$with_system_odbc_headers" != "no"; then
++if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \
++	test "$with_system_odbc_headers" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_ODBC_HEADERS=YES
+ 
+@@ -3794,7 +3810,9 @@
+     AC_MSG_RESULT([external])
+     SYSTEM_MOZILLA=YES
+     AC_MSG_CHECKING([which Mozilla flavour to use])
+-    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
++    if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
++      MOZ_FLAVOUR=libxul
++    elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then
+       MOZ_FLAVOUR=xulrunner
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "seamonkey"; then
+       MOZ_FLAVOUR=seamonkey
+@@ -3803,12 +3821,18 @@
+     elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "mozilla"; then
+       MOZ_FLAVOUR=mozilla
+     else
+-      MOZ_FLAVOUR=xulrunner
++      MOZ_FLAVOUR=libxul
+     fi
+     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
+     AC_MSG_RESULT($tmp)
+ 
+-    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
++    if test -z "$STANDALONENSS"; then
++        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    else
++        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
++        AC_SUBST(NSS_LIB)
++    fi
+ 
+     if $PKG_CONFIG --exists nspr ; then
+       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+@@ -3818,12 +3842,14 @@
+       PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
+     fi
+ 
+-    PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
+-    if test -z "$STANDALONENSS"; then
+-        PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
++    if $PKG_CONFIG --exists libxul ; then
++      PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
+     else
+-        NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+-        AC_SUBST(NSS_LIB)
++      PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
++      MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
++      MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+     fi
+ 
+     save_CPPFLAGS="$CPPFLAGS"
+@@ -3839,8 +3865,6 @@
+     CPPFLAGS="$save_CPPFLAGS"
+     LIBS="$save_LIBS"
+ 
+-    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+-    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+     MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
+     if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
+       AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+@@ -3853,6 +3877,13 @@
+ Please recompile $tmp with --enable-ldap or use --with-openldap.])
+       fi
+     fi
++
++    #e.g. http://fedoraproject.org/wiki/Releases/FeatureXULRunnerAPIChanges
++    #the plugin pkg-config etc. reverts to "mozilla-plugin" with libxul
++    if test "$MOZ_FLAVOUR" == "libxul"; then
++        MOZ_FLAVOUR="mozilla"
++    fi
++
+ elif test "$enable_mozilla" = "no"; then
+     AC_MSG_RESULT([none])
+     WITH_MOZILLA=NO
+@@ -3989,7 +4020,8 @@
+ dnl Check for system sane
+ dnl ===================================================================
+ AC_MSG_CHECKING([which sane header to use])
+-if test -n "$with_system_sane_header" && test "$with_system_sane_header" != "no"; then
++if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
++	test "$with_system_sane_header" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_SANE_HEADER=YES
+    AC_CHECK_HEADER(sane/sane.h, [],
+@@ -4186,7 +4218,8 @@
+    XRENDER_LINK=NO
+ fi
+ AC_MSG_CHECKING([which Xrender headers to use])
+-if test -n "$with_system_xrender_headers" && test "$with_system_xrender_headers" != "no"; then
++if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \
++	test "$with_system_xrender_headers" != "no"; then
+    AC_MSG_RESULT([external])
+    SYSTEM_XRENDER_HEADERS=YES
+    AC_CHECK_HEADER(X11/extensions/Xrender.h, [],
+@@ -4421,7 +4454,8 @@
+ dnl Check for system hunspell
+ dnl ===================================================================
+ AC_MSG_CHECKING([which libhunspell to use])
+-if test -n "$with_system_hunspell" && test "$with_system_hunspell" != "no"; then
++if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \
++	test "$with_system_hunspell" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_HUNSPELL=YES
+     AC_LANG_PUSH([C++])
+@@ -4449,7 +4483,8 @@
+ dnl Checking for altlinuxhyph
+ dnl ===================================================================
+ AC_MSG_CHECKING([which altlinuxhyph to use])
+-if test -n "$with_system_altlinuxhyph" && test "$with_system_altlinuxyph" != "no"; then
++if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \
++	test "$with_system_altlinuxhyph" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_HYPH=YES
+     AC_CHECK_HEADER(hyphen.h, [],
+@@ -4491,6 +4526,25 @@
+ fi
+ AC_SUBST(SYSTEM_MYTHES)
+ 
++dnl ===================================================================
++dnl Checking for lpsolve
++dnl ===================================================================
++AC_MSG_CHECKING([which lpsolve to use])
++if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \
++	test "$with_system_lpsolve" != "no"; then
++    AC_MSG_RESULT([external])
++    SYSTEM_LPSOLVE=YES
++    AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
++       [ AC_MSG_ERROR(lpsolve headers not found.)], [])
++    AC_CHECK_LIB(lpsolve55, make_lp, ,
++        [ AC_MSG_ERROR(lpsolve library not found or too old.)], [])
++else
++    AC_MSG_RESULT([internal])
++    SYSTEM_LPSOLVE=NO
++    BUILD_TYPE="$BUILD_TYPE LPSOLVE"
++fi
++AC_SUBST(SYSTEM_LPSOLVE)
++
+ dnl ***************************************
+ dnl testing libc version for Linux...
+ dnl ***************************************
+Index: tools/config_office/set_soenv.in
+diff -u tools/config_office/set_soenv.in:1.174 tools/config_office/set_soenv.in:1.174.6.1
+--- tools/config_office/set_soenv.in:1.174	Wed Feb 27 02:03:23 2008
++++ tools/config_office/set_soenv.in	Mon Mar 10 05:21:10 2008
+@@ -2025,6 +2025,7 @@
+ ToFile( "SYSTEM_HUNSPELL",   "@SYSTEM_HUNSPELL@",  "e" );
+ ToFile( "HUNSPELL_CFLAGS",   "@HUNSPELL_CFLAGS@",  "e" );
+ ToFile( "HUNSPELL_LIBS",     "@HUNSPELL_LIBS@",    "e" );
++ToFile( "SYSTEM_LPSOLVE",    "@SYSTEM_LPSOLVE@",   "e" );
+ ToFile( "SYSTEM_HYPH",       "@SYSTEM_HYPH@",      "e" );
+ ToFile( "HYPHEN_LIB",        "@HYPHEN_LIB@",       "e" );
+ ToFile( "SYSTEM_MYTHES",     "@SYSTEM_MYTHES@",    "e" );
+Index: udk/jvmaccess/util/gcc3.map
+diff -u /dev/null udk/jvmaccess/util/gcc3.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:33:43 2008
++++ udk/jvmaccess/util/gcc3.map	Mon Mar  3 01:38:57 2008
+@@ -0,0 +1,96 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3.1 {
++    global:
++        # jvmaccess/virtualmachine.hxx:
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
++        # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
++        # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
++        _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
++        _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
++        _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
++        _ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
++        _ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
++
++    local:
++        *;
++};
++
++UDK_3.2 {
++    global:
++        # initially forgotten jvmaccess/virtualmachine.hxx:
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
++        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
++        _ZN9jvmaccess14VirtualMachineC2EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
++
++	# We prefix the next two symbols with a wildcard sign because they will only be generated by gcj. The Mac OS X linker doesn't support
++	# "Treat not existing symbols as warning" under certain circumstances and thus ends with an error when trying to find these symbols
++	# (see man ld on Mac OS X). For further details see also #i69351#. By using the wildcard the symbols will be filtered out before.
++	# We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
++        _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
++        _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
++} UDK_3.1;
++
++UDK_3.3 {
++    global:
++        # jvmaccess/unovirtualmachine.hxx:
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD0Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
++        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
++        # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
++        # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
++        _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
++        _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
++        _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
++        _ZNK9jvmaccess17UnoVirtualMachine14getClassLoaderEv; # jvmaccess::UnoVirtualMachine::getClassLoader() const
++} UDK_3.2;
++
++UDK_3.4 { # OOo 2.3
++    global:
++        # jvmaccess/classpath.hxx:
++        _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
++        _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
++} UDK_3.3;
+Index: udk/jvmaccess/util/gcc3_linux_intel.map
+diff -u udk/jvmaccess/util/gcc3_linux_intel.map:1.14 udk/jvmaccess/util/gcc3_linux_intel.map:removed
+--- udk/jvmaccess/util/gcc3_linux_intel.map:1.14	Tue Jul  3 05:42:50 2007
++++ udk/jvmaccess/util/gcc3_linux_intel.map	Mon Mar 10 06:33:43 2008
+@@ -1,96 +0,0 @@
+-#*************************************************************************
+-#
+-#   OpenOffice.org - a multi-platform office productivity suite
+-#
+-#   $RCSfile$
+-#
+-#   $Revision$
+-#
+-#   last change: $Author$ $Date$
+-#
+-#   The Contents of this file are made available subject to
+-#   the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-#     GNU Lesser General Public License Version 2.1
+-#     =============================================
+-#     Copyright 2005 by Sun Microsystems, Inc.
+-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-#     This library is free software; you can redistribute it and/or
+-#     modify it under the terms of the GNU Lesser General Public
+-#     License version 2.1, as published by the Free Software Foundation.
+-#
+-#     This library 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 for more details.
+-#
+-#     You should have received a copy of the GNU Lesser General Public
+-#     License along with this library; if not, write to the Free Software
+-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-#     MA  02111-1307  USA
+-#
+-#*************************************************************************
+-
+-UDK_3.1 {
+-    global:
+-        # jvmaccess/virtualmachine.hxx:
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD0Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionaSERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::operator =(CreationException const &)
+-        # _ZTIN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo for jvmaccess::VirtualMachine::AttachGuard::CreationException
+-        # _ZTSN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionE; # typeinfo name for jvmaccess::VirtualMachine::AttachGuard::CreationException
+-        _ZN9jvmaccess14VirtualMachine11AttachGuardC1ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
+-        _ZN9jvmaccess14VirtualMachine11AttachGuardC2ERKN3rtl9ReferenceIS0_EE; # jvmaccess::VirtualMachine::AttachGuard::AttachGuard(rtl::Reference< VirtualMachine > const &)
+-        _ZN9jvmaccess14VirtualMachine11AttachGuardD1Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
+-        _ZN9jvmaccess14VirtualMachine11AttachGuardD2Ev; # jvmaccess::VirtualMachine::AttachGuard::~AttachGuard()
+-        _ZN9jvmaccess14VirtualMachineC1EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+-
+-    local:
+-        *;
+-};
+-
+-UDK_3.2 {
+-    global:
+-        # initially forgotten jvmaccess/virtualmachine.hxx:
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC2ERKS2_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException(CreationException const &)
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
+-        _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionD2Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::~CreationException()
+-        _ZN9jvmaccess14VirtualMachineC2EP7JavaVM_ibP7JNIEnv_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+-
+-	# We prefix the next two symbols with a wildcard sign because they will only be generated by gcj. The Mac OS X linker doesn't support
+-	# "Treat not existing symbols as warning" under certain circumstances and thus ends with an error when trying to find these symbols
+-	# (see man ld on Mac OS X). For further details see also #i69351#. By using the wildcard the symbols will be filtered out before.
+-	# We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
+-        _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+-        _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
+-} UDK_3.1;
+-
+-UDK_3.3 {
+-    global:
+-        # jvmaccess/unovirtualmachine.hxx:
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2Ev; # jvmaccess::UnoVirtualMachine::CreationException::CreationException()
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC1ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionC2ERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::CreationException(CreationException const &)
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD0Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD1Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionD2Ev; # jvmaccess::UnoVirtualMachine::CreationException::~CreationException()
+-        _ZN9jvmaccess17UnoVirtualMachine17CreationExceptionaSERKS1_; # jvmaccess::UnoVirtualMachine::CreationException::operator =(CreationException const &)
+-        # _ZTIN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo for jvmaccess::UnoVirtualMachine::CreationException
+-        # _ZTSN9jvmaccess17UnoVirtualMachine17CreationExceptionE; # typeinfo name for jvmaccess::UnoVirtualMachine::CreationException
+-        _ZN9jvmaccess17UnoVirtualMachineC1ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
+-        _ZN9jvmaccess17UnoVirtualMachineC2ERKN3rtl9ReferenceINS_14VirtualMachineEEEPv; # jvmaccess::UnoVirtualMachine::UnoVirtualMachine(rtl::Reference< jvmaccess::VirtualMachine > const &, void *)
+-        _ZNK9jvmaccess17UnoVirtualMachine17getVirtualMachineEv; # jvmaccess::UnoVirtualMachine::getVirtualMachine() const
+-        _ZNK9jvmaccess17UnoVirtualMachine14getClassLoaderEv; # jvmaccess::UnoVirtualMachine::getClassLoader() const
+-} UDK_3.2;
+-
+-UDK_3.4 { # OOo 2.3
+-    global:
+-        # jvmaccess/classpath.hxx:
+-        _ZN9jvmaccess9ClassPath11doLoadClassERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringESE_; # jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &, rtl::OUString const &)
+-        _ZN9jvmaccess9ClassPath17doTranslateToUrlsERKN3com3sun4star3uno9ReferenceINS4_17XComponentContextEEEPvRKN3rtl8OUStringE; # jvmaccess::ClassPath::doTranslateToUrls(com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &, void *, rtl::OUString const &)
+-} UDK_3.3;
+Index: udk/jvmaccess/util/makefile.mk
+diff -u udk/jvmaccess/util/makefile.mk:1.12 udk/jvmaccess/util/makefile.mk:1.12.6.1
+--- udk/jvmaccess/util/makefile.mk:1.12	Fri Nov  2 05:41:23 2007
++++ udk/jvmaccess/util/makefile.mk	Mon Mar  3 01:38:57 2008
+@@ -63,18 +63,10 @@
+ SHL1VERSIONMAP = msvc_win32_intel.map
+ .ELIF "$(COMNAME)" == "sunpro5"
+ SHL1VERSIONMAP = cc5_solaris_sparc.map
+-.ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = gcc3_linux_intel.map
+-.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3"
+-SHL1VERSIONMAP = gcc3_linux_intel.map
+-.ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXSgcc3"
+-SHL1VERSIONMAP = gcc3_linux_intel.map
+-.ELIF "$(OS)$(CPU)$(COMNAME)" == "OS2Igcc3"
+-SHL1VERSIONMAP = gcc3_linux_intel.map
+-.ELIF "$(OS)$(CPU)$(COMNAME)"=="MACOSXIgcc3"
+-SHL1VERSIONMAP = gcc3_linux_intel.map
+ .ELIF "$(GUI)$(COM)" == "WNTGCC"
+ SHL1VERSIONMAP = mingw.map
++.ELIF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = gcc3.map
+ .ENDIF
+ 
+ DEF1NAME = $(SHL1TARGET)
+Index: external/stlport/systemstl/hash_map
+diff -u external/stlport/systemstl/hash_map:1.4 external/stlport/systemstl/hash_map:1.4.114.1
+--- external/stlport/systemstl/hash_map:1.4	Thu Sep  8 00:48:37 2005
++++ external/stlport/systemstl/hash_map	Mon Mar  3 01:22:45 2008
+@@ -36,7 +36,9 @@
+ #ifndef SYSTEM_STL_HASHMAP
+ #define SYSTEM_STL_HASHMAP
+ 
++#define _BACKWARD_BACKWARD_WARNING_H 1
+ #include <ext/hash_map>
++#undef _BACKWARD_BACKWARD_WARNING_H
+ 
+ #ifdef GCC
+ namespace __gnu_cxx
+Index: external/stlport/systemstl/hash_set
+diff -u external/stlport/systemstl/hash_set:1.3 external/stlport/systemstl/hash_set:1.3.114.1
+--- external/stlport/systemstl/hash_set:1.3	Thu Sep  8 00:48:53 2005
++++ external/stlport/systemstl/hash_set	Mon Mar  3 01:22:45 2008
+@@ -36,7 +36,9 @@
+ #ifndef SYSTEM_STL_HASHSET
+ #define SYSTEM_STL_HASHSET
+ 
++#define _BACKWARD_BACKWARD_WARNING_H 1
+ #include <ext/hash_set>
++#undef _BACKWARD_BACKWARD_WARNING_H 
+ 
+ #ifdef GCC
+ namespace std
+Index: tools/solenv/inc/libs.mk
+diff -u tools/solenv/inc/libs.mk:1.126 tools/solenv/inc/libs.mk:1.126.10.1
+--- tools/solenv/inc/libs.mk:1.126	Mon Feb 25 08:42:00 2008
++++ tools/solenv/inc/libs.mk	Wed Mar  5 09:24:45 2008
+@@ -327,7 +327,7 @@
+ SABLOT3RDLIB=-lsablot
+ APP3RDLIB=-lapp
+ SAMPLE3RDLIB=-lsample
+-HNJLIB=-lhnj
++HNJLIB*=-lhnj
+ MYSPELLLIB=-lmyspell
+ COSVLIB=-lcosv
+ UDMLIB=-ludm
+@@ -483,7 +483,7 @@
+ SABLOT3RDLIB= $(LIBPRE) sablot.lib
+ APP3RDLIB= $(LIBPRE) app.lib
+ SAMPLE3RDLIB= $(LIBPRE) sample.lib
+-HNJLIB= libhnj.lib
++HNJLIB*=libhnj.lib
+ MYSPELLLIB= $(LIBPRE) myspell.lib
+ COSVLIB= $(LIBPRE) cosv.lib
+ UDMLIB= $(LIBPRE) udm.lib
+Index: udk/stoc/test/registry_tdprovider/makefile.mk
+diff -u udk/stoc/test/registry_tdprovider/makefile.mk:1.4 udk/stoc/test/registry_tdprovider/makefile.mk:1.4.88.1
+--- udk/stoc/test/registry_tdprovider/makefile.mk:1.4	Thu Sep  8 01:30:08 2005
++++ udk/stoc/test/registry_tdprovider/makefile.mk	Mon Mar  3 02:52:36 2008
+@@ -52,8 +52,8 @@
+ SHL1IMPLIB = itestregistrytdprovider
+ DEF1NAME = $(SHL1TARGET)
+ 
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = testregistrytdprovider.LINUXIgcc3.map
++.IF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = testregistrytdprovider.gcc3.map
+ .ELSE
+ SHL1VERSIONMAP = testregistrytdprovider.map
+ .ENDIF
+Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map
+diff -u udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3 udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:removed
+--- udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map:1.3	Thu Sep  8 01:30:31 2005
++++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
+@@ -1,46 +0,0 @@
+-#*************************************************************************
+-#
+-#   OpenOffice.org - a multi-platform office productivity suite
+-#
+-#   $RCSfile$
+-#
+-#   $Revision$
+-#
+-#   last change: $Author$ $Date$
+-#
+-#   The Contents of this file are made available subject to
+-#   the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-#     GNU Lesser General Public License Version 2.1
+-#     =============================================
+-#     Copyright 2005 by Sun Microsystems, Inc.
+-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-#     This library is free software; you can redistribute it and/or
+-#     modify it under the terms of the GNU Lesser General Public
+-#     License version 2.1, as published by the Free Software Foundation.
+-#
+-#     This library 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 for more details.
+-#
+-#     You should have received a copy of the GNU Lesser General Public
+-#     License along with this library; if not, write to the Free Software
+-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-#     MA  02111-1307  USA
+-#
+-#*************************************************************************
+-
+-UDK_3_0_0 {
+-    global:
+-        component_getFactory;
+-        component_getImplementationEnvironment;
+-        component_writeInfo;
+-
+-        _ZN4_STL7num_put*; # STLport
+-
+-    local:
+-        *;
+-};
+Index: udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
+diff -u /dev/null udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:34:10 2008
++++ udk/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map	Mon Mar  3 02:52:36 2008
+@@ -0,0 +1,46 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3_0_0 {
++    global:
++        component_getFactory;
++        component_getImplementationEnvironment;
++        component_writeInfo;
++
++        _ZN4_STL7num_put*; # STLport
++
++    local:
++        *;
++};
+Index: udk/stoc/test/tdmanager/makefile.mk
+diff -u udk/stoc/test/tdmanager/makefile.mk:1.4 udk/stoc/test/tdmanager/makefile.mk:1.4.88.1
+--- udk/stoc/test/tdmanager/makefile.mk:1.4	Thu Sep  8 01:32:31 2005
++++ udk/stoc/test/tdmanager/makefile.mk	Mon Mar  3 02:51:41 2008
+@@ -52,8 +52,8 @@
+ SHL1IMPLIB = itesttdmanager
+ DEF1NAME = $(SHL1TARGET)
+ 
+-.IF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3"
+-SHL1VERSIONMAP = testtdmanager.LINUXIgcc3.map
++.IF "$(COMNAME)" == "gcc3"
++SHL1VERSIONMAP = testtdmanager.gcc3.map
+ .ELSE
+ SHL1VERSIONMAP = testtdmanager.map
+ .ENDIF
+Index: udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map
+diff -u udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3 udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:removed
+--- udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map:1.3	Thu Sep  8 01:32:51 2005
++++ udk/stoc/test/tdmanager/testtdmanager.LINUXIgcc3.map	Mon Mar 10 06:34:10 2008
+@@ -1,46 +0,0 @@
+-#*************************************************************************
+-#
+-#   OpenOffice.org - a multi-platform office productivity suite
+-#
+-#   $RCSfile$
+-#
+-#   $Revision$
+-#
+-#   last change: $Author$ $Date$
+-#
+-#   The Contents of this file are made available subject to
+-#   the terms of GNU Lesser General Public License Version 2.1.
+-#
+-#
+-#     GNU Lesser General Public License Version 2.1
+-#     =============================================
+-#     Copyright 2005 by Sun Microsystems, Inc.
+-#     901 San Antonio Road, Palo Alto, CA 94303, USA
+-#
+-#     This library is free software; you can redistribute it and/or
+-#     modify it under the terms of the GNU Lesser General Public
+-#     License version 2.1, as published by the Free Software Foundation.
+-#
+-#     This library 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 for more details.
+-#
+-#     You should have received a copy of the GNU Lesser General Public
+-#     License along with this library; if not, write to the Free Software
+-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-#     MA  02111-1307  USA
+-#
+-#*************************************************************************
+-
+-UDK_3_0_0 {
+-    global:
+-        component_getFactory;
+-        component_getImplementationEnvironment;
+-        component_writeInfo;
+-
+-        _ZN4_STL7num_put*; # STLport
+-
+-    local:
+-        *;
+-};
+Index: udk/stoc/test/tdmanager/testtdmanager.gcc3.map
+diff -u /dev/null udk/stoc/test/tdmanager/testtdmanager.gcc3.map:1.1.2.1
+--- /dev/null	Mon Mar 10 06:34:10 2008
++++ udk/stoc/test/tdmanager/testtdmanager.gcc3.map	Mon Mar  3 02:51:41 2008
+@@ -0,0 +1,46 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library 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 for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++UDK_3_0_0 {
++    global:
++        component_getFactory;
++        component_getImplementationEnvironment;
++        component_writeInfo;
++
++        _ZN4_STL7num_put*; # STLport
++
++    local:
++        *;
++};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- .cvsignore	16 Mar 2008 20:46:44 -0000	1.153
+++ .cvsignore	27 Mar 2008 15:13:50 -0000	1.154
@@ -4,4 +4,4 @@
 Tigert-templates.tar.gz
 unowinreg.dll
 bengali.sdf
-OOH680_m12.tar.bz2
+DEV300_m4.tar.bz2

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	12 Oct 2007 06:25:27 -0000	1.7
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	27 Mar 2008 15:13:50 -0000	1.8
@@ -1,6 +1,6 @@
 --- SRC680_m123/desktop/scripts/soffice.sh.orig	2005-08-15 20:17:35.000000000 +0100
 +++ SRC680_m123/desktop/scripts/soffice.sh	2005-08-15 20:19:36.000000000 +0100
-@@ -194,23 +194,22 @@ unset XENVIRONMENT
+@@ -92,23 +92,22 @@
  # uncomment line below to disable anti aliasing of fonts
  # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
  
@@ -28,16 +28,17 @@
          break;
          ;;
      *)
-@@ -218,9 +217,6 @@ for sd_arg in ${1+"$@"} ; do
-     esac
- done
+@@ -121,10 +120,6 @@
+   . /etc/adabasrc
+ fi
  
 -sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common"
--"${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args}
+-"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+-    ${sd_pagein_args}
 -
- # set path so that other apps can be started from soffice just by name
- if [ $PATH ]; then
-   PATH="$sd_prog":$PATH
+ # Set PATH so that crash_report is found:
+ PATH=$sd_prog${PATH+:$PATH}
+ export PATH
 Index: osl/unx/signal.c
 ===================================================================
 RCS file: /cvs/porting/sal/osl/unx/signal.c,v

openoffice.org-1.9.87.rh151357.setlangtolocale.patch:

Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch	28 Jan 2008 17:26:40 -0000	1.24
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch	27 Mar 2008 15:13:50 -0000	1.25
@@ -89,7 +89,7 @@
 -    // determine the filename of the license to show
 -    OUString  aLangString;
 -    ::com::sun::star::lang::Locale aLocale;
--    OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
+-    OString aMgrName = OString("dkt");
 -
 -    AllSettings aSettings(Application::GetSettings());
 -    aLocale = aSettings.GetUILocale();
@@ -791,16 +791,16 @@
 diff -u -r1.17 substitutepathvars.cxx
 --- openoffice.org.orig/framework/source/services/substitutepathvars.cxx	16 Sep 2006 14:12:15 -0000	1.17
 +++ openoffice.org/framework/source/services/substitutepathvars.cxx	28 Jun 2007 13:59:22 -0000
-@@ -129,7 +129,7 @@
+@@ -84,6 +84,8 @@
+ #include <unotools/bootstrap.hxx>
  #endif
  
- #include <comphelper/configurationhelper.hxx>
--
 +#include <unotools/localedatawrapper.hxx>
- //_________________________________________________________________________________________________________________
- //	Defines
- //_________________________________________________________________________________________________________________
-@@ -1264,7 +1264,10 @@
++
+ #ifndef _OSL_MUTEX_HXX_
+ #include <osl/mutex.hxx>
+ #endif
+@@ -1266,7 +1268,10 @@
  	Any aLocale = utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( utl::ConfigManager::LOCALE );
  	rtl::OUString aLocaleStr;
  	if ( aLocale >>= aLocaleStr )

openoffice.org-2.0.3.ooo80816.selinux.bridges.patch:

Index: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.ooo80816.selinux.bridges.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	4 Feb 2008 12:35:02 -0000	1.3
+++ openoffice.org-2.0.3.ooo80816.selinux.bridges.patch	27 Mar 2008 15:13:50 -0000	1.4
@@ -5,7 +5,7 @@
 diff -u -r1.5 vtablefactory.hxx
 --- openoffice.org.orig/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	2 May 2006 11:59:11 -0000	1.5
 +++ openoffice.org/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx	17 May 2006 10:57:45 -0000
-@@ -60,11 +60,21 @@
+@@ -66,11 +66,21 @@
              skipping an RTTI pointer, see mapBlockToVtable).  Also, the block
              contains any generated code snippets, after the vtable itself.
           */
@@ -28,7 +28,7 @@
      };
  
      /** The vtable structure corresponding to an interface type.
-@@ -110,8 +120,6 @@
+@@ -116,8 +126,6 @@
      VtableFactory(VtableFactory &); // not implemented
      void operator =(VtableFactory); // not implemented
  
@@ -37,16 +37,16 @@
      void createVtables(
          GuardedBlocks & blocks, BaseOffset const & baseOffset,
          typelib_InterfaceTypeDescription * type, bool includePrimary) const;
-@@ -162,7 +170,7 @@
+@@ -169,7 +177,7 @@
          @return  a pointer to the remaining code snippet area
       */
      static unsigned char * addLocalFunctions(
--        void ** slots, unsigned char * code,
-+        void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+-        Slot ** slots, unsigned char * code,
++        Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
          typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
          sal_Int32 functionCount, sal_Int32 vtableOffset);
  
-@@ -181,8 +189,6 @@
+@@ -188,8 +196,6 @@
  
      osl::Mutex m_mutex;
      Map m_map;
@@ -62,7 +62,7 @@
 diff -u -r1.10 cpp2uno.cxx
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	2 May 2006 12:01:33 -0000	1.10
 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx	17 May 2006 10:57:47 -0000
-@@ -361,7 +361,7 @@
+@@ -367,7 +367,7 @@
  int const codeSnippetSize = 16;
  
  unsigned char * codeSnippet(
@@ -71,7 +71,7 @@
      typelib_TypeClass returnTypeClass)
  {
      if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) {
-@@ -407,7 +407,7 @@
+@@ -413,7 +413,7 @@
      // jmp privateSnippetExecutor:
      *p++ = 0xE9;
      *reinterpret_cast< sal_Int32 * >(p)
@@ -80,33 +80,33 @@
      p += sizeof (sal_Int32);
      OSL_ASSERT(p - code <= codeSnippetSize);
      return code + codeSnippetSize;
-@@ -434,7 +434,7 @@
+@@ -445,7 +445,7 @@
  }
  
  unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    void ** slots, unsigned char * code,
-+    void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+-    Slot ** slots, unsigned char * code,
++    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
      typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
      sal_Int32 functionCount, sal_Int32 vtableOffset)
  {
-@@ -445,9 +445,9 @@
+@@ -458,9 +458,9 @@
          switch (member->eTypeClass) {
          case typelib_TypeClass_INTERFACE_ATTRIBUTE:
              // Getter:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
 -                code, functionOffset++, vtableOffset,
 +                code, writetoexecdiff, functionOffset++, vtableOffset,
                  reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >(
                      member)->pAttributeTypeRef->eTypeClass);
              // Setter:
-@@ -455,17 +455,17 @@
+@@ -468,17 +468,17 @@
                  typelib_InterfaceAttributeTypeDescription * >(
                      member)->bReadOnly)
              {
--                *slots++ = code;
-+                *slots++ = code + writetoexecdiff;
+-                (s++)->fn = code;
++                (s++)->fn = code + writetoexecdiff;
                  code = codeSnippet(
 -                    code, functionOffset++, vtableOffset,
 +                    code, writetoexecdiff, functionOffset++, vtableOffset,
@@ -115,8 +115,8 @@
              break;
  
          case typelib_TypeClass_INTERFACE_METHOD:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
 -                code, functionOffset++, vtableOffset,
 +                code, writetoexecdiff, functionOffset++, vtableOffset,
@@ -130,40 +130,47 @@
 diff -u -r1.8 cpp2uno.cxx
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	2 May 2006 12:02:15 -0000	1.8
 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx	17 May 2006 10:57:47 -0000
-@@ -676,7 +676,7 @@
+@@ -685,7 +685,7 @@
  }
  
  unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    void ** slots, unsigned char * code,
-+    void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+-    Slot ** slots, unsigned char * code,
++    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
      typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
      sal_Int32 functionCount, sal_Int32 vtableOffset)
  {
-@@ -692,7 +692,7 @@
+@@ -702,9 +702,9 @@
          switch (member->eTypeClass) {
          case typelib_TypeClass_INTERFACE_ATTRIBUTE:
              // Getter:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
+-                code, functionOffset++, vtableOffset,
++                code, functionOffset++, vtableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
-@@ -705,13 +705,13 @@
+                     reinterpret_cast<
+                     typelib_InterfaceAttributeTypeDescription * >(
+@@ -715,15 +715,15 @@
                  typelib_InterfaceAttributeTypeDescription * >(
                      member)->bReadOnly)
              {
--                *slots++ = code;
-+                *slots++ = code + writetoexecdiff;
-                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
+-                (s++)->fn = code;
+-                code = codeSnippet(code, functionOffset++, vtableOffset, true);
++                (s++)->fn = code + writetoexecdiff;
++                code = codeSnippet(code, functionOffset++, vtableOffset, true);
              }
              break;
  
          case typelib_TypeClass_INTERFACE_METHOD:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
+-                code, functionOffset++, vtableOffset,
++                code, functionOffset++, vtableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
+                     reinterpret_cast<
+                     typelib_InterfaceMethodTypeDescription * >(
 Index: source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx,v
@@ -171,41 +178,46 @@
 diff -u -r1.5 cpp2uno.cxx
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	2 May 2006 12:03:36 -0000	1.5
 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx	17 May 2006 10:57:48 -0000
-@@ -487,7 +487,7 @@
+@@ -494,7 +494,7 @@
  //==================================================================================================
  
  unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--	void ** slots, unsigned char * code,
-+	void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, 
+-	Slot ** slots, unsigned char * code,
++	Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
  	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
  	sal_Int32 functionCount, sal_Int32 nVtableOffset )
  {
-@@ -504,14 +504,14 @@
+@@ -513,15 +513,15 @@
  				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
  
  			// get method
--			*slots++ = code;
-+			*slots++ = code + writetoexecdiff;
- 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
+-			(s++)->fn = code;
+-			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++			(s++)->fn = code + writetoexecdiff;
++			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
  								x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
  
  			if ( ! pAttrTD->bReadOnly )
  			{
  				// set method
--				*slots++ = code;
-+				*slots++ = code + writetoexecdiff;
- 				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
+-				(s++)->fn = code;
+-				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
++				(s++)->fn = code + writetoexecdiff;
++				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
  			}
  		}
-@@ -520,7 +520,7 @@
+ 		else if ( typelib_TypeClass_INTERFACE_METHOD == pTD->eTypeClass )
+@@ -529,8 +529,8 @@
  			typelib_InterfaceMethodTypeDescription *pMethodTD =
  				reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
  			
--			*slots++ = code;
-+			*slots++ = code + writetoexecdiff;
- 			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
+-			(s++)->fn = code;
+-			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++			(s++)->fn = code + writetoexecdiff;
++			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
  								x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
  		}
+ 		else
 Index: source/cpp_uno/shared/cppinterfaceproxy.cxx
 ===================================================================
 RCS file: /cvs/udk/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx,v
@@ -248,7 +260,7 @@
  #elif defined SAL_W32
  #define WIN32_LEAN_AND_MEAN
  #ifdef _MSC_VER
-@@ -80,9 +84,12 @@
+@@ -80,9 +85,12 @@
  
  using bridges::cpp_uno::shared::VtableFactory;
  
@@ -263,7 +275,7 @@
      sal_Size pagesize;
  #if defined SAL_UNX
  #if defined FREEBSD || defined NETBSD
-@@ -101,45 +108,118 @@
+@@ -101,45 +109,118 @@
  #else
  #error Unsupported platform
  #endif
@@ -404,7 +416,7 @@
  }
  
  class VtableFactory::GuardedBlocks: public std::vector< Block > {
-@@ -160,11 +240,6 @@
+@@ -160,11 +241,6 @@
  };
  
  VtableFactory::GuardedBlocks::~GuardedBlocks() {
@@ -416,7 +428,7 @@
  }
  
  class VtableFactory::BaseOffset {
-@@ -199,28 +274,17 @@
+@@ -199,28 +275,17 @@
      return offset;
  }
  
@@ -446,7 +458,7 @@
  }
  
  VtableFactory::Vtables VtableFactory::getVtables(
-@@ -248,10 +312,6 @@
+@@ -248,10 +313,6 @@
      return i->second;
  }
  
@@ -457,7 +469,7 @@
  void VtableFactory::createVtables(
      GuardedBlocks & blocks, BaseOffset const & baseOffset,
      typelib_InterfaceTypeDescription * type, bool includePrimary) const
-@@ -259,17 +319,16 @@
+@@ -259,31 +320,30 @@
      if (includePrimary) {
          sal_Int32 slotCount
              = bridges::cpp_uno::shared::getPrimaryFunctions(type);
@@ -470,26 +482,25 @@
              throw std::bad_alloc();
          }
          try {
--            void ** slots = initializeBlock(block.start) + slotCount;
-+            void ** slots = initializeBlock(block.writep) + slotCount;
+-            Slot * slots = initializeBlock(block.start, slotCount);
++            Slot * slots = initializeBlock(block.writep, slotCount);
              unsigned char * codeBegin =
                  reinterpret_cast< unsigned char * >(slots);
              unsigned char * code = codeBegin;
-+	    sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep);
-             sal_Int32 vtableOffset = blocks.size() * sizeof (void **);
++            sal_PtrDiff writetoexecdiff = sal_IntPtr(block.execp) - sal_IntPtr(block.writep);
+             sal_Int32 vtableOffset = blocks.size() * sizeof (Slot *);
              for (typelib_InterfaceTypeDescription const * type2 = type;
                   type2 != 0; type2 = type2->pBaseTypeDescription)
-@@ -278,14 +337,14 @@
-                     = bridges::cpp_uno::shared::getLocalFunctions(type2);
-                 slots -= functionCount;
+             {
                  code = addLocalFunctions(
--                    slots, code, type2,
-+                    slots, code, writetoexecdiff, type2,
+-                    &slots, code, type2,
++                    &slots, code, writetoexecdiff, type2,
                      baseOffset.getFunctionOffset(type2->aBase.pTypeName),
-                     functionCount, vtableOffset);
+                     bridges::cpp_uno::shared::getLocalFunctions(type2),
+                     vtableOffset);
              }
              flushCode(codeBegin, code);
-+	    block.swapwriteandexec();
++            block.swapwriteandexec();
              blocks.push_back(block);
          } catch (...) {
 -            freeBlock(block);
@@ -503,73 +514,142 @@
 diff -u -r1.12 cpp2uno.cxx
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	22 Nov 2006 11:07:20 -0000	1.12
 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_sparc/cpp2uno.cxx	5 Jun 2007 12:38:03 -0000
-@@ -512,7 +512,7 @@
+@@ -518,7 +518,7 @@
  }
  
  unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    void ** slots, unsigned char * code,
-+    void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff, 
+-    Slot ** slots, unsigned char * code,
++    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
      typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
-     sal_Int32 /* functionCount */, sal_Int32 vTableOffset)
+     sal_Int32 functionCount, sal_Int32 vTableOffset)
  {
-@@ -523,7 +523,7 @@
+@@ -531,9 +531,9 @@
          switch (member->eTypeClass) {
          case typelib_TypeClass_INTERFACE_ATTRIBUTE:
              // Getter:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vTableOffset,
+-                code, functionOffset++, vTableOffset,
++                code, functionOffset++, vTableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
-@@ -535,13 +535,13 @@
+                     reinterpret_cast<
+ 		    typelib_InterfaceAttributeTypeDescription * >(
+@@ -543,15 +543,15 @@
                  typelib_InterfaceAttributeTypeDescription * >(
                      member)->bReadOnly)
              {
--                *slots++ = code;
-+                *slots++ = code + writetoexecdiff;
-                 code = codeSnippet(code, functionOffset++, vTableOffset, true);
+-                (s++)->fn = code;
+-                code = codeSnippet(code, functionOffset++, vTableOffset, true);
++                (s++)->fn = code + writetoexecdiff;
++                code = codeSnippet(code, functionOffset++, vTableOffset, true);
              }
              break;
  
          case typelib_TypeClass_INTERFACE_METHOD:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vTableOffset,
+-                code, functionOffset++, vTableOffset,
++                code, functionOffset++, vTableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
+                     reinterpret_cast<
+                     typelib_InterfaceMethodTypeDescription * >(
 --- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	2007-06-05 13:55:15.000000000 +0100
 +++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	2007-06-05 13:56:12.000000000 +0100
-@@ -666,7 +666,7 @@
+@@ -670,7 +670,7 @@
  }
  
  unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
--    void ** slots, unsigned char * code, 
-+    void ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+-    Slot ** slots, unsigned char * code, 
++    Slot ** slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
      typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
      sal_Int32 functionCount, sal_Int32 vtableOffset)
  {
-@@ -682,7 +682,7 @@
+@@ -688,9 +688,9 @@
          switch (member->eTypeClass) {
          case typelib_TypeClass_INTERFACE_ATTRIBUTE:
              // Getter:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
+-                code, functionOffset++, vtableOffset,
++                code, functionOffset++, vtableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
-@@ -695,13 +695,13 @@
+                     reinterpret_cast<
+                     typelib_InterfaceAttributeTypeDescription * >(
+@@ -701,15 +701,15 @@
                  typelib_InterfaceAttributeTypeDescription * >(
                      member)->bReadOnly)
              {
--                *slots++ = code;
-+                *slots++ = code + writetoexecdiff;
-                 code = codeSnippet(code, functionOffset++, vtableOffset, true);
+-                (s++)->fn = code;
+-                code = codeSnippet(code, functionOffset++, vtableOffset, true);
++                (s++)->fn = code + writetoexecdiff;
++                code = codeSnippet(code, functionOffset++, vtableOffset, true);
              }
              break;
  
          case typelib_TypeClass_INTERFACE_METHOD:
--            *slots++ = code;
-+            *slots++ = code + writetoexecdiff;
+-            (s++)->fn = code;
++            (s++)->fn = code + writetoexecdiff;
              code = codeSnippet(
-                 code, functionOffset++, vtableOffset,
+-                code, functionOffset++, vtableOffset,
++                code, functionOffset++, vtableOffset,
                  bridges::cpp_uno::shared::isSimpleType(
+                     reinterpret_cast<
+                     typelib_InterfaceMethodTypeDescription * >(
+--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	2008-03-07 09:23:13.000000000 +0000
++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx	2008-03-07 09:34:58.000000000 +0000
+@@ -580,7 +580,7 @@
+ {
+ const int codeSnippetSize = 40;
+ 
+-bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
++bridges::cpp_uno::shared::VtableFactory::Slot codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset, 
+                               bool bHasHiddenParam )
+ {
+ #ifdef CMC_DEBUG
+@@ -603,7 +603,7 @@
+     raw[2] = nOffsetAndIndex;
+     raw[3] = destination->gp_value;
+ 
+-    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code);
++    return *(bridges::cpp_uno::shared::VtableFactory::Slot*)(code+writetoexecdiff);
+ }
+ }
+ 
+@@ -633,7 +633,7 @@
+ }
+ 
+ unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
+-    Slot ** in_slots, unsigned char * code,
++    Slot ** in_slots, unsigned char * code, sal_PtrDiff writetoexecdiff,
+     typelib_InterfaceTypeDescription const * type, sal_Int32 functionOffset,
+     sal_Int32 functionCount, sal_Int32 vtableOffset)
+ {
+@@ -652,7 +652,7 @@
+         case typelib_TypeClass_INTERFACE_ATTRIBUTE:
+             // Getter:
+             *slots++ = codeSnippet(
+-                code, functionOffset++, vtableOffset,
++                code, writetoexecdiff, functionOffset++, vtableOffset,
+                 ia64::return_in_hidden_param(
+                     reinterpret_cast<
+                     typelib_InterfaceAttributeTypeDescription * >(
+@@ -665,14 +665,14 @@
+                 typelib_InterfaceAttributeTypeDescription * >(
+                     member)->bReadOnly)
+             {
+-                *slots++ = codeSnippet(code, functionOffset++, vtableOffset, false);
++                *slots++ = codeSnippet(code, writetoexecdiff, functionOffset++, vtableOffset, false);
+             	code += codeSnippetSize;
+             }
+             break;
+ 
+         case typelib_TypeClass_INTERFACE_METHOD:
+             *slots++ = codeSnippet(
+-                code, functionOffset++, vtableOffset,
++                code, writetoexecdiff, functionOffset++, vtableOffset,
+                 ia64::return_in_hidden_param(
+                     reinterpret_cast<
+                     typelib_InterfaceMethodTypeDescription * >(

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	29 Jan 2008 11:59:58 -0000	1.43
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	27 Mar 2008 15:13:50 -0000	1.44
@@ -109,34 +109,7 @@
 diff -u -r1.40 printerjob.cxx
 --- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx	24 Oct 2006 15:06:47 -0000	1.40
 +++ openoffice.org/psprint/source/printergfx/printerjob.cxx	9 Nov 2006 10:40:31 -0000
-@@ -412,6 +412,7 @@
- {
-     m_bQuickJob = bIsQuickJob;
-     mnMaxWidthPt = mnMaxHeightPt = 0;
-+    mnLandscapes = mnPortraits = 0;
-     m_pGraphics = pGraphics;
-     InitPaperSize (rSetupData);
- 
-@@ -504,6 +505,7 @@
-     // Other
-     WritePS (mpJobHeader, "%%DocumentData: Clean7Bit\n");
-     WritePS (mpJobHeader, "%%Pages: (atend)\n");
-+    WritePS (mpJobHeader, "%%Orientation: (atend)\n");
-     WritePS (mpJobHeader, "%%PageOrder: Ascend\n");
-     WritePS (mpJobHeader, "%%EndComments\n");
- 
-@@ -535,6 +537,10 @@
-     aTrailer.append( (sal_Int32)mnMaxWidthPt );
-     aTrailer.append( " " );
-     aTrailer.append( (sal_Int32)mnMaxHeightPt );
-+    if( mnLandscapes > mnPortraits )
-+        aTrailer.append("\n%%Orientation: Landscape");
-+    else
-+        aTrailer.append("\n%%Orientation: Portrait");
-     aTrailer.append( "\n%%Pages: " );
-     aTrailer.append( (sal_Int32)maPageList.size() );
-     aTrailer.append( "\n%%EOF\n" );
-@@ -663,6 +669,17 @@
+@@ -669,6 +669,17 @@
  
      mnResolution	= nRes;
  
@@ -154,27 +127,18 @@
      mnWidthPt       = nWidth;
      mnHeightPt      = nHeight;
  
-@@ -715,6 +732,19 @@
+@@ -721,7 +732,9 @@
      WritePS (pPageHeader, aPageNo);
      WritePS (pPageHeader, "\n");
  
+-    if( rJobSetup.m_eOrientation == orientation::Landscape )
 +    orientation::type eOrientation = rJobSetup.m_bNumberUpJob ? orientation::Portrait : rJobSetup.m_eOrientation;
 +
 +    if( eOrientation == orientation::Landscape )
-+    {
-+        WritePS (pPageHeader, "%%PageOrientation: Landscape\n");
-+        mnLandscapes++;
-+    }
-+    else
-+    {
-+        WritePS (pPageHeader, "%%PageOrientation: Portrait\n");
-+        mnPortraits++;
-+    }
-+
-     sal_Char  pBBox [256];
-     sal_Int32 nChar = 0;
- 
-@@ -886,7 +916,8 @@
+     {
+         WritePS (pPageHeader, "%%PageOrientation: Landscape\n");
+         mnLandscapes++;
+@@ -903,7 +916,8 @@
      sal_Char  pTranslate [128];
      sal_Int32 nChar = 0;
  
@@ -184,7 +148,7 @@
      {
          nChar  = psp::appendStr  ("gsave\n[",   pTranslate); 
          nChar += psp::getValueOfDouble (        pTranslate + nChar, mfXScale, 5);
-@@ -1197,7 +1228,7 @@
+@@ -1214,7 +1228,7 @@
              WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
      }
  
@@ -1565,11 +1529,11 @@
  #endif // _SV_PRINT_H
 --- openoffice.org.orig/sfx2/source/view/viewprn.cxx	2007-05-01 13:18:31.000000000 +0100
 +++ openoffice.org/sfx2/source/view/viewprn.cxx	2007-05-01 13:18:44.000000000 +0100
-@@ -175,6 +175,7 @@
- 
- 	// Dialog ausf"uhren
- 	SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pParent, _pViewSh, _pOptions );
-+        pDlg->SetNativeParent(_pParent ? _pParent->GetNativeHandle() : 0);
+@@ -203,6 +203,7 @@
+ 	SfxPrintOptionsDialog* pDlg = new SfxPrintOptionsDialog( _pPrintParent ? static_cast<Window*>(_pPrintParent)
+                                                                            : static_cast<Window*>(_pSetupParent),
+                                                              _pViewSh, _pOptions );
++        pDlg->SetNativeParent(_pPrintParent ? _pPrintParent->GetNativeHandle() : 0);
  	if ( _bHelpDisabled )
  		pDlg->DisableHelp();
  	if ( pDlg->Execute() == RET_OK )
@@ -1673,20 +1637,3 @@
  };
  
  
-Index: inc/psprint/printerjob.hxx
-===================================================================
-RCS file: /cvs/gsl/psprint/inc/psprint/printerjob.hxx,v
-retrieving revision 1.10
-diff -u -r1.10 printerjob.hxx
---- openoffice.org.orig/psprint/inc/psprint/printerjob.hxx	12 Dec 2007 14:55:42 -0000	1.10
-+++ openoffice.org/psprint/inc/psprint/printerjob.hxx	28 Jan 2008 15:20:51 -0000
-@@ -81,6 +81,9 @@
-     sal_uInt32      mnMaxWidthPt;
-     sal_uInt32      mnMaxHeightPt;
- 
-+    int mnLandscapes;
-+    int mnPortraits;
-+
-     sal_uInt32      mnLMarginPt;
-     sal_uInt32      mnRMarginPt;
-     sal_uInt32      mnTMarginPt;

openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch:

Index: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	15 Jan 2008 12:30:51 -0000	1.2
+++ openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch	27 Mar 2008 15:13:50 -0000	1.3
@@ -356,14 +356,3 @@
                  aSuppLocales.realloc(numlocs);
  
              } else {
---- openoffice.org.orig/solenv/inc/libs.mk	2007-12-12 13:15:14.000000000 +0000
-+++ openoffice.org/inc/libs.mk	2008-01-08 08:56:51.000000000 +0000
-@@ -326,7 +326,7 @@
- SABLOT3RDLIB=-lsablot
- APP3RDLIB=-lapp
- SAMPLE3RDLIB=-lsample
--HNJLIB=-lhnj
-+HNJLIB=-lhyphen
- MYSPELLLIB=-lmyspell
- COSVLIB=-lcosv
- UDMLIB=-ludm

openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:

Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	5 Feb 2008 16:25:54 -0000	1.7
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch	27 Mar 2008 15:13:50 -0000	1.8
@@ -324,98 +324,18 @@
  	gid_File_Lib_BaseGfx,
  	gid_File_Lib_Sysdtrans,
  	gid_File_Lib_Sw,
-diff -rup sd-orig/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/animations/CustomAnimationDialog.cxx
---- sd-orig/source/ui/animations/CustomAnimationDialog.cxx	2006-08-17 15:48:52.000000000 +0200
-+++ sd/source/ui/animations/CustomAnimationDialog.cxx	2006-08-17 15:50:37.000000000 +0200
-@@ -1943,6 +1943,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+#     define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -1950,6 +1953,7 @@
- #else
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
- 
- void CustomAnimationEffectTabPage::onSoundPreview()
- {
-diff -rup sd-orig/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
---- sd-orig/source/ui/slideshow/slideshowimpl.cxx	2006-08-17 15:48:52.000000000 +0200
-+++ sd/source/ui/slideshow/slideshowimpl.cxx	2006-08-17 15:54:35.000000000 +0200
-@@ -121,6 +121,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+#     define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -128,6 +131,7 @@
- #else
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif 
-+#endif
- 
- using ::com::sun::star::uno::UNO_QUERY;
- using ::com::sun::star::uno::UNO_QUERY_THROW;
-diff -rup slideshow-orig/source/engine/soundplayer.cxx slideshow/source/engine/soundplayer.cxx
---- slideshow-orig/source/engine/soundplayer.cxx	2006-08-17 16:15:39.000000000 +0200
-+++ slideshow/source/engine/soundplayer.cxx	2006-08-17 16:17:17.000000000 +0200
-@@ -58,6 +58,9 @@
- // TODO(Q3): This breaks encapsulation. Either export
- // these strings from avmedia, or provide an XManager
- // factory there
-+#ifdef GSTREAMER
-+#     define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -65,6 +68,7 @@
- #else
- #	define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif 
-+#endif
- 
- 
- namespace slideshow
 diff -rup slideshow-orig/source/engine/viewmediashape.cxx slideshow/source/engine/viewmediashape.cxx
 --- slideshow-orig/source/engine/shapes/viewmediashape.cxx	2006-08-17 16:15:39.000000000 +0200
 +++ slideshow/source/engine/shapes/viewmediashape.cxx	2006-08-17 17:26:09.000000000 +0200
-@@ -75,6 +75,16 @@
- #include "mediashape.hxx"
- #include "tools.hxx"
- 
-+#ifdef GSTREAMER
-+#ifndef _SV_SYSDATA_HXX
+@@ -48,6 +48,7 @@
+ #include <vcl/window.hxx>
+ #include <vcl/javachild.hxx>
+ #include <vcl/salbtype.hxx>
 +#include <vcl/sysdata.hxx>
-+#endif
-+
-+// TODO(Q3): This breaks encapsulation. Either export
-+// these strings from avmedia, or provide an XManager
-+// factory there
-+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
-+#else
- #ifdef WNT
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
- #elif defined QUARTZ
-@@ -82,6 +92,7 @@
- #else
- #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
- #endif
-+#endif
- 
- using namespace ::com::sun::star;
  
-@@ -159,7 +170,11 @@
+ #include <basegfx/tools/canvastools.hxx>
+ #include <basegfx/numeric/ftools.hxx>
+@@ -152,7 +153,11 @@
  				mxPlayerWindow.clear();
  			}
  
@@ -427,7 +347,7 @@
              			
  			// shutdown player
  			if( mxPlayer.is() )
-@@ -294,7 +309,8 @@
+@@ -287,7 +292,8 @@
  							aDeviceParams[ 0 ] >>= aImplName;
  						
  							if( aImplName.endsWithIgnoreAsciiCaseAsciiL( 
@@ -437,7 +357,7 @@
                              {
  								implInitializeVCLBasedPlayerWindow( rBounds, aDeviceParams );
                              }
-@@ -416,6 +432,7 @@
+@@ -393,6 +399,7 @@
  		bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
  																 const uno::Sequence< uno::Any >& rVCLDeviceParams)
  		{
@@ -445,7 +365,7 @@
  			if( !mpMediaWindow.get() && !rBounds.isEmpty() )
  			{
  				try
-@@ -437,28 +454,50 @@
+@@ -414,28 +421,50 @@
  																	
  						if( !rRangePix.isEmpty() )
  						{
@@ -3284,8 +3204,93 @@
  
      public LocaleCodes (XMultiServiceFactory xmsf) {
          super(xmsf, UNIT_NAME, MODULE_NAME);
--        allLanguageStrings = getStringList(16298);  // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
-+        allLanguageStrings = getStringList(16300);  // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
+-        allLanguageStrings = getStringList(16299);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
++        allLanguageStrings = getStringList(16301);  // STR_SVT_JAVAERROR_END part of SvtLanguageTable from svtools
      }
      
      public String getLanguageString(String MSID) {
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx	2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx	2007-08-07 17:14:52.000000000 +0100
+@@ -67,6 +67,7 @@
+     mpPlaybin( NULL ),
+     mbFakeVideo (sal_False ),
+     mnUnmutedVolume( 0 ),
++    mbPlayPending ( false ),
+     mbMuted( false ),
+     mbLooping( false ),
+     mbInitialized( false ),
+@@ -140,6 +141,7 @@
+     case GST_MESSAGE_EOS:
+         //DBG( "EOS, reset state to NULL" );
+         gst_element_set_state( mpPlaybin, GST_STATE_READY );
++        mbPlayPending = false;
+         break;
+     case GST_MESSAGE_STATE_CHANGED:
+         if( message->src == GST_OBJECT( mpPlaybin ) ) {
+@@ -151,6 +153,9 @@
+                 pendingstate == GST_STATE_VOID_PENDING &&
+                 mpXOverlay )
+                 gst_x_overlay_expose( mpXOverlay );
++
++	    if (mbPlayPending)
++	        mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
+         }
+     default:
+         break;
+@@ -250,6 +255,7 @@
+ 
+         if( mpPlaybin != NULL ) {
+             gst_element_set_state( mpPlaybin, GST_STATE_NULL );
++            mbPlayPending = false;
+             g_object_unref( mpPlaybin );
+         }
+ 
+@@ -281,6 +287,7 @@
+         preparePlaybin( rURL, true );
+ 
+         gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
++        mbPlayPending = false;
+ 
+         bRet = true;
+     }
+@@ -305,6 +312,7 @@
+     if( mbInitialized && NULL != mpPlaybin )
+     {
+         gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
++        mbPlayPending = true;
+     }
+ }
+ 
+@@ -317,6 +325,7 @@
+     if( mpPlaybin )
+         gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+ 
++    mbPlayPending = false;
+     DBG( "stop %p", mpPlaybin );
+ }
+ 
+@@ -325,10 +334,10 @@
+ sal_Bool SAL_CALL Player::isPlaying()
+     throw (uno::RuntimeException)
+ {
+-    bool            bRet = false;
++    bool            bRet = mbPlayPending;
+ 
+     // return whether the pipeline is in PLAYING STATE or not
+-    if( mbInitialized && mpPlaybin )
++    if( !mbPlayPending && mbInitialized && mpPlaybin )
+     {
+         bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
+     }
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
+--- avmedia.orig/source/gstreamer/gstplayer.hxx	2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.hxx	2007-08-07 10:30:45.000000000 +0100
+@@ -101,6 +101,7 @@
+     sal_Bool                mbFakeVideo;
+ 
+     gdouble                 mnUnmutedVolume;
++	sal_Bool				mbPlayPending;
+     sal_Bool                mbMuted;
+     sal_Bool                mbLooping;
+     sal_Bool                mbInitialized;

openoffice.org-2.2.0.rh232389.tango.patch:

Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-2.2.0.rh232389.tango.patch	16 Aug 2007 07:04:22 -0000	1.5
+++ openoffice.org-2.2.0.rh232389.tango.patch	27 Mar 2008 15:13:50 -0000	1.6
@@ -157,19 +157,47 @@
              < "Crystal" ; > ;
              < "Tango" ; > ;
          };
-Index: inc/settings.mk
+Index: inc/bf_svtools/imgdef.hxx
 ===================================================================
-RCS file: /cvs/tools/solenv/inc/settings.mk,v
-retrieving revision 1.205.32.2
-diff -u -r1.205.32.2 settings.mk
---- openoffice.org.orig/solenv/inc/settings.mk	16 Jan 2007 08:33:58 -0000	1.205.32.2
-+++ openoffice.org/solenv/inc/settings.mk	30 Mar 2007 14:36:30 -0000
-@@ -946,7 +946,7 @@
- .ENDIF
- 
- # additional image sets
--CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango
-+CUSTOM_IMAGE_SETS=hicontrast crystal tango
- 
- # settings for mozilla idl compiler
- XPIDL=xpidl
+RCS file: /cvs/framework/binfilter/inc/bf_svtools/imgdef.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 imgdef.hxx
+--- openoffice.org.orig/binfilter/inc/bf_svtools/imgdef.hxx	12 Mar 2008 12:09:35 -0000	1.2
++++ openoffice.org/binfilter/inc/bf_svtools/imgdef.hxx	15 Mar 2008 11:08:44 -0000
+@@ -49,9 +49,7 @@
+ enum SfxSymbolsStyle
+ {
+     SFX_SYMBOLS_STYLE_AUTO,
+-    SFX_SYMBOLS_STYLE_DEFAULT,
+     SFX_SYMBOLS_STYLE_HICONTRAST,
+-    SFX_SYMBOLS_STYLE_INDUSTRIAL,
+     SFX_SYMBOLS_STYLE_CRYSTAL,
+     SFX_SYMBOLS_STYLE_TANGO
+ };
+Index: bf_svtools/source/config/svt_miscopt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svtools/source/config/svt_miscopt.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svt_miscopt.cxx
+--- openoffice.org.orig/binfilter/bf_svtools/source/config/svt_miscopt.cxx	12 Mar 2008 08:33:33 -0000	1.2
++++ openofficelorg/binfilter/bf_svtools/source/config/svt_miscopt.cxx	15 Mar 2008 11:09:04 -0000
+@@ -278,9 +278,7 @@
+ 	switch ( nStyle )
+ 	{
+ 		case STYLE_SYMBOLS_AUTO:       return SFX_SYMBOLS_STYLE_AUTO;
+-		case STYLE_SYMBOLS_DEFAULT:    return SFX_SYMBOLS_STYLE_DEFAULT;
+ 		case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST;
+-		case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
+ 		case STYLE_SYMBOLS_CRYSTAL:    return SFX_SYMBOLS_STYLE_CRYSTAL;
+ 		case STYLE_SYMBOLS_TANGO:      return SFX_SYMBOLS_STYLE_TANGO;
+ 	}
+@@ -293,9 +291,7 @@
+ 	switch ( nStyle )
+ 	{
+ 		case SFX_SYMBOLS_STYLE_AUTO:       return STYLE_SYMBOLS_AUTO;
+-		case SFX_SYMBOLS_STYLE_DEFAULT:    return STYLE_SYMBOLS_DEFAULT;
+ 		case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST;
+-		case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
+ 		case SFX_SYMBOLS_STYLE_CRYSTAL:    return STYLE_SYMBOLS_CRYSTAL;
+ 		case SFX_SYMBOLS_STYLE_TANGO:      return STYLE_SYMBOLS_TANGO;
+ 	}

openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch:

Index: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch	8 Jan 2008 14:51:51 -0000	1.6
+++ openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch	27 Mar 2008 15:13:50 -0000	1.7
@@ -818,7 +818,7 @@
 +	{
 +		bool bRet = false;
 +		SfxItemSet aSet( pSh->GetAttrPool(), RES_PAGEDESC, RES_PAGEDESC );
-+		if (pSh->GetAttr( aSet ))
++		if (pSh->GetCurAttr( aSet ))
 +		{
 +			const SfxPoolItem* pItem(0);
 +			if (SFX_ITEM_SET == aSet.GetItemState( RES_PAGEDESC, TRUE, &pItem ) && pItem)

openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:

Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	1 Aug 2007 12:04:00 -0000	1.1
+++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch	27 Mar 2008 15:13:50 -0000	1.2
@@ -81,21 +81,21 @@
  #define BMP_FOIL_22_H 						RID_SD_START+204
  #define BMP_FOIL_23_H 						RID_SD_START+205
  #define BMP_FOIL_24_H 						RID_SD_START+206
-+#define BMP_FOIL_25_H 						RID_SD_START+333
++#define BMP_FOIL_25_H 						RID_SD_START+334
  #define BMP_FOILH_01_H						RID_SD_START+207
  #define BMP_FOILH_02_H						RID_SD_START+208
  #define BMP_FOILH_03_H						RID_SD_START+209
 diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
 --- openoffice.org.orig/sd/source/ui/inc/strings.hrc	2006-07-05 23:53:36.000000000 +0200
 +++ openoffice.org/sd/source/ui/inc/strings.hrc	2007-07-27 15:13:52.000000000 +0200
-@@ -295,6 +295,7 @@
- #define STR_AUTOLAYOUT_HANDOUT4 	(RID_APP_START+234)
+@@ -202,6 +202,7 @@
  #define STR_AUTOLAYOUT_HANDOUT6 	(RID_APP_START+235)
  #define STR_AUTOLAYOUT_NOTES		(RID_APP_START+236)
-+#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+237)
- 
+ #define STR_AUTOLAYOUT_HANDOUT9		(RID_APP_START+237)
++#define STR_AUTOLAYOUT_ONLY_TEXT	(RID_APP_START+238)
  
  #define STR_TRANSFORM				(RID_APP_START+240)
+ 
 diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
 --- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx	2006-12-12 19:40:07.000000000 +0100
 +++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx	2007-07-27 15:13:02.000000000 +0200
@@ -108,3 +108,18 @@
      {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
       AUTOLAYOUT_OBJ},
      {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
+Index: source/token/tokens.txt
+===================================================================
+RCS file: /cvs/xml/oox/source/token/tokens.txt,v
+retrieving revision 1.2
+diff -u -r1.2 tokens.txt
+--- openoffice.org.orig/oox/source/token/tokens.txt	17 Jan 2008 08:06:07 -0000	1.2
++++ openoffice.org/oox/source/token/tokens.txt	10 Mar 2008 15:57:51 -0000
+@@ -2431,6 +2431,7 @@
+ handoutMasterId
+ handoutMasterIdLst
+ handoutView
++handouts
+ handouts1
+ handouts2
+ handouts3

openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch:

Index: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch	20 Dec 2007 16:13:58 -0000	1.2
+++ openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch	27 Mar 2008 15:13:50 -0000	1.3
@@ -5,16 +5,16 @@
 diff -u -r1.105.2.2 paintfrm.cxx
 --- openoffice.org.orig/sw/source/core/layout/paintfrm.cxx	24 Aug 2007 11:52:41 -0000	1.105.2.2
 +++ openoffice.org/sw/source/core/layout/paintfrm.cxx	16 Dec 2007 13:38:26 -0000
-@@ -2979,7 +2979,11 @@
- 			// OD 20.12.2002 #94627# - no paint of page border and shadow, if
-             // writer is in place mode.
- 			 if( pSh->GetWin() &&
--                !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() )
-+		 (
-+		  !pSh->GetDoc()->GetDocShell() ||
-+                  !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() 
-+		 )
-+		)
-             {
-                 // OD 12.02.2003 #i9719#, #105645# - use new method
-                 // <SwPageFrm::PaintBorderAndShadow(..)>.
+@@ -3006,7 +3006,11 @@
+                 // OD 20.12.2002 #94627# - no paint of page border and shadow, if
+                 // writer is in place mode.
+                 if( pSh->GetWin() &&
+-                    !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() )
++                 (
++                  !pSh->GetDoc()->GetDocShell() ||
++                    !pSh->GetDoc()->GetDocShell()->IsInPlaceActive() 
++                 )
++                )
+                 {
+                     // OD 12.02.2003 #i9719#, #105645# - use new method
+                     // <SwPageFrm::PaintBorderAndShadow(..)>.

openoffice.org-2.4.0.ooo85097.desktop.pagein.patch:

Index: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85097.desktop.pagein.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.ooo85097.desktop.pagein.patch	9 Jan 2008 07:48:30 -0000	1.1
+++ openoffice.org-2.4.0.ooo85097.desktop.pagein.patch	27 Mar 2008 15:13:50 -0000	1.2
@@ -6,17 +6,17 @@
 --- openoffice.org.orig/desktop/source/pagein/makefile.mk	5 Oct 2006 10:47:06 -0000	1.9
 +++ openoffice.org/desktop/source/pagein/makefile.mk	9 Jan 2008 07:43:34 -0000
 @@ -110,7 +110,6 @@
- 	@-echo $(DLLPRE)go$(UPDDLLPOST)    >> $@
- 	@-echo $(DLLPRE)sb$(UPDDLLPOST)    >> $@
- 	@-echo $(DLLPRE)sfx$(UPDDLLPOST)   >> $@
--	@-echo $(DLLPRE)so$(UPDDLLPOST)    >> $@
+ 	@-echo $(DLLPRE)go$(DFTDLLPOST)    >> $@
+ 	@-echo $(DLLPRE)sb$(DFTDLLPOST)    >> $@
+ 	@-echo $(DLLPRE)sfx$(DFTDLLPOST)   >> $@
+-	@-echo $(DLLPRE)so$(DFTDLLPOST)    >> $@
  #
- 	@-echo $(DLLPRE)fwe$(UPDDLLPOST)   >> $@
- 	@-echo $(DLLPRE)fwk$(UPDDLLPOST)   >> $@
+ 	@-echo $(DLLPRE)fwe$(DFTDLLPOST)   >> $@
+ 	@-echo $(DLLPRE)fwk$(DFTDLLPOST)   >> $@
 @@ -122,12 +121,14 @@
  	@-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@
- 	@-echo $(DLLPRE)sot$(UPDDLLPOST)   >> $@
- 	@-echo $(DLLPRE)psp$(UPDDLLPOST)   >> $@
+ 	@-echo $(DLLPRE)sot$(DFTDLLPOST)   >> $@
+ 	@-echo $(DLLPRE)psp$(DFTDLLPOST)   >> $@
 +.IF "$(USE_SYSTEM_STL)"!="YES"
  .IF "$(COMNAME)" == "gcc2" || "$(COMNAME)" == "gcc3"
  	@-echo $(DLLPRE)stlport_gcc$(DLLPOST)    >> $@

openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch:

Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	6 Feb 2008 16:39:46 -0000	1.1
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch	27 Mar 2008 15:13:50 -0000	1.2
@@ -1,14 +1,11 @@
 diff -ru sd/inc/app.hrc sd/inc/app.hrc
 --- openoffice.org.orig/sd/inc/app.hrc	2008-02-05 17:05:14.000000000 +0000
 +++ openoffice.org/sd/inc/app.hrc	2008-02-05 20:29:11.000000000 +0000
-@@ -469,6 +469,8 @@
- // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
- #define SID_SHOW_SLIDE                      (SID_SD_START+440)
+@@ -470,5 +470,6 @@
  
--#define SID_ADD_MOTION_PATH				(SID_SD_START+441)
-+#define SID_ADD_MOTION_PATH                 (SID_SD_START+441)
-+
-+#define SID_TP_EDIT_MASTER                  (SID_SD_START+442)
+ #define SID_ADD_MOTION_PATH					(SID_SD_START+441)
+ #define SID_TABLE_TOOLBOX					(SID_SD_START+442)
++#define SID_TP_EDIT_MASTER                  (SID_SD_START+443)
  
  #endif
 diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi

openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:

Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	11 Mar 2008 19:11:07 -0000	1.3
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	27 Mar 2008 15:13:51 -0000	1.4
@@ -1,8 +1,8 @@
 --- openoffice.org.orig/desktop/scripts/unopkg.sh	2008-01-14 15:55:26.000000000 +0000
 +++ openoffice.org/desktop/scripts/unopkg.sh	2008-02-14 10:52:10.000000000 +0000
-@@ -95,6 +95,29 @@
-     ;;
- esac
+@@ -51,6 +51,29 @@
+ sd_prog=`pwd`
+ cd "$sd_cwd"
  
 +isshared=0
 +for arg in $@
@@ -30,13 +30,13 @@
  #collect all bootstrap variables specified on the command line
  #so that they can be passed as arguments to javaldx later on
  for arg in $@
-@@ -149,5 +172,8 @@
+@@ -84,5 +107,7 @@
  [ $# -eq 1 -a "oxt" = "`echo $1 | cut -d . -f 2`" -a -n "$DISPLAY" ] && GUI="gui"
  
  # execute binary
--exec "$sd_prog/$sd_binary" $GUI "$@"
-+"$sd_prog/$sd_binary" $GUI "$@"
- 
+-exec "$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
+-
++"$sd_prog/unopkg.bin" $GUI "$@" "-env:INIFILEPATH=$sd_prog/redirectrc"
 +if [ -n "$INSTDIR" ]; then
 +   rm -rf $INSTDIR
 +fi

openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch:

Index: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch	10 Jan 2008 17:52:27 -0000	1.1
+++ openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch	27 Mar 2008 15:13:51 -0000	1.2
@@ -1,11 +1,3 @@
-diff -ru openoffice.org/solenv/bin/compiler.wrap openoffice.org/solenv/bin/compiler.wrap
---- openoffice.org.orig/solenv/bin/compiler.wrap	2008-01-10 12:24:02.000000000 +0000
-+++ openoffice.org/solenv/bin/compiler.wrap	2008-01-10 12:26:52.000000000 +0000
-@@ -1,4 +1,3 @@
--#!/usr/solar/bin/perl -w
- #!/usr/bin/perl
- 
- #print STDERR "ARGV =\n at ARGV\n";
 diff -ru openoffice.org/solenv/bin/langwrap openoffice.org/solenv/bin/langwrap
 --- openoffice.org.orig/solenv/bin/langwrap	2008-01-10 12:24:02.000000000 +0000
 +++ openoffice.org/solenv/bin/langwrap	2008-01-10 12:26:45.000000000 +0000


Index: openoffice.org.langpack-acor.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-acor.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.langpack-acor.template	30 Nov 2007 08:55:47 -0000	1.1
+++ openoffice.org.langpack-acor.template	27 Mar 2008 15:13:51 -0000	1.2
@@ -1 +1 @@
-%{instdir}/share/autocorr/LINGUPATTERN
+%{basisinstdir}/share/autocorr/LINGUPATTERN


Index: openoffice.org.langpack-cjk.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-cjk.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.langpack-cjk.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-cjk.template	27 Mar 2008 15:13:51 -0000	1.2
@@ -1,5 +1,5 @@
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_LANG.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_LANG.xcu


Index: openoffice.org.langpack-common.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-common.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.langpack-common.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-common.template	27 Mar 2008 15:13:51 -0000	1.2
@@ -1,21 +1,26 @@
 %defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*680LANG.res 
-%dir %{instdir}/share
-%dir %{instdir}/share/readme
-%{instdir}/share/readme/LICENSE_LANG
-%{instdir}/share/readme/LICENSE_LANG.html
-%{instdir}/share/readme/README_LANG
-%{instdir}/share/readme/README_LANG.html
-%dir %{instdir}/share/registry 
-%dir %{instdir}/share/registry/res 
-%{instdir}/share/registry/res/LANG
-%dir %{instdir}/share/template 
-%{instdir}/share/template/LANG
-%dir %{instdir}/share/registry/modules 
-%dir %{instdir}/share/registry/modules/org 
-%dir %{instdir}/share/registry/modules/org/openoffice 
-%dir %{instdir}/share/registry/modules/org/openoffice/Setup 
-%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-LANG.xcu
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%dir %{oooinstdir}/program/resource
+%{oooinstdir}/program/resource/*LANG.res 
+%dir %{oooinstdir}/share
+%dir %{oooinstdir}/share/readme
+%{oooinstdir}/share/readme/LICENSE_LANG
+%{oooinstdir}/share/readme/LICENSE_LANG.html
+%{oooinstdir}/share/readme/README_LANG
+%{oooinstdir}/share/readme/README_LANG.html
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/resource
+%{basisinstdir}/program/resource/*LANG.res 
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/registry 
+%dir %{basisinstdir}/share/registry/res 
+%{basisinstdir}/share/registry/res/LANG
+%dir %{basisinstdir}/share/template 
+%{basisinstdir}/share/template/LANG
+%dir %{basisinstdir}/share/registry/modules 
+%dir %{basisinstdir}/share/registry/modules/org 
+%dir %{basisinstdir}/share/registry/modules/org/openoffice 
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Setup 
+%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Langpack-LANG.xcu


Index: openoffice.org.langpack-ctl.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-ctl.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.langpack-ctl.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-ctl.template	27 Mar 2008 15:13:51 -0000	1.2
@@ -1,3 +1,3 @@
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_LANG.xcu


Index: openoffice.org.langpack-help.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-help.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org.langpack-help.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-help.template	27 Mar 2008 15:13:51 -0000	1.2
@@ -1,2 +1,2 @@
-%dir %{instdir}/help
-%{instdir}/help/LANG
+%dir %{basisinstdir}/help
+%{basisinstdir}/help/LANG


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1455 -r 1.1456 openoffice.org.spec
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1455
retrieving revision 1.1456
diff -u -r1.1455 -r1.1456
--- openoffice.org.spec	27 Mar 2008 09:36:02 -0000	1.1455
+++ openoffice.org.spec	27 Mar 2008 15:13:51 -0000	1.1456
@@ -1,6 +1,6 @@
-%define oootag OOH680
-%define ooomilestone 12
-%define rh_rpm_release 2
+%define oootag DEV300
+%define ooomilestone 4
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -42,8 +42,8 @@
 
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
-Version:        2.4.0
-Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
+Version:        3.0.0
+Release: 	0.0.%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
 License:	LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
 Group:		Applications/Productivity
@@ -60,13 +60,13 @@
 BuildRequires:	binutils, %{java_devel}, boost-devel, zlib-devel, vigra-devel
 BuildRequires:	python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
 BuildRequires:	neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
-BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel
-BuildRequires:	xulrunner-devel, libwpd-devel, hunspell-devel, unixODBC-devel
+BuildRequires:	libXt-devel, libICE-devel, libjpeg-devel, db4-devel, gperf
+BuildRequires:	gecko-devel, libwpd-devel, hunspell-devel, unixODBC-devel
 BuildRequires:	sane-backends-devel, libicu-devel, perl-Archive-Zip
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, desktop-file-utils
 BuildRequires:	evolution-data-server-devel, libtextcat-devel, nss-devel
 BuildRequires:	gstreamer-devel, gstreamer-plugins-base-devel, hyphen-devel
-BuildRequires:	openssl-devel, xalan-j2, xerces-j2, hsqldb, bsh
+BuildRequires:	openssl-devel, lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  openoffice.org-multiliblauncher.sh
@@ -79,77 +79,74 @@
 Patch8:  openoffice.org.langpack-common.template
 Patch9:  openoffice.org.langpack-acor.template
 Patch10: openoffice.org.langpack-ctl.template
-Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 %if %{gtkprintui}
-Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
-Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch16: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
-Patch17: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch18: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch19: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch20: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch21: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch22: pseudoworkspace.valgrind1.patch
-Patch23: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch24: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch25: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
-Patch26: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch27: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch28: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
-Patch29: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch30: workspace.tl37.patch
-Patch31: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch32: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch33: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch34: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch35: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch36: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch37: openoffice.org-2.2.0.rh232389.tango.patch
-Patch38: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch39: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch40: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
-Patch41: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
-Patch42: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
-Patch43: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
-Patch45: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
-Patch46: workspace.unifysound01.patch
-Patch47: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch48: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
-Patch49: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch50: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
-Patch51: openoffice.org-2.3.1.ooo81307.sw.word2.patch
-Patch52: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch53: workspace.notes2.patch
-Patch54: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
-Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
-Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
-Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
-Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
-Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
-Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch62: openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
-Patch63: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
-Patch64: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
-Patch65: workspace.cairotext01.patch
-Patch66: workspace.gcc430two.patch
-Patch67: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
-Patch68: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch69: openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
-Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
-Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch72: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
-Patch73: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
-Patch74: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-Patch75: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
-Patch76: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
-Patch77: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
-
-%define instdir %{_libdir}/openoffice.org
+Patch13: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch14: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch15: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch16: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch20: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch21: pseudoworkspace.valgrind1.patch
+Patch22: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch23: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch24: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch25: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch26: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch27: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemdicts.patch
+Patch28: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch29: workspace.tl37.patch
+Patch30: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch31: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch32: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch33: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch34: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch35: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch36: openoffice.org-2.2.0.rh232389.tango.patch
+Patch37: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch38: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch39: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch40: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch41: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch42: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch43: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch44: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch45: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch46: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch47: openoffice.org-2.3.0.ooo82966.svx.missing3d.patch
+Patch48: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch49: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
+Patch50: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
+Patch51: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
+Patch52: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
+Patch53: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
+Patch54: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch55: openoffice.org-2.4.0.ooo85429.sw.a11ycrash.patch
+Patch56: openoffice.org-2.4.0.ooo85448.emptyrpath.patch
+Patch57: workspace.cairotext01.patch
+Patch58: openoffice.org-2.4.0.ooo85854.sw.graphicsaveas.patch
+Patch59: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch60: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch61: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch62: workspace.cmcfixes43.patch
+Patch63: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch64: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch65: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
+Patch66: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
+Patch67: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+
+%define instdir %{_libdir}
+%define baseinstdir %{instdir}/openoffice.org
+%define ureinstdir %{baseinstdir}/ure
+%define basisinstdir %{baseinstdir}/basis3.0
+%define oooinstdir %{instdir}/openoffice.org3.0
+%define OFFICEUPD 300
+%define UPD %nil
+%define SOPOST l*
 
 %description
 OpenOffice.org is an Open Source, community-developed, multi-platform
@@ -201,7 +198,7 @@
 
 %package base
 Summary: Database frontend for %{name}
-Group: Development/Libraries
+Group: Applications/Productivity
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 Obsoletes: openoffice.org2-base
 
@@ -209,6 +206,16 @@
[...2424 lines suppressed...]
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/classes
+%{basisinstdir}/program/classes/aportisdoc.jar
+%{basisinstdir}/program/classes/pexcel.jar
+%{basisinstdir}/program/classes/pocketword.jar
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
 
 %files testtools
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/hid.lst
-%{instdir}/program/libcommuni680*.so
-%{instdir}/program/libsalalloc_malloc.so.3
-%{instdir}/program/libsimplecm680*.so
-%{instdir}/program/testtoolrc
-%{instdir}/program/testtool.bin
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/stt680en-US.res
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/hid.lst
+%{basisinstdir}/program/libcommuni%{SOPOST}.so
+%{ureinstdir}/lib/libsalalloc_malloc.so.3
+%{basisinstdir}/program/libsimplecm%{SOPOST}.so
+%{basisinstdir}/program/testtoolrc
+%{basisinstdir}/program/testtool.bin
+%dir %{basisinstdir}/program/resource
+%{basisinstdir}/program/resource/stt%{UPD}en-US.res
+
+%files ure
+%defattr(-,root,root,-)
+%dir %{baseinstdir}
+%{ureinstdir}
+%exclude %{ureinstdir}/lib/libsalalloc_malloc.so.3
 
 %files sdk
 %defattr(-,root,root,-)
-%{instdir}/sdk/
-%exclude %{instdir}/sdk/setdevelenv_unix.sh
-%exclude %{instdir}/sdk/docs/
-%exclude %{instdir}/sdk/examples/
-%exclude %{instdir}/sdk/include/tools
-%exclude %{instdir}/sdk/include/comphelper
-%exclude %{instdir}/sdk/include/i18npool
-%exclude %{instdir}/sdk/include/vos
-%exclude %{instdir}/sdk/include/psprint
-%exclude %{instdir}/sdk/solenv
-%exclude %{instdir}/sdk/linux/bin/checkdll
+%{baseinstdir}/sdk/
+%exclude %{baseinstdir}/sdk/setdevelenv_unix.sh
+%exclude %{baseinstdir}/sdk/docs/
+%exclude %{baseinstdir}/sdk/examples/
+%exclude %{baseinstdir}/sdk/include/tools
+%exclude %{baseinstdir}/sdk/include/comphelper
+%exclude %{baseinstdir}/sdk/include/i18npool
+%exclude %{baseinstdir}/sdk/include/vos
+%exclude %{baseinstdir}/sdk/include/psprint
+%exclude %{baseinstdir}/sdk/solenv
+%exclude %{baseinstdir}/sdk/linux/bin/checkdll
 
 %files sdk-doc
 %defattr(-,root,root,-)
-%{instdir}/sdk/docs/
-%{instdir}/sdk/examples/
+%{baseinstdir}/sdk/docs/
+%{baseinstdir}/sdk/examples/
 
 %files devel
 %defattr(-,root,root,-)
-%{instdir}/sdk/setdevelenv_unix.sh
-%{instdir}/sdk/include/tools
-%{instdir}/sdk/include/comphelper
-%{instdir}/sdk/include/i18npool
-%{instdir}/sdk/include/vos
-%{instdir}/sdk/include/psprint
-%{instdir}/sdk/solenv
-%{instdir}/sdk/linux/bin/checkdll
+%{baseinstdir}/sdk/setdevelenv_unix.sh
+%{baseinstdir}/sdk/include/tools
+%{baseinstdir}/sdk/include/comphelper
+%{baseinstdir}/sdk/include/i18npool
+%{baseinstdir}/sdk/include/vos
+%{baseinstdir}/sdk/include/psprint
+%{baseinstdir}/sdk/solenv
+%{baseinstdir}/sdk/linux/bin/checkdll
 
 %files headless
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/libbasebmp680*.so
-%{instdir}/program/libvclplug_svp680*.so
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/libbasebmp%{SOPOST}.so
+%{basisinstdir}/program/libvclplug_svp%{SOPOST}.so
 
 %files pyuno
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/libpyuno.so
-%{instdir}/program/officehelper.py*
-%{instdir}/program/pythonloader.py*
-%{instdir}/program/pythonloader.uno.so
-%{instdir}/program/pythonloader.unorc
-%{instdir}/program/pythonscript.py*
-%{instdir}/program/pyuno.so
-%dir %{instdir}/share
-%dir %{instdir}/share/Scripts
-%{instdir}/share/Scripts/python
-%dir %{instdir}/share/registry
-%dir %{instdir}/share/registry/modules
-%dir %{instdir}/share/registry/modules/org
-%dir %{instdir}/share/registry/modules/org/openoffice
-%dir %{instdir}/share/registry/modules/org/openoffice/Office
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Scripting
-%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/libpyuno.so
+%{basisinstdir}/program/officehelper.py*
+%{basisinstdir}/program/pythonloader.py*
+%{basisinstdir}/program/pythonloader.uno.so
+%{basisinstdir}/program/pythonloader.unorc
+%{basisinstdir}/program/pythonscript.py*
+%{basisinstdir}/program/pyuno.so
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/Scripts
+%{basisinstdir}/share/Scripts/python
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 %{python_py_sitearch}/uno.py*
 %{python_py_sitearch}/unohelper.py*
 
-
 %changelog
+* Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
+- extend selinux bodge to ia64 
+- drop integrated workspace.notes2.patch
+- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+- drop integrated openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch
+- drop integrated workspace.gcc430two.patch
+- drop integrated openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
+- drop integrated openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
+- drop subsumed openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
+- drop integrated workspace.unifysound01.patch
+- drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+- drop integrated openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+- drop integrated openoffice.org-2.3.1.ooo81307.sw.word2.patch
+- libsoffice partially integrated into head
+- add workspace.cmcfixes43.patch
+- add the report-builder
+
 * Wed Mar 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.2
 - add openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 - add openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
@@ -2905,6 +2891,12 @@
 - drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 - Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
+* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate
 

pseudoworkspace.valgrind1.patch:

Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pseudoworkspace.valgrind1.patch	24 Jan 2008 18:47:12 -0000	1.27
+++ pseudoworkspace.valgrind1.patch	27 Mar 2008 15:13:51 -0000	1.28
@@ -1,92 +1,3 @@
-Index: source/dialog/numpages.cxx
-===================================================================
-RCS file: /cvs/graphics/svx/source/dialog/numpages.cxx,v
-retrieving revision 1.52
-diff -u -r1.52 numpages.cxx
---- openoffice.org.orig/svx/source/dialog/numpages.cxx	12 Oct 2006 12:19:44 -0000	1.52
-+++ openoffice.org/svx/source/dialog/numpages.cxx	5 Jan 2007 14:34:15 -0000
-@@ -2954,6 +2954,7 @@
- 	pActNum(0),
- 	pSaveNum(0),
- 	nActNumLvl( USHRT_MAX ),
-+	bModified(false), bPreset(false),
- 	nNumItemId(SID_ATTR_NUMBERING_RULE),
- 	bInInintControl(FALSE)
- {
-Index: source/rc/rc.cxx
-===================================================================
-RCS file: /cvs/util/tools/source/rc/rc.cxx,v
-retrieving revision 1.10
-diff -u -r1.10 rc.cxx
---- openoffice.org.orig/tools/source/rc/rc.cxx	27 Jun 2007 22:16:55 -0000	1.10
-+++ openoffice.org/tools/source/rc/rc.cxx	18 Jan 2008 12:57:15 -0000
-@@ -97,7 +97,7 @@
- 
- // =======================================================================
- 
--Date::Date( const ResId& rResId )
-+Date::Date( const ResId& rResId ) : nDate(0)
- {
-     rResId.SetRT( RSC_DATE );
-     ResMgr* pResMgr = NULL;
-Index: source/ui/dialog/SwSpellDialogChildWindow.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx,v
-retrieving revision 1.11
-diff -u -r1.11 SwSpellDialogChildWindow.cxx
---- openoffice.org.orig/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	27 Sep 2007 11:36:02 -0000	1.11
-+++ openoffice.org/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx	18 Jan 2008 14:04:49 -0000
-@@ -162,6 +162,7 @@
-     SpellState() :
-         m_bInitialCall(true),
-         m_bLockFocus(false),
-+	m_bLostFocus(false),
-         m_SpellStartPosition(SPELL_START_BODY),
-         m_bBodySpelled(false),
-         m_bOtherSpelled(false),
-Index: source/contnr/svlbox.cxx
-===================================================================
-RCS file: /cvs/util/svtools/source/contnr/svlbox.cxx,v
-retrieving revision 1.31
-diff -u -r1.31 svlbox.cxx
---- openoffice.org.orig/svtools/source/contnr/svlbox.cxx	18 Jul 2007 08:52:54 -0000	1.31
-+++ openoffice.org/svtools/source/contnr/svlbox.cxx	18 Jan 2008 14:39:53 -0000
-@@ -725,7 +725,8 @@
- 
- SvLBox::SvLBox( Window* pParent, WinBits nWinStyle	) :
- 	Control( pParent, nWinStyle | WB_CLIPCHILDREN ),
--	DropTargetHelper( this ), DragSourceHelper( this )
-+	DropTargetHelper( this ), DragSourceHelper( this ),
-+    eSelMode(NO_SELECTION)
- {
- 	DBG_CTOR(SvLBox,0);
- 	nWindowStyle = nWinStyle;
-@@ -748,7 +749,8 @@
- 
- SvLBox::SvLBox( Window* pParent, const ResId& rResId ) :
- 	Control( pParent, rResId ),
--	DropTargetHelper( this ), DragSourceHelper( this )
-+	DropTargetHelper( this ), DragSourceHelper( this ),
-+    eSelMode(NO_SELECTION)
- {
- 	DBG_CTOR(SvLBox,0);
- 	pTargetEntry = 0;
-Index: source/core/unocore/unoframe.cxx
-===================================================================
-RCS file: /cvs/sw/sw/source/core/unocore/unoframe.cxx,v
-retrieving revision 1.115
-diff -u -r1.115 unoframe.cxx
---- openoffice.org.orig/sw/source/core/unocore/unoframe.cxx	5 Nov 2007 07:39:59 -0000	1.115
-+++ openoffice.org/sw/source/core/unocore/unoframe.cxx	18 Jan 2008 17:32:52 -0000
-@@ -802,7 +802,7 @@
- {
- 	if(pHEvenMirror || pHOddMirror || pVMirror )
- 	{
--		SwMirrorGrf aMirror ( static_cast < const SwMirrorGrf& > ( rFromSet.Get ( RES_FRM_SIZE ) ) );
-+		SwMirrorGrf aMirror ( static_cast < const SwMirrorGrf& > ( rFromSet.Get ( RES_GRFATR_MIRRORGRF ) ) );
- 		if(pHEvenMirror)
- 			rRet &= ((SfxPoolItem&)aMirror).PutValue(*pHEvenMirror, MID_MIRROR_HORZ_EVEN_PAGES);
- 		if(pHOddMirror)
 Index: source/svxlink/linkmgr.cxx
 ===================================================================
 RCS file: /cvs/graphics/svx/source/svxlink/linkmgr.cxx,v


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- sources	16 Mar 2008 20:46:44 -0000	1.276
+++ sources	27 Mar 2008 15:13:51 -0000	1.277
@@ -4,4 +4,4 @@
 e3a0b76dcd876f3d721ee7183729153d  unowinreg.dll
 f0cda31fe18bf9289629a321663031b8  redhat-templates.tar.gz
 0c0e868b34329d90a7c9a92f1704775c  bengali.sdf
-106bc3fda2904ca3cc38aa56a20b82b3  OOH680_m12.tar.bz2
+8d7ec80f34cceeda8b0863ea8e6373dd  DEV300_m4.tar.bz2

workspace.cairotext01.patch:

Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- workspace.cairotext01.patch	29 Feb 2008 10:11:44 -0000	1.6
+++ workspace.cairotext01.patch	27 Mar 2008 15:13:51 -0000	1.7
@@ -53,16 +53,15 @@
 diff -u gsl/vcl/unx/inc/salgdi.h:1.41 gsl/vcl/unx/inc/salgdi.h:1.41.206.2
 --- gsl/vcl/unx/inc/salgdi.h:1.41	Wed Jun 27 13:41:23 2007
 +++ gsl/vcl/unx/inc/salgdi.h	Mon Jan 28 00:53:49 2008
-@@ -58,6 +58,8 @@
- #include <vcl/dllapi.h>
- #endif
- 
-+#include <deque>
-+
+@@ -47,6 +47,7 @@
+ #include "tools/fract.hxx"
+ #include "vcl/dllapi.h"
  #include "xfont.hxx"
++#include <deque>
  
  // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-@@ -78,6 +80,19 @@
+ struct  ImplFontMetricData;
+@@ -66,6 +67,19 @@
  
  // -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
  
@@ -82,7 +81,7 @@
  class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
  {
      friend class            X11FontLayout;
-@@ -90,7 +105,8 @@
+@@ -78,7 +92,8 @@
      SalColormap    *m_pDeleteColormap;
      Drawable        hDrawable_;     // use
      int             m_nScreen;
@@ -92,7 +91,7 @@
  
      XLIB_Region     pPaintRegion_;
      XLIB_Region     pClipRegion_;
-@@ -198,6 +214,7 @@
+@@ -186,6 +201,7 @@
      void                    DrawServerSimpleFontString( const ServerFontLayout& );
      void                    DrawServerAAFontString( const ServerFontLayout& );
      bool                    DrawServerAAForcedString( const ServerFontLayout& );


--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch DELETED ---


--- openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch DELETED ---


--- openoffice.org-2.3.1.ooo81307.sw.word2.patch DELETED ---


--- openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch DELETED ---


--- openoffice.org-2.4.0.ooo85385.svtools.a11ycrash.patch DELETED ---


--- openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch DELETED ---


--- openoffice.org-2.4.0.ooo86123.ucb.newneon.patch DELETED ---


--- openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch DELETED ---


--- workspace.gcc430two.patch DELETED ---


--- workspace.notes2.patch DELETED ---


--- workspace.unifysound01.patch DELETED ---




More information about the fedora-extras-commits mailing list