rpms/openoffice.org/devel experiment.parallel.patch, NONE, 1.1 openoffice.org.spec, 1.477, 1.478

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Sep 19 13:43:40 UTC 2005


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11367

Modified Files:
	openoffice.org.spec 
Added Files:
	experiment.parallel.patch 
Log Message:
alternative parallel fix

experiment.parallel.patch:
 cppumaker/source/makefile.mk |   60 -------------------------------------------
 source/makefile.mk           |    0 
 2 files changed, 60 deletions(-)

--- NEW FILE experiment.parallel.patch ---
Index: source/makefile.mk
===================================================================
RCS file: /cvs/udk/cppuhelper/source/makefile.mk,v
retrieving revision 1.40
diff -u -p -u -r1.40 makefile.mk
--- openoffice.org.orig/cppumaker/source/makefile.mk	8 Sep 2005 09:28:11 -0000	1.40
+++ openoffice.org/cppumaker/source/makefile.mk	19 Sep 2005 13:36:17 -0000
@@ -51,67 +51,7 @@ UNIXVERSIONNAMES=UDK
 
 # --- Files --------------------------------------------------------
 
-#UNOUCRRDB=$(OUT)$/bin$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRDEP=$(UNOUCRRDB)
-UNOUCROUT=$(OUT)$/inc
 INCPRE+=$(OUT)$/inc $(OUT)$/inc$/private
-
-CPPUMAKERFLAGS=
-
-UNOTYPES= \
-		com.sun.star.registry.XSimpleRegistry		\
-		com.sun.star.registry.XImplementationRegistration \
-		com.sun.star.container.XSet			\
-		com.sun.star.container.XNameAccess		\
-		com.sun.star.uno.XWeak 				\
-		com.sun.star.uno.XAggregation 			\
-		com.sun.star.uno.XComponentContext		\
-		com.sun.star.uno.XUnloadingPreference    	\
-		com.sun.star.uno.DeploymentException    	\
-        com.sun.star.uno.RuntimeException \
-		com.sun.star.lang.WrappedTargetRuntimeException \
-		com.sun.star.lang.DisposedException 		\
-		com.sun.star.lang.XMultiServiceFactory 		\
-		com.sun.star.lang.XSingleServiceFactory 	\
-		com.sun.star.lang.XMultiComponentFactory 	\
-		com.sun.star.lang.XSingleComponentFactory 	\
-		com.sun.star.lang.XServiceInfo 			\
-		com.sun.star.lang.XInitialization 		\
-		com.sun.star.lang.XEventListener 		\
-		com.sun.star.reflection.XIdlReflection 		\
-		com.sun.star.reflection.XIdlClass 		\
-		com.sun.star.reflection.XIdlClassProvider	\
-		com.sun.star.reflection.XIndirectTypeDescription	\
-		com.sun.star.reflection.XMethodParameter		\
-		com.sun.star.reflection.XInterfaceMemberTypeDescription	\
-		com.sun.star.reflection.XTypeDescription		\
-		com.sun.star.reflection.XEnumTypeDescription		\
-		com.sun.star.reflection.XArrayTypeDescription		\
-		com.sun.star.reflection.XInterfaceAttributeTypeDescription \
-		com.sun.star.reflection.XInterfaceMethodTypeDescription	\
-		com.sun.star.reflection.XInterfaceTypeDescription2	\
-		com.sun.star.reflection.XCompoundTypeDescription	\
-        com.sun.star.reflection.XStructTypeDescription \
-		com.sun.star.reflection.XUnionTypeDescription	\
-		com.sun.star.beans.XPropertySet 		\
-		com.sun.star.beans.XMultiPropertySet 		\
-		com.sun.star.beans.PropertyValue 		\
-		com.sun.star.beans.XFastPropertySet 		\
-		com.sun.star.beans.PropertyAttribute 		\
-		com.sun.star.container.XNameContainer \
-		com.sun.star.container.XHierarchicalNameAccess	\
-		com.sun.star.registry.XRegistryKey		\
-		com.sun.star.loader.XImplementationLoader	\
-		com.sun.star.lang.XTypeProvider			\
-		com.sun.star.lang.XComponent			\
-		com.sun.star.uno.XCurrentContext		\
-		com.sun.star.security.XAccessController		\
-		com.sun.star.security.RuntimePermission		\
-		com.sun.star.io.FilePermission			\
-		com.sun.star.io.IOException			\
-		com.sun.star.connection.SocketPermission	\
-		com.sun.star.util.XMacroExpander
 
 .IF "$(debug)" != ""
 # msvc++: no inlining for debugging


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -r1.477 -r1.478
--- openoffice.org.spec	19 Sep 2005 10:45:01 -0000	1.477
+++ openoffice.org.spec	19 Sep 2005 13:43:38 -0000	1.478
@@ -205,6 +205,7 @@
 Patch58: workspace.cmcfixes18.patch
 Patch59: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
 Patch60: openoffice.org-1.9.130.ooo54708.sc.patch
+Patch61: experiment.parallel.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -875,6 +876,7 @@
 %patch58 -p1 -b .workspace.cmcfixes18.patch
 %patch59 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %patch60 -p1 -b .ooo54708.sc.patch
+%patch61 -p1 -b experiment.parallel.patch
 
 %if %{includeexternals}
 #start ludicrous workaround




More information about the fedora-cvs-commits mailing list