rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, NONE, 1.1 openoffice.org.spec, 1.1543, 1.1544

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Jun 20 09:30:28 UTC 2008 

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 
Log Message:
Resolves: rhbz#451708 openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch

openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch:

--- NEW FILE openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch ---
Index: source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx,v
retrieving revision 1.5
diff -u -r1.5 MMozillaBootstrap.cxx
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	17 Sep 2006 02:58:42 -0000	1.5
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	20 Jun 2008 09:12:58 -0000
@@ -48,10 +48,12 @@
 #include <MNSFolders.hxx>
 #endif
 #include "MNSProfileDiscover.hxx"
+#ifndef MINIMAL_PROFILEDISCOVER
 #include "MNSProfileManager.hxx"
 #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
 #include "MNSRunnable.hxx"
 #endif
+#endif
 #include <MNSInit.hxx>
 
 static MozillaBootstrap *pMozillaBootstrap=NULL;
@@ -84,10 +86,13 @@
 void MozillaBootstrap::Init()
 {
 	sal_Bool aProfileExists=sal_False;
+
+#ifndef MINIMAL_PROFILEDISCOVER
 	//This must be call before any mozilla code
 	MNS_Init(aProfileExists);
 
 	m_ProfileManager = new ProfileManager();
+#endif
 	m_ProfileAccess = new ProfileAccess();
 	bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
 }
@@ -169,32 +174,57 @@
 // XProfileManager
 ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->bootupProfile(product,profileName);
+#else
+        return -1;
+#endif
 }
 ::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->shutdownProfile();
+#else
+	return -1;
+#endif
 }
 ::com::sun::star::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->getCurrentProduct();
+#else
+	return ::com::sun::star::mozilla::MozillaProductType_Default;
+#endif
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::getCurrentProfile(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->getCurrentProfile();
+#else
+	return ::rtl::OUString();
+#endif
 }
 ::sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked(  ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return isProfileLocked(getCurrentProduct(),m_ProfileManager->getCurrentProfile());
+#else
+	return true;
+#endif
 }
 ::rtl::OUString SAL_CALL MozillaBootstrap::setCurrentProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	return m_ProfileManager->setCurrentProfile(product,profileName);
+#else
+	return ::rtl::OUString();
+#endif
 }
 
 // XProxyRunner
 ::sal_Int32 SAL_CALL MozillaBootstrap::Run( const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode ) throw (::com::sun::star::uno::RuntimeException)
 {
+#ifndef MINIMAL_PROFILEDISCOVER
 	::rtl::OUString profileName = aCode->getProfileName();
 	::rtl::OUString currProfileName = getCurrentProfile();
 	::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct();
@@ -206,5 +236,105 @@
    	MNSRunnable xRunnable;
 	
 	return xRunnable.StartProxy(aCode);;
+#else
+	return -1;
+#endif
 }
 
+#ifdef MINIMAL_PROFILEDISCOVER
+#include <cppuhelper/factory.hxx>
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::registry::XRegistryKey;
+using ::com::sun::star::lang::XSingleServiceFactory;
+using ::com::sun::star::lang::XMultiServiceFactory;
+
+extern "C" void SAL_CALL component_getImplementationEnvironment(
+                const sal_Char  **ppEnvTypeName,
+                uno_Environment ** /*ppEnv*/
+            )
+{
+    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
+//---------------------------------------------------------------------------------------
+void REGISTER_PROVIDER(
+        const ::rtl::OUString& aServiceImplName,
+        const Sequence< ::rtl::OUString>& Services,
+        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
+{
+    ::rtl::OUString aMainKeyName;
+    aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
+    aMainKeyName += aServiceImplName;
+    aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
+
+    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
+    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
+
+    for (sal_Int32 i=0; i<Services.getLength(); ++i)
+        xNewKey->createKey(Services[i]);
+}
+
+extern "C" sal_Bool SAL_CALL component_writeInfo(
+                void* /*pServiceManager*/,
+                void* pRegistryKey
+            )
+{
+    if (pRegistryKey)
+    try
+    {
+        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
+
+        Sequence< ::rtl::OUString > aSNS( 1 );
+        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+        REGISTER_PROVIDER(
+             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
+             aSNS, xKey);
+
+        return sal_True;
+    }
+    catch (::com::sun::star::registry::InvalidRegistryException& )
+    {
+        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
+    }
+
+    return sal_False;
+}
+
+static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
+{
+        MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
+        return *pBootstrap;
+}
+
+extern "C" void* SAL_CALL component_getFactory(
+                                        const sal_Char* pImplementationName,
+                                        void* pServiceManager,
+                                        void* /*pRegistryKey*/)
+{
+        void* pRet = 0;
+
+        if (pServiceManager)
+        {
+                ::rtl::OUString aImplName( ::rtl::OUString::createFromAscii( pImplementationName ) );
+                Reference< XSingleServiceFactory > xFactory;
+                if (aImplName.equals(  ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap"))  ))
+                {
+                    Sequence< ::rtl::OUString > aSNS( 1 );
+                    aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
+
+                    xFactory = ::cppu::createSingleFactory(
+                        reinterpret_cast< XMultiServiceFactory* > ( pServiceManager),
+                        aImplName, createInstance, aSNS );
+                }
+                if ( xFactory.is() )
+                {
+                    xFactory->acquire();
+                    pRet = xFactory.get();
+                }
+        }
+
+        return pRet;
+};
+
+#endif
Index: source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx,v
retrieving revision 1.6
diff -u -r1.6 MNSProfileDiscover.cxx
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx	24 Oct 2006 15:05:50 -0000	1.6
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx	20 Jun 2008 09:12:59 -0000
@@ -37,6 +37,7 @@
 #include "precompiled_connectivity.hxx"
 
 #include "MNSProfileDiscover.hxx"
+#ifndef MINIMAL_PROFILEDISCOVER
 #include "MNSProfile.hxx"
 
 #include "pratom.h"
@@ -93,6 +94,7 @@
 
 // IID and CIDs of all the services needed
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+#endif
 
 // Registry Keys
 
@@ -112,7 +114,13 @@
 {
 	namespace mozab
 	{
-		ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath)
+		ProfileStruct::ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
+#ifdef MINIMAL_PROFILEDISCOVER
+            const ::rtl::OUString& aProfilePath
+#else
+            nsILocalFile * aProfilePath
+#endif
+          )
 		{
 			product=aProduct;
 			profileName = aProfileName;
@@ -120,6 +128,9 @@
 		}
 		::rtl::OUString ProfileStruct::getProfilePath() 
 		{
+#ifdef MINIMAL_PROFILEDISCOVER
+			return profilePath;
+#else
 			if (profilePath)
 			{
 				nsAutoString path;
@@ -129,9 +140,9 @@
 			}
 			else
                 return ::rtl::OUString();
+#endif
 		}
 
-
 		ProfileAccess::~ProfileAccess()
 		{
 		}
@@ -139,20 +150,24 @@
 		{
 			LoadProductsInfo();
 		}
+
 		sal_Int32 ProfileAccess::LoadProductsInfo()
 		{
+#ifndef MINIMAL_PROFILEDISCOVER
 			//load mozilla profiles to m_ProductProfileList
 			LoadMozillaProfiles();
-			sal_Int32 index=MozillaProductType_Mozilla;
-			sal_Int32 count=m_ProductProfileList[index].mProfileList.size();
+#endif
+			sal_Int32 count=m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size();
 			
 			//load thunderbird profiles to m_ProductProfileList
 			count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird);
+
 			//load firefox profiles to m_ProductProfileList
 			//firefox profile does not containt address book, but maybe others need them
 			count += LoadXPToolkitProfiles(MozillaProductType_Firefox);
 			return count;
 		}
+#ifndef MINIMAL_PROFILEDISCOVER
 		nsresult ProfileAccess::LoadMozillaProfiles()
 		{
 			sal_Int32 index=MozillaProductType_Mozilla;
@@ -256,13 +271,16 @@
 			}
 			return rv;
 		}
+#endif
 		//Thunderbird and firefox profiles are saved in profiles.ini
 		sal_Int32 ProfileAccess::LoadXPToolkitProfiles(MozillaProductType product)
 		{
 			sal_Int32 index=product;
 			ProductStruct &m_Product = m_ProductProfileList[index];
 
+#ifndef MINIMAL_PROFILEDISCOVER
 			nsresult rv;
+#endif
 			::rtl::OUString regDir = getRegistryDir(product);
             ::rtl::OUString profilesIni( regDir );
             profilesIni += ::rtl::OUString::createFromAscii( "profiles.ini" );
@@ -309,6 +327,7 @@
 						isRelative = sIsRelative.toInt32();
 					}
 					
+#ifndef MINIMAL_PROFILEDISCOVER
 					nsCOMPtr<nsILocalFile> rootDir;
 					rv = NS_NewLocalFile(EmptyString(), PR_TRUE,
 											getter_AddRefs(rootDir));
@@ -328,8 +347,15 @@
 						rv = rootDir->SetPersistentDescriptor(filePath);
 					}
 					if (NS_FAILED(rv)) continue;
+#endif
 
-					ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,rootDir);
+					ProfileStruct*  profileItem     = new ProfileStruct(product,profileName,
+#ifdef MINIMAL_PROFILEDISCOVER
+							regDir + profilePath
+#else
+							rootDir
+#endif
+						);
 					m_Product.mProfileList[profileName] = profileItem;
 
 					sal_Int32 isDefault = 0;
@@ -345,6 +371,7 @@
 			}
 			return m_Product.mProfileList.size();
 		}
+
 		::rtl::OUString ProfileAccess::getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 		{
 			sal_Int32 index=product;
@@ -357,6 +384,7 @@
 			else
 				return m_Product.mProfileList[profileName]->getProfilePath();
 		}
+
 		::sal_Int32 ProfileAccess::getProfileCount( ::com::sun::star::mozilla::MozillaProductType product) throw (::com::sun::star::uno::RuntimeException)
 		{
 			sal_Int32 index=product;
@@ -380,6 +408,7 @@
 			
 			return m_Product.mProfileList.size();
 		}
+
 		::rtl::OUString ProfileAccess::getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException)
 		{
 			sal_Int32 index=product;
@@ -397,6 +426,7 @@
 			ProfileStruct * aProfile = (*m_Product.mProfileList.begin()).second;
 			return aProfile->getProfileName();
 		}
+#ifndef MINIMAL_PROFILEDISCOVER
 		nsresult ProfileAccess::isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist)
 		{
 			nsresult rv;
@@ -455,9 +485,12 @@
 			return nExist;
 		}
 
-
+#endif
 		::sal_Bool ProfileAccess::isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 		{
+#ifdef MINIMAL_PROFILEDISCOVER
+			return sal_True;
+#else
 			::rtl::OUString path = getProfilePath(product,profileName);
 			if (!path.getLength())
 				return sal_True;
@@ -481,7 +514,9 @@
 			if (rv)
 				return sal_True;
 			return sal_False;
+#endif
 		}
+
 		::sal_Bool ProfileAccess::getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
 		{
 			sal_Int32 index=product;
@@ -493,7 +528,7 @@
 			else
 				return sal_True;
 		}
-
-
 	}
 }
+
+
Index: source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx,v
retrieving revision 1.4
diff -u -r1.4 MNSProfileDiscover.hxx
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx	20 Jun 2006 01:48:25 -0000	1.4
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx	20 Jun 2008 09:12:59 -0000
@@ -36,7 +36,9 @@
 #ifndef __MNSProfileDiscover_h___
 #define __MNSProfileDiscover_h___
 
+#ifndef MINIMAL_PROFILEDISCOVER
 #include "mozilla_profile_discover.h"
+#endif
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -81,15 +83,27 @@
 		class ProfileStruct
 		{
 		public:
-			ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath);
+			ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,
+#ifdef MINIMAL_PROFILEDISCOVER
+                          const ::rtl::OUString &aProfilePath
+#else
+                          nsILocalFile * aProfilePath
+#endif
+                            );
 			MozillaProductType getProductType() { return product;}
 			::rtl::OUString getProfileName(){ return profileName;}
 			::rtl::OUString getProfilePath() ;
+#ifndef MINIMAL_PROFILEDISCOVER
 			nsILocalFile	*getProfileLocal(){ return profilePath;}
+#endif
 		protected:
 			MozillaProductType product;
 			::rtl::OUString profileName;
+#ifdef MINIMAL_PROFILEDISCOVER
+			::rtl::OUString profilePath;
+#else
 			nsCOMPtr<nsILocalFile> profilePath;
+#endif
 		};
 
 		class ProductStruct
@@ -115,16 +129,18 @@
 			::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException);
 			::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
 			::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException);
-
 		protected:
 			ProductStruct m_ProductProfileList[4];
 			sal_Int32 LoadProductsInfo();
+#ifndef MINIMAL_PROFILEDISCOVER
 			nsresult  LoadMozillaProfiles();
+#endif
 			sal_Int32 LoadXPToolkitProfiles(MozillaProductType product);
-
+#ifndef MINIMAL_PROFILEDISCOVER
 			//used by isProfileLocked
 			nsresult isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist);
 			nsresult isLockExist(nsILocalFile* aFile);
+#endif
 		};
 
 	}
Index: source/drivers/mozab/bootstrap/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/makefile.mk	27 Jun 2007 13:56:25 -0000	1.11
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/makefile.mk	20 Jun 2008 09:15:43 -0000
@@ -55,30 +55,38 @@
 
 .INCLUDE : settings.mk
 
-.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
-dummy:
-	@echo "		Not building the mozillasrc stuff in OpenOffice.org build"
-	@echo "		dependency to Mozilla developer snapshots not feasable at the moment"
-
-.ELSE
-
 .INCLUDE :  $(PRJ)$/version.mk
 
 
 #mozilla specific stuff.
 # --- Files -------------------------------------
 
-SLOFILES = \
-	$(SLO)$/MMozillaBootstrap.obj	\
-	$(SLO)$/MNSFolders.obj	\
-	$(SLO)$/MNSProfileDiscover.obj				\
+SLOFILES += \
+	$(SLO)$/MNSINIParser.obj \
+	$(SLO)$/MNSProfileDiscover.obj \
+	$(SLO)$/MMozillaBootstrap.obj \
+	$(SLO)$/MNSFolders.obj
+
+.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+CDEFS+=-DMINIMAL_PROFILEDISCOVER
+
+SHL1TARGET=$(TARGET)
+SHL1OBJS=$(SLOFILES)
+
+SHL1STDLIBS=\
+        $(CPPULIB)       \
+        $(CPPUHELPERLIB) \
+        $(SALLIB)        \
+        $(COMPHELPERLIB)
+
+.ELSE
+SLOFILES += \
 	$(SLO)$/MNSInit.obj			            \
 	$(SLO)$/MNSProfileManager.obj	\
-	$(SLO)$/MNSINIParser.obj	\
 	$(SLO)$/MNSRunnable.obj	\
 	$(SLO)$/MNSProfile.obj					\
 	$(SLO)$/MNSProfileDirServiceProvider.obj
-
+.ENDIF
 
 .IF "$(GUI)"=="UNX"
 .IF "$(COMNAME)"=="sunpro5"
@@ -162,7 +170,6 @@
             -Wno-long-long
 CDEFS     += -DTRACING
 .ENDIF
-.ENDIF
 
 SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
 
diff -ru scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	2008-06-19 15:29:16.000000000 +0100
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	2008-06-19 15:31:54.000000000 +0100
@@ -1438,7 +1438,9 @@
   #endif
 End
 
-#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+#if !defined(MACOSX) 
+
+#if ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
 
 File gid_File_Lib_Mozab_2
     TXT_FILE_BODY;
@@ -1452,6 +1454,22 @@
   #endif
 End
 
+#else
+
+File gid_File_Lib_Mozbootstrap
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT,PATCH);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
+  #else
+    Name = "libmozbootstrap.dll";
+  #endif
+End
+
+#endif
+
 #endif
 
 STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Wpft,wpft)
diff -ru scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/module_hidden_ooo.scp	2008-06-19 15:29:16.000000000 +0100
+++ openoffice.org/scp2/source/ooo/module_hidden_ooo.scp	2008-06-19 15:31:44.000000000 +0100
@@ -370,6 +370,7 @@
 	gid_File_Lib_Mcnttype,
 	gid_File_Lib_Mozab_2,
 	gid_File_Lib_Mozabdrv,
+	gid_File_Lib_Mozbootstrap,
 	gid_File_Lib_Mysql_2,
 	gid_File_Lib_Odbc_2,
 	gid_File_Lib_Officebean,


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1543
retrieving revision 1.1544
diff -u -r1.1543 -r1.1544
--- openoffice.org.spec	19 Jun 2008 15:55:26 -0000	1.1543
+++ openoffice.org.spec	20 Jun 2008 09:28:48 -0000	1.1544
@@ -120,6 +120,7 @@
 Patch50: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 Patch51: openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
 Patch52: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch53: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1257,6 +1258,7 @@
 %patch50 -p1 -b .ooo48400.svx.fixspelling.patch
 %patch51 -p1 -b .ooo90697.sd.a11ycrash.patch
 %patch52 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch53 -p1 -b .oooXXXXX.connectivity.mozprofilefinder.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2141,6 +2143,7 @@
 %{basisinstdir}/program/liblocaledata_euro.so
 %{basisinstdir}/program/liblocaledata_others.so
 %{basisinstdir}/program/libmcnttype.so
+%{basisinstdir}/program/libmozbootstrap.so
 %{basisinstdir}/program/libmysql2.so
 %{basisinstdir}/program/libodbc2.so
 %{basisinstdir}/program/libodbcbase2.so
@@ -3448,12 +3451,13 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
-* Thu Jun 19 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
+* Fri Jun 20 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.20-1
 - next version
 - Resolves: rhbz#450661 openoffice.org-3.0.0.ooo90306.sw.wrongprotection.patch
 - Resolves: rhbz#448464 openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
 - Resolves: rhbz#450930 openoffice.org-3.0.0.ooo90697.sd.a11ycrash.patch
 - Resolves: rhbz#451512 set better math default print options
+- Resolves: rhbz#451708 openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
 - drop integrated openoffice.org-3.0.0.ooo87882.lingucomponent.systemdicts.patch
 - drop integrated openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
 - drop integrated openoffice.org-3.0.0.ooo90071.chart2.negativecount.patch

More information about the fedora-extras-commits mailing list