rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80735.cppu.map.patch, NONE, 1.1 openoffice.org.spec, 1.1248, 1.1249

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Aug 16 14:03:37 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo80735.cppu.map.patch 
Log Message:
add openoffice.org-2.3.0.ooo80735.cppu.map.patch

openoffice.org-2.3.0.ooo80735.cppu.map.patch:

--- NEW FILE openoffice.org-2.3.0.ooo80735.cppu.map.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/udk/cppu/util/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/cppu/util/makefile.mk	18 Jul 2007 12:34:25 -0000	1.11
+++ openoffice.org/cppu/util/makefile.mk	16 Aug 2007 13:57:48 -0000
@@ -82,11 +82,7 @@
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
 .ELSE
-.IF "$(CPUNAME)" == "X86_64"
-SHL2VERSIONMAP:=$(SHL2TARGET).$(CPUNAME).map
-.ELSE
 SHL2VERSIONMAP:=$(SHL2TARGET).map
-.ENDIF          # "$(CPUNAME)" == "X86_64"
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 SHL2DEF     := $(MISC)$/$(SHL2TARGET).def
 SHL2IMPLIB  := i$(SHL2TARGET)
Index: uno_purpenvhelpergcc3.map
===================================================================
RCS file: /cvs/udk/cppu/util/uno_purpenvhelpergcc3.map,v
retrieving revision 1.2
diff -u -r1.2 uno_purpenvhelpergcc3.map
--- openoffice.org.orig/cppu/util/uno_purpenvhelpergcc3.map	9 May 2007 13:51:39 -0000	1.2
+++ openoffice.org/cppu/util/uno_purpenvhelpergcc3.map	16 Aug 2007 13:57:48 -0000
@@ -1,6 +1,6 @@
 UDK_3_0_0 {
 	global:
-        _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameterlPK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
+        _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
         _ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
 
 	local:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1248
retrieving revision 1.1249
diff -u -r1.1248 -r1.1249
--- openoffice.org.spec	16 Aug 2007 12:03:42 -0000	1.1248
+++ openoffice.org.spec	16 Aug 2007 14:03:02 -0000	1.1249
@@ -129,6 +129,7 @@
 Patch64: openoffice.org-2.3.0.ooo80722.sw.stlportism.patch
 Patch65: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
 Patch66: openoffice.org-2.3.0.glibcXXXXX.sal.gettimeofday.patch
+Patch67: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1051,6 +1052,7 @@
 %patch64 -p1 -b .ooo80722.sw.stlportism.patch
 %patch65 -p1 -b .ooo80721.reportdesign.stlportism.patch
 %patch66 -p1 -b .glibcXXXXX.sal.gettimeofday.patch
+%patch67 -p1 -b .ooo80735.cppu.map.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2673,6 +2675,7 @@
   + add workspace.npower7.patch for build failure
   + add openoffice.org-2.3.0.oooXXXXX.sw.stlportism.patch for build failure
   + add openoffice.org-2.3.0.oooXXXXX.reportdesign.stlportism.patch for build failure
+  + add openoffice.org-2.3.0.ooo80735.cppu.map.patch for ppc64
   + replace openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
     with integrated GenericName support
   + drop integrated workspace.libxslt02.patch




More information about the fedora-extras-commits mailing list