rpms/openoffice.org/devel workspace.cmcfixes43.patch, NONE, 1.1.2.1 openoffice.org.spec, 1.1440.2.3, 1.1440.2.4

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Mar 7 17:06:40 UTC 2008


Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Added Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	workspace.cmcfixes43.patch 
Log Message:
add workspace.cmcfixes43.patch

workspace.cmcfixes43.patch:

--- NEW FILE workspace.cmcfixes43.patch ---
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	Fri Mar  7 09:02:56 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	Fri Mar  7 09:02:56 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;
[...30580 lines suppressed...]
-#     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	Fri Mar  7 09:03:51 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	Fri Mar  7 09:03:51 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	Fri Mar  7 09:03:51 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: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.3
retrieving revision 1.1440.2.4
diff -u -r1.1440.2.3 -r1.1440.2.4
--- openoffice.org.spec	7 Mar 2008 15:47:16 -0000	1.1440.2.3
+++ openoffice.org.spec	7 Mar 2008 17:05:50 -0000	1.1440.2.4
@@ -139,6 +139,7 @@
 Patch65: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch66: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 Patch67: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
+Patch68: workspace.cmcfixes43.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1091,6 +1092,7 @@
 %patch65 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch66 -p1 -b .ooo86268.desktop.visibilitycockup.patch
 %patch67 -p1 -b .oooXXXXX.psprint.debugcups.patch
+%patch68 -p1 -b .workspace.cmcfixes43.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2874,6 +2876,7 @@
 - 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
+- add workspace.cmcfixes43.patch
 
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate




More information about the fedora-extras-commits mailing list