Author: dj
Date: 2005-11-07 21:05:20 -0700 (Mon, 07 Nov 2005)
New Revision: 1247
Added:
trunk/OOo/OOo_2.0.0-gcc4-1.patch
trunk/OOo/OOo_2.0.0-jdk_1.5-1.patch
trunk/OOo/OOo_2.0.0-nptl-1.patch
trunk/OOo/OOo_2.0.0-pkgconfig_0.17-1.patch
Removed:
trunk/OOo/OpenSP-1.5.1-LITLEN-1.patch
trunk/OOo/OpenSP-1.5.1-gcc34-1.patch
Log:
Added OOo-2.0.0 patches, removed misplaced OpenSP patches.
Added: trunk/OOo/OOo_2.0.0-gcc4-1.patch
===================================================================
--- trunk/OOo/OOo_2.0.0-gcc4-1.patch 2005-11-07 17:13:21 UTC (rev 1246)
+++ trunk/OOo/OOo_2.0.0-gcc4-1.patch 2005-11-08 04:05:20 UTC (rev 1247)
@@ -0,0 +1,225 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2005-11-07
+Origin: OOo CVS, ooo-build, and RedHat
+Initial Package Version: 2.0.0
+Description: Fixes build issues with gcc-4.
+
+--- OOo_2.0.0-orig/moz/mozilla-source-1.7.5.patch 2005-09-22
08:35:49.000000000 -0500
++++ OOo_2.0.0/moz/mozilla-source-1.7.5.patch 2005-10-19 20:55:19.000000000
-0500
+@@ -7098,3 +7098,14 @@
+ #ifndef NSSPKI1T_H
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
++--- misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h 2005-10-19
20:52:38.000000000 -0500
+++++ misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h 2005-10-19
20:53:16.000000000 -0500
++@@ -152,7 +152,7 @@
++ uint8 TagPart() const
++ {return (uint8) (flags & XPT_TDP_TAGMASK);}
++
++- enum
+++ enum xptinfo_enum_1
++ {
++ T_I8 = TD_INT8 ,
++ T_I16 = TD_INT16 ,
+--- OOo_2.0.0-orig/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
2005-09-08 01:24:31.000000000 -0500
++++ OOo_2.0.0/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
2005-10-19 20:47:07.000000000 -0500
+@@ -370,7 +370,7 @@
+
+ // if shutDownType is not a well know value, skip the notifications
+ // see DoOnShutdown() in nsAppRunner.cpp for where we use this behaviour
to our benefit
+- if (shutDownType == SHUTDOWN_PERSIST || shutDownType == SHUTDOWN_CLEANSE)
{
++ if (shutDownType == PRUint32(SHUTDOWN_PERSIST) || shutDownType ==
PRUint32(SHUTDOWN_CLEANSE)) {
+ nsCOMPtr<nsIObserverService> observerService =
+ do_GetService("@mozilla.org/observer-service;1", &rv);
+ NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE);
+@@ -379,7 +379,7 @@
+
+ NS_NAMED_LITERAL_STRING(cleanseString, "shutdown-cleanse");
+ NS_NAMED_LITERAL_STRING(persistString, "shutdown-persist");
+- const nsAFlatString& context = (shutDownType == SHUTDOWN_CLEANSE) ?
cleanseString : persistString;
++ const nsAFlatString& context = (shutDownType ==
PRUint32(SHUTDOWN_CLEANSE)) ? cleanseString : persistString;
+
+ // Phase 1: See if anybody objects to the profile being changed.
+ mProfileChangeVetoed = PR_FALSE;
+---
OOo_2.0.0-orig/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
2005-09-08 01:28:06.000000000 -0500
++++ OOo_2.0.0/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
2005-10-19 20:48:41.000000000 -0500
+@@ -303,7 +303,7 @@
+ case nsILDAPMessage::RES_BIND:
+ rv = aMessage->GetErrorCode(&errCode);
+ // if the login failed
+- if (errCode != nsILDAPErrors::SUCCESS) {
++ if (errCode != PRInt32(nsILDAPErrors::SUCCESS)) {
+ setConnectionStatus( sal_False );
+ }
+ else
+--- OOo_2.0.0-orig/sd/source/ui/app/optsitem.cxx 2005-09-08
22:43:01.000000000 -0500
++++ OOo_2.0.0/sd/source/ui/app/optsitem.cxx 2005-10-25 22:51:14.000000000
-0500
+@@ -126,8 +126,8 @@
+ {
+ if( !mbInit )
+ {
+- SdOptionsGeneric* pThis = (SdOptionsGeneric*) this;
+-
++// SdOptionsGeneric* pThis = (SdOptionsGeneric*) this;
++ SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this);
+ if( !mpCfgItem )
+ pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree
);
+
+@@ -379,7 +379,10 @@
+ int SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unterschiedliche Typen"
);
+- return( (SdOptionsLayout&) *this == (const SdOptionsLayout&)(const
SdOptionsLayoutItem&) rAttr );
++// return( (SdOptionsLayout&) *this == (const SdOptionsLayout&)(const
SdOptionsLayoutItem&) rAttr );
++ const SdOptionsLayoutItem& rRHS =
++ dynamic_cast<const SdOptionsLayoutItem&>(rAttr);
++ return SdOptionsLayout::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+@@ -522,7 +525,10 @@
+ int SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+- return( (SdOptionsContents&) *this == (const SdOptionsContents&)(const
SdOptionsContentsItem&) rAttr );
++// return( (SdOptionsContents&) *this == (const SdOptionsContents&)(const
SdOptionsContentsItem&) rAttr );
++ const SdOptionsContentsItem& rRHS =
++ dynamic_cast<const SdOptionsContentsItem&>(rAttr);
++ return SdOptionsContents::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+@@ -850,7 +856,10 @@
+ int SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+- return( (SdOptionsMisc&) *this == (const SdOptionsMisc&)(const
SdOptionsMiscItem&) rAttr );
++// return( (SdOptionsMisc&) *this == (const SdOptionsMisc&)(const
SdOptionsMiscItem&) rAttr );
++ const SdOptionsMiscItem& rRHS =
++ dynamic_cast<const SdOptionsMiscItem&>(rAttr);
++ return SdOptionsMisc::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+@@ -1060,7 +1069,10 @@
+ int SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+- return( (SdOptionsSnap&) *this == (const SdOptionsSnap&)(const
SdOptionsSnapItem&) rAttr );
++// return( (SdOptionsSnap&) *this == (const SdOptionsSnap&)(const
SdOptionsSnapItem&) rAttr );
++ const SdOptionsSnapItem& rRHS =
++ dynamic_cast<const SdOptionsSnapItem&>(rAttr);
++ return SdOptionsSnap::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+@@ -1195,7 +1207,10 @@
+ int SdOptionsZoomItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+- return( (SdOptionsZoom&) *this == (const SdOptionsZoom&)(const
SdOptionsZoomItem&) rAttr );
++// return( (SdOptionsZoom&) *this == (const SdOptionsZoom&)(const
SdOptionsZoomItem&) rAttr );
++ const SdOptionsZoomItem& rRHS =
++ dynamic_cast<const SdOptionsZoomItem&>(rAttr);
++ return SdOptionsZoom::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+@@ -1686,7 +1701,10 @@
+ int SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
+ {
+ DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unterschiedliche Typen" );
+- return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const
SdOptionsPrintItem&) rAttr );
++// return( (SdOptionsPrint&) *this == (const SdOptionsPrint&)(const
SdOptionsPrintItem&) rAttr );
++ const SdOptionsPrintItem& rRHS =
++ dynamic_cast<const SdOptionsPrintItem&>(rAttr);
++ return SdOptionsPrint::operator==(rRHS);
+ }
+
+ // -----------------------------------------------------------------------
+--- OOo_2.0.0-orig/svx/source/editeng/forbiddencharacterstable.cxx
2005-09-08 17:32:46.000000000 -0500
++++ OOo_2.0.0/svx/source/editeng/forbiddencharacterstable.cxx 2005-10-25
19:31:45.000000000 -0500
+@@ -62,8 +62,14 @@
+ ForbiddenCharactersInfo* pInf = Get( nLanguage );
+ if ( !pInf && bGetDefault && mxMSF.is() )
+ {
++ const SvxForbiddenCharactersTableImpl *pConstImpl =
++ dynamic_cast<const
SvxForbiddenCharactersTableImpl*>(this);
++ SvxForbiddenCharactersTableImpl* pImpl =
++
const_cast<SvxForbiddenCharactersTableImpl*>(pConstImpl);
+ pInf = new ForbiddenCharactersInfo;
+- ((SvxForbiddenCharactersTableImpl*)this)->Insert( nLanguage,
pInf );
++
++// ((SvxForbiddenCharactersTableImpl*)this)->Insert( nLanguage,
pInf );
++ pImpl->Insert( nLanguage, pInf );
+ pInf->bTemporary = TRUE;
+ LocaleDataWrapper aWrapper( mxMSF, SvxCreateLocale( nLanguage )
);
+ pInf->aForbiddenChars = aWrapper.getForbiddenCharacters();
+--- OOo_2.0.0-orig/svx/source/unoedit/unotext2.cxx 2005-09-08
20:12:37.000000000 -0500
++++ OOo_2.0.0/svx/source/unoedit/unotext2.cxx 2005-10-25 20:12:07.000000000
-0500
+@@ -69,7 +69,8 @@
+ SvxUnoTextContentEnumeration::SvxUnoTextContentEnumeration( const
SvxUnoTextBase& _rText ) throw()
+ : rText( _rText )
+ {
+- xParentText = (text::XText*)&_rText;
++// xParentText = (text::XText*)&_rText;
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
+ if( rText.GetEditSource() )
+ pEditSource = rText.GetEditSource()->Clone();
+ else
+@@ -150,7 +151,8 @@
+ aDisposeListeners(aDisposeContainerMutex),
+ bDisposing( sal_False )
+ {
+- xParentText = (text::XText*)&rText;
++// xParentText = (text::XText*)&rText;
++ xParentText = const_cast<SvxUnoTextBase*>(&rText);
+ if( GetEditSource() && GetEditSource()->GetTextForwarder() )
+ SetSelection( ESelection( nParagraph,0, nParagraph,
GetEditSource()->GetTextForwarder()->GetTextLen( nParagraph ) ) );
+ }
+@@ -417,7 +419,8 @@
+ // ====================================================================
+
+ SvxUnoTextRangeEnumeration::SvxUnoTextRangeEnumeration( const SvxUnoTextBase&
rText, sal_uInt16 nPara ) throw()
+-: xParentText( (text::XText*)&rText ),
++//: xParentText( (text::XText*)&rText ),
++: xParentText( const_cast<SvxUnoTextBase*>(&rText) ),
+ rParentText( rText ),
+ nParagraph( nPara ),
+ nNextPortion( 0 )
+@@ -508,7 +511,8 @@
+
+ SvxUnoTextCursor::SvxUnoTextCursor( const SvxUnoTextBase& rText ) throw()
+ : SvxUnoTextRangeBase(rText),
+- xParentText( (text::XText*)&rText)
++// xParentText( (text::XText*)&rText)
++ xParentText( const_cast<SvxUnoTextBase*>(&rText))
+ {
+ }
+
+--- OOo_2.0.0-orig/svx/source/editeng/impedit2.cxx 2005-09-08
17:33:36.000000000 -0500
++++ OOo_2.0.0/svx/source/editeng/impedit2.cxx 2005-10-25 20:04:08.000000000
-0500
+@@ -33,6 +33,8 @@
+ *
+ ************************************************************************/
+
++#include <stdio.h>
++
+ #include <eeng_pch.hxx>
+
+ #pragma hdrstop
+@@ -1631,7 +1633,13 @@
+ }
+
+ if ( rTypes[0].nScriptType == i18n::ScriptType::WEAK )
+- rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ?
rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
++// rTypes[0].nScriptType = ( rTypes.Count() > 1 ) ?
rTypes[1].nScriptType : GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
++ {
++ if ( rTypes.Count() > 1 )
++ rTypes[0].nScriptType = rTypes[1].nScriptType;
++ else
++ rTypes[0].nScriptType =
GetI18NScriptTypeOfLanguage( GetDefaultLanguage() );
++ }
+ }
+ }
+
Added: trunk/OOo/OOo_2.0.0-jdk_1.5-1.patch
===================================================================
--- trunk/OOo/OOo_2.0.0-jdk_1.5-1.patch 2005-11-07 17:13:21 UTC (rev 1246)
+++ trunk/OOo/OOo_2.0.0-jdk_1.5-1.patch 2005-11-08 04:05:20 UTC (rev 1247)
@@ -0,0 +1,391 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2005-11-07
+Initial Package Version: 2.0.0
+Origin: ooo-build and self
+Description: Fixes compilation with jdk-1.5.0
+Upstream Status: Targeted in issuezilla for 2.0.1
+
+diff -Naur OOo_2.0.0-orig/XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java
OOo_2.0.0/XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java
+--- OOo_2.0.0-orig/XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/XmlSearch/src/com/sun/xmlsearch/db/VectorBtree.java
2005-10-19 19:52:45.000000000 -0500
+@@ -248,10 +248,10 @@
+ return accessBlock(bl.integerAt(index*4));
+ }
+
+- public static void assert(boolean assertion) {
++ /*public static void assert(boolean assertion) {
+ if (assertion == false)
+ System.err.println("assertion failed");
+- }
++ }*/
+
+ public int getIteratorBufferLength() {
+ return _blockSize + _vecLen*2;
+diff -Naur OOo_2.0.0-orig/beanshell/bsh-2.0b4-src.patch
OOo_2.0.0/beanshell/bsh-2.0b4-src.patch
+--- OOo_2.0.0-orig/beanshell/bsh-2.0b4-src.patch 1969-12-31
18:00:00.000000000 -0600
++++ OOo_2.0.0/beanshell/bsh-2.0b4-src.patch 2005-10-19 19:52:45.000000000
-0500
+@@ -0,0 +1,95 @@
++--- misc/build/BeanShell/build.xml 2003-12-19 17:04:47.000000000 +0000
+++++ misc/build/BeanShell/build.xml 2003-12-19 17:53:18.000000000 +0000
++@@ -17,7 +17,7 @@
++ up the build dir! It has to be done manually the first time
(or put
++ in the jar file). There must be a way to fix this...
++ -->
++-<project name="beanshell" default="compile" basedir=".">
+++<project name="beanshell" default="jarall" basedir=".">
++
++ <!-- Project Configuration -->
++
++@@ -81,6 +84,9 @@
++ value="bsh/servlet/*"/>
++ -->
++
+++ <property name="exclude-servlet"
+++ value="bsh/servlet/*"/>
+++
++ <!-- Legacy excludes. Comment this *out* to build these legacy items
-->
++ <property name="legacy-excludes"
++ value="bsh/JThis.java"/>
++--- misc/build/BeanShell/makefile.mk 1970-01-01 01:00:00.000000000 +0100
+++++ misc/build/BeanShell/makefile.mk 2003-12-19 17:04:47.000000000 +0000
++@@ -1 +1,70 @@
++-dummy
+++#*************************************************************************
+++#
+++# $RCSfile: bsh-2.0b1-src.patch,v $
+++#
+++# $Revision: 1.2 $
+++#
+++# last change: $Author: kz $ $Date: 2005/03/01 13:13:04 $
+++#
+++# The Contents of this file are made available subject to the terms of
+++# either of the following licenses
+++#
+++# - GNU Lesser General Public License Version 2.1
+++# - Sun Industry Standards Source License Version 1.1
+++#
+++# Sun Microsystems Inc., October, 2000
+++#
+++# GNU Lesser General Public License Version 2.1
+++# =============================================
+++# Copyright 2000 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
+++#
+++#
+++# Sun Industry Standards Source License Version 1.1
+++# =================================================
+++# The contents of this file are subject to the Sun Industry Standards
+++# Source License Version 1.1 (the "License"); You may not use this file
+++# except in compliance with the License. You may obtain a copy of the
+++# License at http://www.openoffice.org/license.html.
+++#
+++# Software provided under this License is provided on an "AS IS" basis,
+++# WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+++# WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+++# MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+++# See the License for the specific provisions governing your rights and
+++# obligations concerning the Software.
+++#
+++# The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+++#
+++# Copyright: 2000 by Sun Microsystems, Inc.
+++#
+++# All Rights Reserved.
+++#
+++# Contributor(s): _______________________________________
+++#
+++#
+++#
+++#*************************************************************************
+++
+++PRJ=..$/..$/..$/..
+++PRJNAME=ooo_beanshell
+++TARGET=jarall
+++
+++.INCLUDE : ant.mk
+++
+++ALLTAR : ANTBUILD
+++
+diff -Naur OOo_2.0.0-orig/beanshell/makefile.mk OOo_2.0.0/beanshell/makefile.mk
+--- OOo_2.0.0-orig/beanshell/makefile.mk 2005-10-19 20:21:40.000000000
-0500
++++ OOo_2.0.0/beanshell/makefile.mk 2005-10-19 19:52:45.000000000 -0500
+@@ -45,9 +45,9 @@
+
+ # --- Files --------------------------------------------------------
+
+-TARFILE_NAME=bsh-2.0b1-src
++TARFILE_NAME=bsh-2.0b4-src
+ TARFILE_ROOTDIR=BeanShell
+-PATCH_FILE_NAME=bsh-2.0b1-src.patch
++PATCH_FILE_NAME=bsh-2.0b4-src.patch
+
+ ADDITIONAL_FILES=makefile.mk
+
+diff -Naur OOo_2.0.0-orig/beanshell/prj/d.lst OOo_2.0.0/beanshell/prj/d.lst
+--- OOo_2.0.0-orig/beanshell/prj/d.lst 2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/beanshell/prj/d.lst 2005-10-19 19:52:45.000000000 -0500
+@@ -1 +1 @@
+-..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b1.jar %_DEST%\bin%_EXT%\bsh.jar
++..\%__SRC%\misc\build\BeanShell\dist\bsh-2.0b4.jar %_DEST%\bin%_EXT%\bsh.jar
+diff -Naur OOo_2.0.0-orig/filter/source/config/fragments/makefile.mk
OOo_2.0.0/filter/source/config/fragments/makefile.mk
+--- OOo_2.0.0-orig/filter/source/config/fragments/makefile.mk 2005-10-19
20:21:40.000000000 -0500
++++ OOo_2.0.0/filter/source/config/fragments/makefile.mk 2005-10-19
19:52:45.000000000 -0500
+@@ -152,7 +152,7 @@
+ .IF "$(JDK)" == "gcj"
+ PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar
org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ELSE
+-PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
++PACKLANG := $(JAVA) $(JAVACPS) $(SOLARVERSION)/$(INPATH)/bin/xalan.jar
org.apache.xalan.xslt.Process -XSL langfilter.xsl
+ .ENDIF
+ .ENDIF
+
+diff -Naur
OOo_2.0.0-orig/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
OOo_2.0.0/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+--- OOo_2.0.0-orig/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
2005-10-19 19:52:45.000000000 -0500
+@@ -470,10 +470,10 @@
+ throws com.sun.star.uno.RuntimeException
+ {
+ if (eventListener != null) {
+- java.util.Enumeration enum = eventListener.elements();
++ java.util.Enumeration enumer = eventListener.elements();
+
+- while (enum.hasMoreElements()) {
+- XEventListener listener = (XEventListener) enum.nextElement();
++ while (enumer.hasMoreElements()) {
++ XEventListener listener = (XEventListener)
enumer.nextElement();
+ listener.disposing(new com.sun.star.lang.EventObject(this));
+ }
+ }
+@@ -702,16 +702,16 @@
+ public XEnumeration createContentEnumeration( String serviceName )
+ throws com.sun.star.uno.RuntimeException
+ {
+- XEnumeration enum = null;
++ XEnumeration enumer = null;
+
+ java.util.Vector serviceList = (java.util.Vector)
factoriesByServiceNames.get(serviceName);
+
+ if (serviceList != null)
+- enum = new ServiceEnumerationImpl( serviceList.elements() );
++ enumer = new ServiceEnumerationImpl( serviceList.elements() );
+ else
+- enum = new ServiceEnumerationImpl();
++ enumer = new ServiceEnumerationImpl();
+
+- return enum;
++ return enumer;
+ }
+
+ /**
+@@ -779,11 +779,11 @@
+ /**
+ * Constructs a new instance with a given enumeration.
+ * <p>
+- * @param enum is the enumeration which should been
wrapped.
++ * @param enumer is the enumeration which should been
wrapped.
+ * @see com.sun.star.container.XEnumeration
+ */
+- public ServiceEnumerationImpl(java.util.Enumeration enum) {
+- enumeration = enum;
++ public ServiceEnumerationImpl(java.util.Enumeration enumer) {
++ enumeration = enumer;
+ }
+
+ /**
+diff -Naur OOo_2.0.0-orig/rhino/rhino1_5R4.patch
OOo_2.0.0/rhino/rhino1_5R4.patch
+--- OOo_2.0.0-orig/rhino/rhino1_5R4.patch 2005-10-19 20:21:40.000000000
-0500
++++ OOo_2.0.0/rhino/rhino1_5R4.patch 2005-10-19 19:52:45.000000000 -0500
+@@ -2610,3 +2610,23 @@
+ ! */
+ ! public void setValueAt(Object aValue, Object node, int column);
+ ! }
++---
misc/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
2005-03-22 06:20:49.000000000 -0600
+++++
misc/build/rhino1_5R4/toolsrc/org/mozilla/javascript/tools/shell/JavaPolicySecurity.java
2005-06-07 18:04:42.000000000 -0500
++@@ -124,7 +124,7 @@
++
++ public JavaPolicySecurity() {
++ // To trigger error on jdk-1.1 with lazy load
++- new CodeSource(null, null);
+++ new CodeSource(null, (java.security.cert.Certificate[])null);
++ }
++
++ protected void callProcessFileSecure(final Context cx,
++@@ -167,7 +167,7 @@
++ }
++
++ private ProtectionDomain getUrlDomain(URL url) {
++- CodeSource cs = new CodeSource(url, null);
+++ CodeSource cs = new CodeSource(url,
(java.security.cert.Certificate[])null);
++ PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
++ return new ProtectionDomain(cs, pc);
++ }
+diff -Naur OOo_2.0.0-orig/sj2/stardiv/app/AppletProps.java
OOo_2.0.0/sj2/stardiv/app/AppletProps.java
+--- OOo_2.0.0-orig/sj2/stardiv/app/AppletProps.java 2005-10-19
20:21:40.000000000 -0500
++++ OOo_2.0.0/sj2/stardiv/app/AppletProps.java 2005-10-19 19:52:45.000000000
-0500
+@@ -112,7 +112,7 @@
+ if (System.getProperty("http.proxyHost") != null) {
+ proxyHost.setText(System.getProperty("http.proxyHost"));
+ proxyPort.setText(System.getProperty("http.proxyPort"));
+- HttpClient.proxyPort =
Integer.valueOf(System.getProperty("http.proxyPort")).intValue();
++ // HttpClient.proxyPort =
Integer.valueOf(System.getProperty("http.proxyPort")).intValue();
+ }
+ else {
+ proxyHost.setText("");
+diff -Naur OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java
OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpIndexer.java
+--- OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpIndexer.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpIndexer.java
2005-10-19 19:52:45.000000000 -0500
+@@ -212,11 +212,11 @@
+ table.close(0);
+
+ System.out.println("Indexing...");
+- Enumeration enum = _hashDocInfo.elements();
++ Enumeration enumer = _hashDocInfo.elements();
+ int cut = 0;
+- while (enum.hasMoreElements() && cut < 100000000) {
++ while (enumer.hasMoreElements() && cut < 100000000) {
+ try {
+- DocInfo info = (DocInfo)
enum.nextElement();
++ DocInfo info = (DocInfo)
enumer.nextElement();
+ String url = info.getURL();
+ if (url == null) {
+ System.out.println(
+@@ -396,11 +396,11 @@
+ }
+
+ void dump() {
+- Enumeration enum = _hash.keys();
++ Enumeration enumer = _hash.keys();
+ int j = 0;
+ String[] list = new String[_hash.size()];
+- while (enum.hasMoreElements()) {
+- list[j++] = (String) enum.nextElement();
++ while (enumer.hasMoreElements()) {
++ list[j++] = (String) enumer.nextElement();
+ }
+
+ Db table;
+@@ -431,11 +431,11 @@
+ }
+
+ void dumpHelptext() {
+- Enumeration enum = _hashHelptext.keys();
++ Enumeration enumer = _hashHelptext.keys();
+ int j = 0;
+ String[] list = new String[_hashHelptext.size()];
+- while (enum.hasMoreElements()) {
+- list[j++] = (String) enum.nextElement();
++ while (enumer.hasMoreElements()) {
++ list[j++] = (String) enumer.nextElement();
+ }
+
+ Db table;
+diff -Naur OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpKeyword.java
OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpKeyword.java
+--- OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpKeyword.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpKeyword.java
2005-10-19 19:52:45.000000000 -0500
+@@ -59,11 +59,11 @@
+ }
+
+ void dump(Db table) {
+- Enumeration enum = _hash.keys();
++ Enumeration enumer = _hash.keys();
+ int j = 0;
+ String[] list = new String[_hash.size()];
+- while (enum.hasMoreElements()) {
+- list[j++] = (String) enum.nextElement();
++ while (enumer.hasMoreElements()) {
++ list[j++] = (String) enumer.nextElement();
+ }
+
+ for (int i = 0; i < list.length; ++i) {
+diff -Naur OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpLinker.java
OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpLinker.java
+--- OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpLinker.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpLinker.java 2005-10-19
19:52:45.000000000 -0500
+@@ -547,10 +547,10 @@
+ baos = streamTable1.get("default/keywords");
+ if (baos != null) {
+ Hashtable anchorToLL = (Hashtable) baos;
+- Enumeration enum = anchorToLL.keys();
++ Enumeration enumer = anchorToLL.keys();
+ String fakedHid =
URLEncoder.encode(documentPath);
+- while (enum.hasMoreElements()) {
+- String anchor = (String)
enum.nextElement();
++ while (enumer.hasMoreElements()) {
++ String anchor = (String)
enumer.nextElement();
+ addBookmark(
+ dbBase,
+ documentPath,
+@@ -640,9 +640,9 @@
+ // last, all files which should be copied into the jarFile
+
/////////////////////////////////////////////////////////////////////////
+
+- Enumeration enum = additionalFiles.keys();
+- while (enum.hasMoreElements()) {
+- String additionalFileKey = (String) enum.nextElement();
++ Enumeration enumer = additionalFiles.keys();
++ while (enumer.hasMoreElements()) {
++ String additionalFileKey = (String)
enumer.nextElement();
+ String additionalFileName =
+ (String) additionalFiles.get(additionalFileKey);
+ copyFileToJarfile(additionalFileName, null,
additionalFileKey);
+diff -Naur
OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpTransformer.java
OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpTransformer.java
+--- OOo_2.0.0-orig/xmlhelp/source/com/sun/star/help/HelpTransformer.java
2005-10-19 20:21:40.000000000 -0500
++++ OOo_2.0.0/xmlhelp/source/com/sun/star/help/HelpTransformer.java
2005-10-19 19:52:45.000000000 -0500
+@@ -14,11 +14,11 @@
+ {
+ String styleName;
+ Hashtable styles;
+- Enumeration enum = defs.getTable().keys();
++ Enumeration enumer = defs.getTable().keys();
+
+- while( enum.hasMoreElements() )
++ while( enumer.hasMoreElements() )
+ {
+- styleName = ( String ) enum.nextElement();
++ styleName = ( String ) enumer.nextElement();
+ styles = defs.getEffectiveStyle( styleName );
+
+ Enumeration styleOptions = styles.keys();
+@@ -112,11 +112,11 @@
+ while( it.hasNext() )
+ {
+ Hashtable curr;
+- Enumeration enum = (curr = ( Hashtable
)it.next()).keys();
+- while( enum.hasMoreElements() )
++ Enumeration enumer = (curr = ( Hashtable
)it.next()).keys();
++ while( enumer.hasMoreElements() )
+ {
+ String str;
+- if( result.get( str = ( String )
enum.nextElement() ) == null )
++ if( result.get( str = ( String )
enumer.nextElement() ) == null )
+ result.put( str,curr.get( str ) );
+ }
+ }
+@@ -129,11 +129,11 @@
+ {
+ String str;
+ Hashtable a = getEffectiveStyle( "p.def1" );
+- Enumeration enum = a.keys();
++ Enumeration enumer = a.keys();
+
+- while( enum.hasMoreElements() )
++ while( enumer.hasMoreElements() )
+ {
+- System.out.println( (str = ( String )
enum.nextElement()) + " : " + ((String)a.get(str)) );
++ System.out.println( (str = ( String )
enumer.nextElement()) + " : " + ((String)a.get(str)) );
+ }
+ }
+
Added: trunk/OOo/OOo_2.0.0-nptl-1.patch
===================================================================
--- trunk/OOo/OOo_2.0.0-nptl-1.patch 2005-11-07 17:13:21 UTC (rev 1246)
+++ trunk/OOo/OOo_2.0.0-nptl-1.patch 2005-11-08 04:05:20 UTC (rev 1247)
@@ -0,0 +1,21 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2005-11-07
+Initial Package Version: 1.1.3
+Origin: Gentoo
+Description: Fixes compilation with nptl.
+Upstream Status: Unknown (uneeded for target)
+
+--- OOo_2.0.0-orig/sal/osl/unx/process.c 2005-09-08 09:59:02.000000000
-0500
++++ OOo_2.0.0/sal/osl/unx/process.c 2005-10-19 20:41:48.000000000 -0500
+@@ -507,11 +507,6 @@
+ for (i = 0; data.m_pszEnv[i] != NULL; i++)
+ putenv(data.m_pszEnv[i]);
+
+-#if defined(LINUX)
+- /* mfe: linux likes to have just one thread when the exec family
is called */
+- /* this np function has this purpose ...
*/
+- pthread_kill_other_threads_np();
+-#endif
+ OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]);
+
+ /* Connect std IO to pipe ends */
Added: trunk/OOo/OOo_2.0.0-pkgconfig_0.17-1.patch
===================================================================
--- trunk/OOo/OOo_2.0.0-pkgconfig_0.17-1.patch 2005-11-07 17:13:21 UTC (rev
1246)
+++ trunk/OOo/OOo_2.0.0-pkgconfig_0.17-1.patch 2005-11-08 04:05:20 UTC (rev
1247)
@@ -0,0 +1,53 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2005-11-07
+Initial Package Version: 2.0.0
+Origin: ooo-build
+Description: Fixes compilation with pkg-config versions that do not
+ honor implicit dependencies by default.
+Upstream Status: In ooo-build
+
+--- OOo_2.0.0-orig/shell/source/backends/gconfbe/makefile.mk 2005-09-07
14:47:59.000000000 -0500
++++ OOo_2.0.0/shell/source/backends/gconfbe/makefile.mk 2005-10-19
20:36:06.000000000 -0500
+@@ -56,7 +56,7 @@
+
+ .IF "$(ENABLE_GNOMEVFS)"!=""
+ COMPILER_WARN_ALL=TRUE
+-PKGCONFIG_MODULES=gconf-2.0 gobject-2.0
++PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0 ORBit-2.0
+ .INCLUDE: pkg_config.mk
+
+ .IF "$(OS)" == "SOLARIS"
+--- OOo_2.0.0-orig/ucb/source/ucp/gvfs/makefile.mk 2005-09-09
10:43:39.000000000 -0500
++++ OOo_2.0.0/ucb/source/ucp/gvfs/makefile.mk 2005-10-19 20:36:06.000000000
-0500
+@@ -48,7 +48,7 @@
+
+ .IF "$(ENABLE_GNOMEVFS)"!=""
+ COMPILER_WARN_ALL=TRUE
+-PKGCONFIG_MODULES=gnome-vfs-2.0
++PKGCONFIG_MODULES=gnome-vfs-2.0 glib-2.0 ORBit-2.0 gthread-2.0
+ .INCLUDE: pkg_config.mk
+
+ .IF "$(OS)" == "SOLARIS"
+--- OOo_2.0.0-orig/vcl/util/makefile.mk 2005-10-05 05:29:16.000000000
-0500
++++ OOo_2.0.0/vcl/util/makefile.mk 2005-10-19 20:36:06.000000000 -0500
+@@ -350,7 +350,8 @@
+
+ # gtk plugin
+ .IF "$(ENABLE_GTK)" != ""
+-PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
++PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0 gdk-x11-2.0 gdk-pixbuf-2.0 glib-2.0
gobject-2.0 pango
++
+ .INCLUDE: pkg_config.mk
+
+ LIB4TARGET=$(SLB)$/igtk_plug_
+--- OOo_2.0.0-orig/fpicker/source/unx/gnome/makefile.mk 2005-09-08
18:36:36.000000000 -0500
++++ OOo_2.0.0/fpicker/source/unx/gnome/makefile.mk 2005-10-19
20:36:06.000000000 -0500
+@@ -54,7 +54,7 @@
+
+ .ELSE # we build for GNOME
+
+-PKGCONFIG_MODULES=gtk+-2.0
++PKGCONFIG_MODULES=gtk+-2.0 glib-2.0 gobject-2.0 gdk-pixbuf-2.0 pango
+ .INCLUDE : pkg_config.mk
+
+ # check gtk version
Deleted: trunk/OOo/OpenSP-1.5.1-LITLEN-1.patch
===================================================================
--- trunk/OOo/OpenSP-1.5.1-LITLEN-1.patch 2005-11-07 17:13:21 UTC (rev
1246)
+++ trunk/OOo/OpenSP-1.5.1-LITLEN-1.patch 2005-11-08 04:05:20 UTC (rev
1247)
@@ -1,54 +0,0 @@
-Submitted By: BLFS Book <[email protected]>
-Date: 2003-10-05
-Initial Package Version: 1.5
-Origin: BLFS Book
-Description: Remove some annonying messages when running openjade.
-
-$LastChangedBy: bdubbs $
-$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-diff -Naur OpenSP-1.5/lib/Syntax.cxx OpenSP-1.5-patched/lib/Syntax.cxx
---- OpenSP-1.5/lib/Syntax.cxx 2000-03-14 23:17:25.000000000 +0000
-+++ OpenSP-1.5-patched/lib/Syntax.cxx 2003-05-24 18:36:39.000000000
-+0000
-@@ -24,7 +24,7 @@
- 16,
- 16,
- 16,
-- 32,
-+ 253,
- 96,
- 16,
- 240,
-diff -Naur OpenSP-1.5/unicode/gensyntax.pl
-OpenSP-1.5-patched/unicode/gensyntax.pl
---- OpenSP-1.5/unicode/gensyntax.pl 1999-11-04 08:36:18.000000000
-+0000
-+++ OpenSP-1.5-patched/unicode/gensyntax.pl 2003-05-24
-18:39:53.000000000 +0000
-@@ -185,7 +185,7 @@
-
- QUANTITY SGMLREF -- To be determined --
- ATTSPLEN 1920 -- ?? --
-- LITLEN 240 -- ?? --
-+ LITLEN 8092 -- ?? --
- NAMELEN 240 -- ?? --
- PILEN 1920 -- ?? --
- TAGLEN 1920 -- ?? --
-diff -Naur OpenSP-1.5/unicode/unicode.syn
-OpenSP-1.5-patched/unicode/unicode.syn
---- OpenSP-1.5/unicode/unicode.syn 1999-11-04 08:36:18.000000000
-+0000
-+++ OpenSP-1.5-patched/unicode/unicode.syn 2003-05-24
-18:40:12.000000000 +0000
-@@ -1266,7 +1266,7 @@
-
- QUANTITY SGMLREF -- To be determined --
- ATTSPLEN 1920 -- ?? --
-- LITLEN 240 -- ?? --
-+ LITLEN 8092 -- ?? --
- NAMELEN 240 -- ?? --
- PILEN 1920 -- ?? --
- TAGLEN 1920 -- ?? --
-
-
Deleted: trunk/OOo/OpenSP-1.5.1-gcc34-1.patch
===================================================================
--- trunk/OOo/OpenSP-1.5.1-gcc34-1.patch 2005-11-07 17:13:21 UTC (rev
1246)
+++ trunk/OOo/OpenSP-1.5.1-gcc34-1.patch 2005-11-08 04:05:20 UTC (rev
1247)
@@ -1,20 +0,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2004-04-24
-Initial Package Version: 1.5.1
-Origin: OpenJade SourceForge Patch Page
-Upstream Status: Fixed
-Description: Fixes Compile Issues with GCC 3.4
-
-$LastChangedBy: bdubbs $
-$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
---- OpenSP-1.5.1/include/RangeMap.cxx.orig 2004-04-24 17:39:50.000691400
+0000
-+++ OpenSP-1.5.1/include/RangeMap.cxx 2004-04-24 17:39:59.682536194 +0000
-@@ -7,6 +7,7 @@
- #include "RangeMap.h"
- #include "ISet.h"
- #include "types.h"
-+#include "constant.h"
-
- #ifdef SP_NAMESPACE
- namespace SP_NAMESPACE {
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
