rpms/openoffice.org/devel workspace.cmcfixes48.patch, NONE, 1.1 .cvsignore, 1.180, 1.181 openoffice.org.spec, 1.1593, 1.1594 sources, 1.307, 1.308 workspace.cmcfixes46.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Jul 28 11:21:27 UTC 2008
- Previous message (by thread): rpms/ntp/F-9 ntp-4.2.4p4-gettime.patch, NONE, 1.1 ntp-4.2.4p4-resinit.patch, NONE, 1.1 ntp.spec, 1.80, 1.81
- Next message (by thread): rpms/kexec-tools/devel kexec-kdump-howto.txt, 1.2, 1.3 kexec-tools.spec, 1.117, 1.118
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10247
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
workspace.cmcfixes48.patch
Removed Files:
workspace.cmcfixes46.patch
Log Message:
next version
workspace.cmcfixes48.patch:
--- NEW FILE workspace.cmcfixes48.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
@@ -38,8 +38,10 @@
using namespace connectivity::mozab;
#include <MNSFolders.hxx>
#include "MNSProfileDiscover.hxx"
-#include "MNSProfileManager.hxx"
-#include "MNSRunnable.hxx"
+#ifndef MINIMAL_PROFILEDISCOVER
+# include "MNSProfileManager.hxx"
+# include "MNSRunnable.hxx"
+#endif
#include <MNSInit.hxx>
static MozillaBootstrap *pMozillaBootstrap=NULL;
@@ -72,10 +74,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());
}
@@ -157,32 +162,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();
@@ -194,5 +224,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
@@ -1149,6 +1149,20 @@
#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
STD_UNO_LIB_FILE(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: source/xmlsec/nss/seinitializer_nssimpl.cxx
===================================================================
RCS file: /cvs/xml/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx,v
retrieving revision 1.21
diff -u -r1.21 seinitializer_nssimpl.cxx
--- openoffice.org.orig/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 11 Apr 2008 00:38:31 -0000 1.21
+++ openoffice.org/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx 23 Jul 2008 15:36:20 -0000
@@ -68,6 +68,7 @@
#include "pk11func.h"
#ifdef SYSTEM_MOZILLA
#include "nssrenam.h"
+#include "secmod.h"
#endif
#include "cert.h"
#include "cryptohi.h"
@@ -104,6 +107,12 @@
printf("%s",error);
return false ;
}
+
+#if SYSTEM_MOZILLA
+ if (!SECMOD_HasRootCerts())
+ SECMOD_AddNewModule("Root Certs", "libnssckbi.so", 0, 0);
+#endif
+
initialized = 1 ;
}
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
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
#
# langwrap - language wrapper for building resources
#
diff -ru openoffice.org/solenv/bin/modules/osarch.pm openoffice.org/solenv/bin/modules/osarch.pm
--- openoffice.org.orig/solenv/bin/modules/osarch.pm 2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/modules/osarch.pm 2008-01-10 12:26:56.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/solar/bin/perl -w
+#!/usr/bin/perl -w
# ***********************************************************************
# Description:
diff -ru openoffice.org/solenv/bin/pchdelta.py openoffice.org/solenv/bin/pchdelta.py
--- openoffice.org.orig/solenv/bin/pchdelta.py 2008-01-10 12:24:02.000000000 +0000
+++ openoffice.org/solenv/bin/pchdelta.py 2008-01-10 12:27:28.000000000 +0000
@@ -1,4 +1,4 @@
-#!/bin/python
+#!/usr/bin/python
# ------------------------------------------------------------------------------
# Hacky little delta debug tool to figure out the proper includes for a pch file
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- .cvsignore 24 Jul 2008 11:39:49 -0000 1.180
+++ .cvsignore 28 Jul 2008 11:20:56 -0000 1.181
@@ -5,5 +5,4 @@
redhat-registry.tar.gz
redhat-langpacks.tar.gz
evolocal.odb
-bengali.sdf
-DEV300_m27.tar.bz2
+DEV300_m28.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1593
retrieving revision 1.1594
diff -u -r1.1593 -r1.1594
--- openoffice.org.spec 24 Jul 2008 14:00:12 -0000 1.1593
+++ openoffice.org.spec 28 Jul 2008 11:20:56 -0000 1.1594
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 27
+%define ooomilestone 28
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -48,10 +48,9 @@
Source2: http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz
Source3: documentation.openoffice.org-templates.tar.gz
Source4: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
-Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/50963/bengali.sdf
-Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
-Source7: redhat-registry.tar.gz
-Source8: redhat-langpacks.tar.gz
+Source5: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
+Source6: redhat-registry.tar.gz
+Source7: redhat-langpacks.tar.gz
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gcc-c++
BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel
BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -103,12 +102,11 @@
Patch31: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
Patch32: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch33: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch34: workspace.cmcfixes46.patch
-Patch35: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch36: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch37: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch38: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
-Patch39: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch34: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
+Patch35: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+Patch36: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch37: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch38: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -140,7 +138,7 @@
Group: Applications/Productivity
Requires: liberation-fonts
Requires: hunspell-en, hyphen-en
-Requires: hsqldb, xalan-j2, xerces-j2
+Requires: xalan-j2, xerces-j2
PreReq: gtk2 >= 2.9.4
Requires(post): shared-mime-info
Requires(post): desktop-file-utils
@@ -189,7 +187,7 @@
Summary: Database GUI libraries for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: postgresql-jdbc
+Requires: hsqldb, postgresql-jdbc
%description base-core
GUI database libraries for %{name}.
@@ -1221,7 +1219,7 @@
tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
mv -f redhat.soc extras/source/palettes/standard.soc
cp -p %{SOURCE1} extras/source/database/evolocal.odb
-cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
+cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
%patch2 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
%patch3 -p1 -b .rh127576.gtkunixprintdialog.patch
@@ -1256,12 +1254,11 @@
%patch31 -p1 -b .ooo88341.sc.verticalboxes.patch
%patch32 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch33 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch34 -p1 -b .workspace.cmcfixes46.patch
-%patch35 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch36 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch37 -p1 -b .ooo86142.serbiannumbering.patch
-%patch38 -p1 -b .ooo91977.sd.holdreference.patch
-%patch39 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch34 -p1 -b .ooo48400.svx.fixspelling.patch
+%patch35 -p1 -b .ooo90876.connectivity.evoab2.patch
+%patch36 -p1 -b .ooo86142.serbiannumbering.patch
+%patch37 -p1 -b .ooo91977.sd.holdreference.patch
+%patch38 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1329,16 +1326,6 @@
export MAXPROCESSLIMIT=65535
#get core dumps
ulimit -c unlimited
-#build translation tools and apply extra translations, so
-#this can be removed when these translations are upstreamed
-cd transex3/prj
-if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
- build --dlv_switch -link --all
-fi
-deliver -link
-#ooo#64726
-localize -m -x -l bn -f %{SOURCE5}
-cd ../..
#build OOo, on failure make a stab at debugging the crash if any, and
#rebuild un-parallel
@@ -1567,7 +1554,7 @@
#don't prompt user to agree to license
#libtextcat fingerprint location
#rhbz#451512 set better math print options
-tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
+tar xzf %{SOURCE6} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
@@ -1671,7 +1658,7 @@
sh nohelp noacor western \
)
-tar xzf %{SOURCE8}
+tar xzf %{SOURCE7}
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
@@ -2040,7 +2027,6 @@
%{basisinstdir}/program/classes/LuceneHelpWrapper.jar
%{basisinstdir}/program/classes/officebean.jar
%{basisinstdir}/program/classes/report.jar
-%{basisinstdir}/program/classes/sdbc_hsqldb.jar
%{basisinstdir}/program/classes/ScriptFramework.jar
%{basisinstdir}/program/classes/ScriptProviderForJava.jar
%{basisinstdir}/program/classes/table.jar
@@ -2139,7 +2125,6 @@
%{basisinstdir}/program/libfrm%{SOPOST}.so
%{basisinstdir}/program/libguesslang%{SOPOST}.so
%{basisinstdir}/program/libhelplinker%{SOPOST}.so
-%{basisinstdir}/program/libhsqldb2.so
%{basisinstdir}/program/libhyphen%{SOPOST}.so
%{basisinstdir}/program/libi18nregexpgcc3.so
%{basisinstdir}/program/libjdbc2.so
@@ -2764,11 +2749,18 @@
%files base-core
%defattr(-,root,root,-)
+%dir %{basisinstdir}
+%dir %{basisinstdir}/help
+%dir %{basisinstdir}/help/en
%{basisinstdir}/help/en/sdatabase.*
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/classes
+%{basisinstdir}/program/classes/sdbc_hsqldb.jar
%{basisinstdir}/program/libabp%{SOPOST}.so
%{basisinstdir}/program/libadabasui%{SOPOST}.so
%{basisinstdir}/program/libdbp%{SOPOST}.so
%{basisinstdir}/program/libdbu%{SOPOST}.so
+%{basisinstdir}/program/libhsqldb2.so
%{basisinstdir}/program/librpt*%{SOPOST}.so
%dir %{basisinstdir}/program/resource
%{basisinstdir}/program/resource/abp%{UPD}en-US.res
@@ -3570,6 +3562,12 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Mon Jul 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-1
+- next version
+- drop (finally!) integrated ooo#64726 bengali translation fix (April 2006)
+- drop integrated workspace.cmcfixes46.patch
+- Move hsqldb stuff into database rpm
+
* Thu Jul 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.27-1
- next version
- drop integrated workspace.native172.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- sources 24 Jul 2008 11:39:49 -0000 1.307
+++ sources 28 Jul 2008 11:20:56 -0000 1.308
@@ -5,5 +5,4 @@
0cedbc1176b95a6079dbd2759fa6cd36 redhat-registry.tar.gz
261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz
16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
-0c0e868b34329d90a7c9a92f1704775c bengali.sdf
-5962ea25065092dbbb13a56e887b3b09 DEV300_m27.tar.bz2
+2362674845de839488237be1b3b2ccab DEV300_m28.tar.bz2
--- workspace.cmcfixes46.patch DELETED ---
- Previous message (by thread): rpms/ntp/F-9 ntp-4.2.4p4-gettime.patch, NONE, 1.1 ntp-4.2.4p4-resinit.patch, NONE, 1.1 ntp.spec, 1.80, 1.81
- Next message (by thread): rpms/kexec-tools/devel kexec-kdump-howto.txt, 1.2, 1.3 kexec-tools.spec, 1.117, 1.118
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list