r3148 - trunk/patches

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sat Dec 25 20:19:24 PST 2004


Author: dj
Date: 2004-12-25 21:19:23 -0700 (Sat, 25 Dec 2004)
New Revision: 3148

Added:
   trunk/patches/openoffice-1.1.4-freetype-1.patch
   trunk/patches/openoffice-1.1.4-gcc333-1.patch
   trunk/patches/openoffice-1.1.4-jdk_1.4.2_fix-1.patch
   trunk/patches/openoffice-1.1.4-no_pam-1.patch
   trunk/patches/openoffice-1.1.4-nptl-1.patch
   trunk/patches/openoffice-1.1.4-test_bin_loc-1.patch
Removed:
   trunk/patches/openoffice-1.1.2-no_pam-1.patch
   trunk/patches/openoffice-1.1.3-freetype-1.patch
   trunk/patches/openoffice-1.1.3-gcc333-1.patch
   trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch
   trunk/patches/openoffice-1.1.3-nptl-1.patch
   trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch
Log:
Upating OpenOffice patches

Deleted: trunk/patches/openoffice-1.1.2-no_pam-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.2-no_pam-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.2-no_pam-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,192 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2003-09-21
-Initial Package Version: 1.1rc4
-Origin: None.
-Description: OpenOffice requires PAM headers in /usr/include/security; these headers
-are not available in most of the LFS based systems. This patch removes the need for
-PAM headers by removing the functions that use PAM. This patch is part
-of the BLFS book.
-
-$LastChangedBy$
-$Date$
-
-diff -ur oo_1.1rc4_src.orig/sal/osl/unx/security.c oo_1.1rc4_src/sal/osl/unx/security.c
---- oo_1.1rc4_src.orig/sal/osl/unx/security.c	2003-04-11 09:23:49.000000000 -0500
-+++ oo_1.1rc4_src/sal/osl/unx/security.c	2003-09-21 00:37:09.000000000 -0500
-@@ -133,8 +133,6 @@
-  *
-  */
- 
--#include <security/pam_appl.h>
--
- typedef struct {
- 	char* name;
- 	char* password;
-@@ -143,10 +141,10 @@
- typedef struct {
- 	int (*pam_start)(const char *service_name, const char *user,
- 		     	     const struct pam_conv *pam_conversation,
--		     		 pam_handle_t **pamh);
--	int (*pam_end)          (pam_handle_t *pamh, int pam_status);
--	int (*pam_authenticate) (pam_handle_t *pamh, int flags);
--	int (*pam_acct_mgmt)    (pam_handle_t *pamh, int flags);
-+		     		 void **pamh);
-+	int (*pam_end)          (void *pamh, int pam_status);
-+	int (*pam_authenticate) (void *pamh, int flags);
-+	int (*pam_acct_mgmt)    (void *pamh, int flags);
- } sal_PamModule;
- 
- /*
-@@ -164,69 +162,7 @@
- osl_PamConversation (int num_msg, const struct pam_message **msgm,
-                      struct pam_response **response, void *appdata_ptr)
- {
--	int	  		i;
--	sal_Bool	error;
--	sal_PamData         *pam_data;
--	struct pam_response *p_reply;
--
--	/* resource initialization */
--	pam_data = (sal_PamData*) appdata_ptr;
--	p_reply  = (struct pam_response *) calloc( num_msg, 
--											   sizeof(struct pam_response));
--	if ( p_reply == NULL || pam_data == NULL )
--	{
--		if ( p_reply != NULL )
--			free ( p_reply );
--		*response = NULL;
--		return PAM_CONV_ERR;
--	}
--
--	/* pseudo dialog */
--	error = sal_False;
--	for ( i = 0; i < num_msg ; i++ )
--	{
--		switch ( msgm[ i ]->msg_style )
--		{
--			case PAM_PROMPT_ECHO_OFF: 
--				p_reply[ i ].resp_retcode = 0;
--				p_reply[ i ].resp 		  = strdup( pam_data->password );
--			 	break;
--			case PAM_PROMPT_ECHO_ON:  
--				p_reply[ i ].resp_retcode = 0;
--				p_reply[ i ].resp 		= strdup( pam_data->name );
--				break;
--			case PAM_ERROR_MSG:
--			case PAM_TEXT_INFO:
-- 			case PAM_BINARY_PROMPT:
--			case PAM_BINARY_MSG:
--				p_reply[ i ].resp_retcode 	= 0;
--				p_reply[ i ].resp 			= NULL;
--				break;
--			default:
--				error = sal_True; 
--				break;
--		}
--	}
--
--	/* free resources on error */
--	if ( error )
--	{
--		for ( i = 0; i < num_msg ; i++ )
--			if ( p_reply[ i ].resp )
--			{
--				memset ( p_reply[ i ].resp, 0, 
--						 strlen( p_reply[ i ].resp ) );  
--				free   ( p_reply[ i ].resp );
--			}
--		free ( p_reply );
--
--		*response = NULL;
--		return PAM_CONV_ERR;
--	}
--
--	/* well done */
--	*response = p_reply;
--	return PAM_SUCCESS;
-+	return -1;
- }
- 
- /*
-@@ -239,45 +175,6 @@
- static sal_PamModule* osl_getPAM()
- {
- 	static sal_PamModule *pam_module = NULL;
--	static sal_Bool load_once = sal_False;
--
--	if ( !load_once )
--	{
--		/* get library-handle. cannot use osl-module, since 
-- 		   RTLD_GLOBAL is required for PAM-0.64 RH 5.2 
--		   (but not for PAM-0.66 RH 6.0) */
--		void *pam_hdl;
--		
--		pam_hdl = dlopen( "libpam.so", RTLD_GLOBAL | RTLD_LAZY );  
--		
--		if ( pam_hdl != NULL )
--			pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) );
--		
--		/* load functions */
--		if ( pam_module  != NULL )
--		{
--			pam_module->pam_acct_mgmt = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_acct_mgmt" );
--			pam_module->pam_authenticate 
--									  = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_authenticate" );
--			pam_module->pam_end       = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_end" );
--			pam_module->pam_start     = (int (*)(const char *, const char *, const struct pam_conv *, pam_handle_t **)) dlsym ( pam_hdl, "pam_start" );
--
--			/* free resources, if not completely successful */
--			if (   (pam_module->pam_start 		 == NULL) 
--				|| (pam_module->pam_end 		 == NULL)  
--				|| (pam_module->pam_authenticate == NULL) 
--				|| (pam_module->pam_acct_mgmt 	 == NULL) )
--			{
--				free( pam_module );
--				pam_module = NULL;
--				dlclose( pam_hdl );
--			}
--		}
--
--		/* never try again */
--		load_once = sal_True;
--	}
--
- 	return pam_module;	
- }
- 
-@@ -289,35 +186,6 @@
- osl_PamAuthentification( const sal_Char* name, const sal_Char* password )
- {
- 	sal_Bool success = sal_False;
--
--	sal_PamModule* pam_module;
--
--	pam_module = osl_getPAM();
--	if ( pam_module != NULL )
--	{
--		pam_handle_t   *pam_handle = NULL;
--		struct pam_conv pam_conversation;
--		sal_PamData     pam_data;
--
--		int				return_value;
--
--		pam_data.name     = (char*) name;
--		pam_data.password = (char*) password; 
--	
--		pam_conversation.conv 		 = osl_PamConversation;
--		pam_conversation.appdata_ptr = (void*)(&pam_data); 
--
--  		return_value = pam_module->pam_start( "su", name, 
--			&pam_conversation, &pam_handle);
--		if (return_value == PAM_SUCCESS ) 
--			return_value = pam_module->pam_authenticate(pam_handle, 0);
--  		if (return_value == PAM_SUCCESS ) 
--			return_value = pam_module->pam_acct_mgmt(pam_handle, 0);
--		pam_module->pam_end( pam_handle, return_value );
--	
--		success = (sal_Bool)(return_value == PAM_SUCCESS);
--	}
--
-   	return success;
- }
- 

Deleted: trunk/patches/openoffice-1.1.3-freetype-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.3-freetype-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.3-freetype-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,42 +0,0 @@
-Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org>
-Date: 2004-12-12
-Origin: Self
-Initial Package Version: 1.1.3
-Description: Fixes build when used with system freetype-2.1.8+.
-Upstream Status: Not submitted
-
-$LastChangedBy$
-$Date$
-
---- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_ftyp.cxx	2004-08-27 05:00:20.000000000 -0500
-+++ OOo_1.1.3_src/vcl/source/glyphs/gcach_ftyp.cxx	2004-12-08 01:25:05.690230824 -0600
-@@ -77,12 +77,13 @@
- #include <osl/file.hxx>
- #include <osl/thread.hxx>
- 
--#include "freetype/freetype.h"
--#include "freetype/ftglyph.h"
--#include "freetype/ftoutln.h"
--#include "freetype/tttables.h"
--#include "freetype/tttags.h"
--#include "freetype/ttnameid.h"
-+#include <ft2build.h>
-+#include <freetype/freetype.h>
-+#include <freetype/ftglyph.h>
-+#include <freetype/ftoutln.h>
-+#include <freetype/tttables.h>
-+#include <freetype/tttags.h>
-+#include <freetype/ttnameid.h>
- 
- #ifndef FREETYPE_PATCH
-     // VERSION_MINOR in freetype.h is too coarse
---- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_layout.cxx	2004-01-09 12:13:49.000000000 -0600
-+++ OOo_1.1.3_src/vcl/source/glyphs/gcach_layout.cxx	2004-12-08 01:26:45.845004984 -0600
-@@ -68,6 +68,7 @@
- #endif
- 
- #ifndef _SV_GCACHFTYP_HXX
-+#include <ft2build.h>
- #include <freetype/freetype.h>
- #include <gcach_ftyp.hxx>
- #endif

Deleted: trunk/patches/openoffice-1.1.3-gcc333-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.3-gcc333-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.3-gcc333-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,387 +0,0 @@
-Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org>
-Date: 2004-12-12
-Origin: OOO-Build-1.3.7
-Initial Package Version: 1.1.3
-Description: Fixes build when used with gcc-3.3.3.
-Upstream Status: Not needed
-
-$LastChangedBy$
-$Date$
-
---- OOo_1.1.3_src-orig/icu/makefile.mk	2003-07-16 12:26:10.000000000 -0500
-+++ OOo_1.1.3_src/icu/makefile.mk	2004-12-19 00:10:13.591321672 -0600
-@@ -93,7 +93,7 @@
- 
- CONFIGURE_DIR=source
- 
--CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
-+CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no --enable-extras=no'
- 
- #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
- CONFIGURE_FLAGS=
-diff -Naur OOo_1.1.3_src-orig/stlport/STLport-4.5.3.patch OOo_1.1.3_src/stlport/STLport-4.5.3.patch
---- OOo_1.1.3_src-orig/stlport/STLport-4.5.3.patch	2003-03-27 05:54:46.000000000 -0600
-+++ OOo_1.1.3_src/stlport/STLport-4.5.3.patch	2004-12-15 22:26:18.068938808 -0600
-@@ -1,29 +1,28 @@
--*** misc/STLport-4.5.3/src/common_rules.mak	Mon Oct  8 19:30:30 2001
----- misc/build/STLport-4.5.3/src/common_rules.mak	Fri May  3 18:44:50 2002
-+*** misc/STLport-4.5.3/src/fstream.cpp	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/fstream.cpp	Fri Jan 11 17:22:40 2002
- ***************
--*** 84,90 ****
--  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
--  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
--  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
--! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
--  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
--  
--  install_unix :
----- 84,91 ----
--  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
--  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
--  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
--! # enable when needed
--! #	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
--  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
--  
--  install_unix :
--*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri May  3 18:43:29 2002
----- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri May  3 17:59:41 2002
-+*** 293,299 ****
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern _CRTIMP ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+--- 293,299 ----
-+  #ifdef __MINGW32__
-+   __MINGW_IMPORT ioinfo * __pioinfo[];
-+  #else
-+!   extern __declspec( dllimport ) ioinfo * __pioinfo[];
-+  #endif
-+  
-+  } // extern "C"
-+*** misc/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:48:44 2002
-+--- misc/build/STLport-4.5.3/src/gcc-3.0.mak	Fri Jan 11 12:47:21 2002
- ***************
- *** 1 ****
- ! dummy
----- 1,56 ----
-+--- 1,59 ----
- ! #
- ! # Note : this makefile is for gcc-3 !
- ! #
-@@ -31,6 +30,8 @@
- ! #
- ! # compiler
- ! #
-+! CC = $(CCCOMP) 
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
- ! 
- ! #
- ! # Basename for libraries
-@@ -42,7 +43,7 @@
- ! #
- ! #
- ! LINK=ar cr
--! DYN_LINK=g++ --fexceptions -shared -o
-+! DYN_LINK=$(CXX) --fexceptions -shared -o
- ! 
- ! OBJEXT=o
- ! DYNEXT=so
-@@ -59,12 +60,12 @@
- ! 
- ! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
- ! 
--! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS} -D_REENTRANT -fexceptions
-+! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
- ! 
--! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
- ! 
--! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
- ! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
- ! 
- ! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-@@ -80,40 +81,92 @@
- ! #%.s: %.cpp
- ! #	$(CXX) $(CXXFLAGS) -O4 -S -pto $<  -o $@
- ! 
--*** misc/STLport-4.5.3/src/sunpro-common.mak	Thu Nov 29 20:26:22 2001
----- misc/build/STLport-4.5.3/src/sunpro-common.mak	Fri May  3 17:59:41 2002
-+! 
-+*** misc/STLport-4.5.3/src/vc6.mak	Mon Jul 30 00:18:15 2001
-+--- misc/build/STLport-4.5.3/src/vc6.mak	Fri Jan 11 17:41:08 2002
- ***************
--*** 45,50 ****
----- 45,53 ----
--  STLDEBUG_static_rep = -ptr${STLDEBUG_OBJDIR_static}
--  STLDEBUG_dynamic_rep = -ptr${STLDEBUG_OBJDIR_dynamic}
-+*** 10,16 ****
-+  COMP=VC6
-   
--+ RELEASE_DYNLIB_SONAME=libstlport_sunpro.so
--+ STLDEBUG_DYNLIB_SONAME=libstlport_sunpro_stldebug.so
--+ 
--  CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} ${RELEASE_static_rep}
--  CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) ${RELEASE_FLAGS} $(SHCXXFLAGS) ${RELEASE_dynamic_rep}
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS"
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+--- 10,16 ----
-+  COMP=VC6
-+  
-+  # EXTRA_COMMON_FLAGS=/D "_MBCS"
-+! EXTRA_COMMON_FLAGS=/Zm800 /FI "vc_warning_disable.h" /D "_MBCS" /D "_NTSDK" /D "_CRTIMP="
-+  EXTRA_DEBUG_FLAGS=
-+  EXTRA_NDEBUG_FLAGS=
-+  
-+*** misc/STLport-4.5.3/src/vc_common.mak	Tue Sep  4 19:10:12 2001
-+--- misc/build/STLport-4.5.3/src/vc_common.mak	Fri Jan 11 12:48:14 2002
-+***************
-+*** 62,68 ****
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+--- 62,68 ----
-+  LDFLAGS_RELEASE=/opt:ref
-+  
-+  LDFLAGS_COMMON_static=$(LDFLAGS_COMMON)
-+! LDFLAGS_COMMON_dynamic=$(LDFLAGS_COMMON) /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no
-+  
-+  
-+  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd $(FLAGS_DEBUG) /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch
-+***************
-+*** 79,87 ****
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-   
--*** misc/STLport-4.5.3/stlport/config/stl_sunpro.h	Sat Feb  9 03:01:00 2002
----- misc/build/STLport-4.5.3/stlport/config/stl_sunpro.h	Fri May  3 17:59:41 2002
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
-+--- 79,87 ----
-+  
-+  
-+  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)"
-+  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib $(LDFLAGS_DEBUG) /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
-+  
-+  # LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static)  /DEBUGTYPE:CV
-+  # LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
- ***************
--*** 40,45 ****
----- 40,46 ----
--  #  define _STLP_NO_CLASS_PARTIAL_SPECIALIZATION 1
--  #  define _STLP_NO_MEMBER_TEMPLATE_CLASSES 1
--  #  define _STLP_USE_OLD_HP_ITERATOR_QUERIES
--+ #  define _STLP_NO_MEMBER_TEMPLATES 1
--  # endif 
-+*** 95,101 ****
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-+  
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-   
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+--- 95,101 ----
-+  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /MD $(FLAGS_NDEBUG) /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch
-   
--*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:22 2001
----- misc/build/STLport-4.5.3/stlport/stdexcept	Fri May  3 17:59:41 2002
-+  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
-+! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) $(LDFLAGS_RELEASE) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  # LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
-+  
-+  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
-+*** misc/STLport-4.5.3/stlport/stdexcept	Tue May 22 02:50:21 2001
-+--- misc/build/STLport-4.5.3/stlport/stdexcept	Mon Jan 14 18:26:09 2002
- ***************
- *** 49,54 ****
----- 49,58 ----
-+--- 49,59 ----
-   
-   _STLP_BEGIN_NAMESPACE
-   
-++ /* maybe limit to gcc 3.x */
- + #if defined( __GNUC__)
- + #define _STLP_NOTHROW_INHERENTLY throw()
- + #endif
-@@ -121,70 +174,74 @@
-   class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-   public:
-     __Named_exception(const string& __str) 
--*** misc/STLport-4.5.3/stlport/stl/_hash_map.h	Sun Feb  3 00:12:04 2002
----- misc/build/STLport-4.5.3/stlport/stl/_hash_map.h	Fri May  3 17:59:41 2002
-+*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:04 2002
-+--- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	Thu Jun  6 22:53:56 2002
- ***************
--*** 183,191 ****
-+*** 226,233 ****
-   
--    _Tp& operator[](const key_type& __key) {
--      iterator __it = _M_ht.find(__key);
--!     return (__it == _M_ht.end() ? 
--! 	    _M_ht._M_insert(_value_type(__key, _Tp())).second : 
--! 	    (*__it).second );
--    }
--  
--    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
----- 183,192 ----
--  
--    _Tp& operator[](const key_type& __key) {
--      iterator __it = _M_ht.find(__key);
--!     if (__it == _M_ht.end()) 
--! 	    return _M_ht._M_insert(_value_type(__key, _Tp())).second;
--!     else
--! 	    return (*__it).second;
--    }
--  
--    size_type count(const key_type& __key) const { return _M_ht.count(__key); }
--*** misc/STLport-4.5.3/stlport/config/stl_gcc.h	2002-01-10 19:41:58.000000000 +0100
----- misc/build/STLport-4.5.3/stlport/config/stl_gcc.h	2002-10-07 16:49:34.000000000 +0200
--***************
--*** 248,254 ****
--  #     define _STLP_HAS_NO_EXCEPTIONS  1
--  #   endif
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-   
--! # if (__GNUC__ >= 3)
-+  # elif (__GNUC_MINOR__ < 8)
-   
--  #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
--  #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
----- 248,278 ----
--  #     define _STLP_HAS_NO_EXCEPTIONS  1
-+--- 226,233 ----
-+  
-+  # if (__GNUC__ >= 3)
-+  
-+! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  
-+  # elif (__GNUC_MINOR__ < 8)
-+  
-+***************
-+*** 285,298 ****
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-+  #   endif
-+--- 285,298 ----
-+  # if defined(__DJGPP)
-+  #   define _STLP_NATIVE_INCLUDE_PATH ../lang/cxx
-+  # elif (__GNUC__ >= 3) || (__GNUC_MINOR__ >= 97)
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../include/g++-v3
-+  # elif ((__GNUC_MINOR__ >= 95 && __GNUC_MINOR__ < 97) && !( defined (__FreeBSD__) || defined (__NetBSD__) || defined(__sgi) ) )
-+! #   define _STLP_NATIVE_INCLUDE_PATH ../g++-v32
-+  # elif (__GNUC_MINOR__ > 8) && (__GNUC_MINOR__ < 95) && (__GNUC__ < 3) && !defined( __Lynx__ )
-+  // this really sucks, as GNUpro does not really identifies itself, so we have to guess 
-+  // depending on a platform
-+  #   ifdef __hpux
-+! #    define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
-+  #   else
-+  #    define _STLP_NATIVE_INCLUDE_PATH ../g++-2
-   #   endif
-+*** misc/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:41:05 2002
-+--- misc/build/STLport-4.5.3/src/common_rules.mak	Tue Sep 10 23:39:45 2002
-+***************
-+*** 84,90 ****
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-   
--! # define _STLP_CONCAT(X,Y) X Y
--! #  define _STLP_GCC_VERSUFFIX __GNUC__.__GNUC_MINOR__
--! # if (defined __GNUC_PATCHLEVEL__) && (__GNUC_PATCHLEVEL__ > 0)
--! #  define _STLP_GCC_VERSION \
--! 	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
--! # else
--! #  define _STLP_GCC_VERSION \
--! 	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 )
--! # endif
--! 
--! # if _STLP_GCC_VERSION >= 30101
--! // gcc >= 3.1.1 - /usr/include/c++/<gcc_version>/
--! 
--! #  define _STLP_NATIVE_INCLUDE_PATH _STLP_CONCAT(../../include/c++/,_STLP_GCC_VERSUFFIX)
--! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH \
--!         _STLP_CONCAT(../../include/c++/,_STLP_CONCAT(_STLP_GCC_VERSUFFIX,/backward))
--! 
--! # elif (__GNUC__ == 3) && (__GNUC_MINOR__ == 1)
--! // gcc 3.1 - /usr/include/g++-v31/
--! 
--! #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v31
--! #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v31/backward
--! 
--! # elif (__GNUC__ == 3) && (__GNUC_MINOR__ == 0)
--! // gcc 3.0 - /usr/include/g++-v3/
-+  install_unix :
-+--- 84,90 ----
-+  	$(RM) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-+  	$(RM) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(RELEASE_DYNLIB) $(OUTDIR)/$(RELEASE_NAME).$(DYNEXT)
-+! 	-ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT)
-+  	ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT)
-   
--  #  define _STLP_NATIVE_INCLUDE_PATH ../g++-v3
--  #  define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward
-+  install_unix :
-diff -Naur OOo_1.1.3_src-orig/stlport/makefile.mk OOo_1.1.3_src/stlport/makefile.mk
---- OOo_1.1.3_src-orig/stlport/makefile.mk	2004-01-28 04:52:04.000000000 -0600
-+++ OOo_1.1.3_src/stlport/makefile.mk	2004-12-15 22:27:58.015744584 -0600
-@@ -72,11 +72,12 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
--	TARFILE_NAME=STLport-4.5
-        .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
-+               TARFILE_NAME=STLport-4.5
-                PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
-        .ELSE
--               PATCH_FILE_NAME=STLport-4.5.patch
-+               TARFILE_NAME=STLport-4.5.3
-+               PATCH_FILE_NAME=STLport-4.5.3.patch
-        .ENDIF
- .ELSE			# "$(COMID)"=="gcc3"
- 	.IF "$(OS)"=="MACOSX"
-@@ -127,7 +128,7 @@
- 		.ELIF "$(OS)"=="MACOSX"
- 			BUILD_FLAGS=-f gcc-3.0-macosx.mak
- 		.ELSE
--			BUILD_FLAGS=-f gcc-3.0.mak
-+			BUILD_FLAGS=-f gcc.mak
- 		.ENDIF
- 	.ELSE # "$(COMID)"=="gcc3"
- 		# MacOS X/Darwin need a special makefile

Deleted: trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,43 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2003-10-14
-Initial Package Version: 1.1.0
-Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-October/003975.html
-        Posted by Michael Brömer
-Description: Fixes compilation with jdk-1.4.2
-
-$LastChangedBy$
-$Date$
-
---- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java.orig	2003-10-14 00:36:53.000000000 -0500
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2003-10-14 00:38:40.000000000 -0500
-@@ -207,7 +207,7 @@
-    index--;
-   }
- 
--  public org.openide.WizardDescriptor$Panel current()
-+  public org.openide.WizardDescriptor.Panel current()
-    {
-      return panels[index];
-    }
---- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java.orig	2003-10-14 00:37:27.000000000 -0500
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2003-10-14 00:38:53.000000000 -0500
-@@ -214,7 +214,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     
---- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java.orig	2003-10-14 00:37:55.000000000 -0500
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2003-10-14 00:39:05.000000000 -0500
-@@ -200,7 +200,7 @@
-         index--;
-     }
-     
--    public org.openide.WizardDescriptor$Panel current() {
-+    public org.openide.WizardDescriptor.Panel current() {
-         return panels[index];
-     }
-     

Deleted: trunk/patches/openoffice-1.1.3-nptl-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.3-nptl-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.3-nptl-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,25 +0,0 @@
-Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
-Date: 2004-12-12
-Initial Package Version: 1.1.3
-Origin: Gentoo
-Description: Fixes compilation with nptl.
-Upstream Status: Unknown (uneeded???)
-
-$LastChangedBy$
-$Date$
-
-diff -Naur OOo_1.1.3_src-orig/sal/osl/unx/process.c OOo_1.1.3_src/sal/osl/unx/process.c
---- OOo_1.1.3_src-orig/sal/osl/unx/process.c	2003-07-02 08:34:17.000000000 -0500
-+++ OOo_1.1.3_src/sal/osl/unx/process.c	2004-12-07 22:02:03.317233024 -0600
-@@ -1017,11 +1017,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 */

Deleted: trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -1,83 +0,0 @@
-Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
-Date: 2003-09-21
-Origin: http://www.openoffice.org/issues/show_bug.cgi?id=10719
-Initial Package Version: 1.1rc4
-Description: The installation script looks for test binary in the wrong location. LFS installs
-the binary in /bin. If the test binary is not found, it results in a corrupted installation. This patch is part
-of the BLFS book.
-
-$LastChangedBy$
-$Date$
-
-diff -ur oo_1.1rc4_src.orig/setup2/script/serverstartup.sh oo_1.1rc4_src/setup2/script/serverstartup.sh
---- oo_1.1rc4_src.orig/setup2/script/serverstartup.sh	2003-06-12 04:53:08.000000000 -0500
-+++ oo_1.1rc4_src/setup2/script/serverstartup.sh	2003-09-21 02:13:07.000000000 -0500
-@@ -66,7 +66,7 @@
-         SCO_SV) test=/bin/test     ;;
-         NetBSD) test=/bin/test     ;;
-         FreeBSD) test=/bin/test     ;;
--        *)      test=/usr/bin/test ;;
-+        *)      test=/bin/test ;;
- esac
- 
- if $test -L "$0" ; then
-diff -ur oo_1.1rc4_src.orig/setup2/script/setupserver oo_1.1rc4_src/setup2/script/setupserver
---- oo_1.1rc4_src.orig/setup2/script/setupserver	2003-06-12 04:53:18.000000000 -0500
-+++ oo_1.1rc4_src/setup2/script/setupserver	2003-09-21 02:13:16.000000000 -0500
-@@ -235,7 +235,7 @@
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
- 	FreeBSD) test=/bin/test    ;;
--  	*)      test=/usr/bin/test ;;
-+  	*)      test=/bin/test ;;
- esac
- sd_cwd="`pwd`"
- 
-diff -ur oo_1.1rc4_src.orig/setup2/script/websnooper oo_1.1rc4_src/setup2/script/websnooper
---- oo_1.1rc4_src.orig/setup2/script/websnooper	2003-06-12 04:53:55.000000000 -0500
-+++ oo_1.1rc4_src/setup2/script/websnooper	2003-09-21 02:13:23.000000000 -0500
-@@ -7,7 +7,7 @@
-         SCO_SV) test=/bin/test     ;;
-         NetBSD) test=/bin/test     ;;
-         FreeBSD) test=/bin/test     ;;
--        *)      test=/usr/bin/test ;;
-+        *)      test=/bin/test ;;
- esac
- 
- if $test -L "$0" ; then
-diff -ur oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh
---- oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh	2003-06-12 04:54:49.000000000 -0500
-+++ oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh	2003-09-21 02:13:29.000000000 -0500
-@@ -67,7 +67,7 @@
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
- 	FreeBSD) test=/bin/test    ;;
--	*)      test=/usr/bin/test ;;
-+	*)      test=/bin/test ;;
- esac
- 
- sd_cwd="`pwd`"
-diff -ur oo_1.1rc4_src.orig/ucb/source/main/ucb.sh oo_1.1rc4_src/ucb/source/main/ucb.sh
---- oo_1.1rc4_src.orig/ucb/source/main/ucb.sh	2001-04-08 16:29:21.000000000 -0500
-+++ oo_1.1rc4_src/ucb/source/main/ucb.sh	2003-09-21 02:13:43.000000000 -0500
-@@ -78,7 +78,7 @@
- 	SCO_SV) test=/bin/test     ;;
- 	NetBSD) test=/bin/test     ;;
- 	FreeBSD) test=/bin/test     ;;
--  	*)      test=/usr/bin/test ;;
-+  	*)      test=/bin/test ;;
- esac
- 
- sd_cwd="`pwd`"
-diff -ur oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh
---- oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh	2003-03-27 12:07:29.000000000 -0600
-+++ oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh	2003-09-21 02:13:37.000000000 -0500
-@@ -124,7 +124,7 @@
- sd_platform=`uname -s`
- case $sd_platform in
- 	SCO_SV) test=/bin/test     ;;
--  	*)      test=/usr/bin/test ;;
-+  	*)      test=/bin/test ;;
- esac
- sd_cwd="`pwd`"
- 

Copied: trunk/patches/openoffice-1.1.4-freetype-1.patch (from rev 3145, trunk/patches/openoffice-1.1.3-freetype-1.patch)
===================================================================
--- trunk/patches/openoffice-1.1.3-freetype-1.patch	2004-12-25 23:40:57 UTC (rev 3145)
+++ trunk/patches/openoffice-1.1.4-freetype-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -0,0 +1,42 @@
+Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org>
+Date: 2004-12-12
+Origin: Self
+Initial Package Version: 1.1.3
+Description: Fixes build when used with system freetype-2.1.5+.
+Upstream Status: Not submitted
+
+$LastChangedBy$
+$Date$
+
+--- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_ftyp.cxx	2004-08-27 05:00:20.000000000 -0500
++++ OOo_1.1.3_src/vcl/source/glyphs/gcach_ftyp.cxx	2004-12-08 01:25:05.690230824 -0600
+@@ -77,12 +77,13 @@
+ #include <osl/file.hxx>
+ #include <osl/thread.hxx>
+ 
+-#include "freetype/freetype.h"
+-#include "freetype/ftglyph.h"
+-#include "freetype/ftoutln.h"
+-#include "freetype/tttables.h"
+-#include "freetype/tttags.h"
+-#include "freetype/ttnameid.h"
++#include <ft2build.h>
++#include <freetype/freetype.h>
++#include <freetype/ftglyph.h>
++#include <freetype/ftoutln.h>
++#include <freetype/tttables.h>
++#include <freetype/tttags.h>
++#include <freetype/ttnameid.h>
+ 
+ #ifndef FREETYPE_PATCH
+     // VERSION_MINOR in freetype.h is too coarse
+--- OOo_1.1.3_src-orig/vcl/source/glyphs/gcach_layout.cxx	2004-01-09 12:13:49.000000000 -0600
++++ OOo_1.1.3_src/vcl/source/glyphs/gcach_layout.cxx	2004-12-08 01:26:45.845004984 -0600
+@@ -68,6 +68,7 @@
+ #endif
+ 
+ #ifndef _SV_GCACHFTYP_HXX
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <gcach_ftyp.hxx>
+ #endif

Copied: trunk/patches/openoffice-1.1.4-gcc333-1.patch (from rev 3145, trunk/patches/openoffice-1.1.3-gcc333-1.patch)
===================================================================
--- trunk/patches/openoffice-1.1.3-gcc333-1.patch	2004-12-25 23:40:57 UTC (rev 3145)
+++ trunk/patches/openoffice-1.1.4-gcc333-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -0,0 +1,21 @@
+Submitted By: DJ Lucas <dj_At_linuxfromscratch_DOT_org>
+Date: 2004-12-25
+Origin: OOO-Build-1.3.7
+Initial Package Version: 1.1.4
+Description: Fixes build when used with gcc-3.3.4.
+Upstream Status: Not required
+
+$LastChangedBy$
+$Date$
+
+--- OOo_1.1.3_src-orig/icu/makefile.mk	2003-07-16 12:26:10.000000000 -0500
++++ OOo_1.1.3_src/icu/makefile.mk	2004-12-19 00:10:13.591321672 -0600
+@@ -93,7 +93,7 @@
+ 
+ CONFIGURE_DIR=source
+ 
+-CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no'
++CONFIGURE_ACTION=sh -c 'CFLAGS=-O CXXFLAGS=-O ./configure --enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no --enable-extras=no'
+ 
+ #CONFIGURE_FLAGS=--enable-layout --enable-static --enable-shared=yes --enable-64bit-libs=no
+ CONFIGURE_FLAGS=

Copied: trunk/patches/openoffice-1.1.4-jdk_1.4.2_fix-1.patch (from rev 3145, trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch)
===================================================================
--- trunk/patches/openoffice-1.1.3-jdk_1.4.2_fix-1.patch	2004-12-25 23:40:57 UTC (rev 3145)
+++ trunk/patches/openoffice-1.1.4-jdk_1.4.2_fix-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -0,0 +1,44 @@
+Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
+Date: 2003-10-14
+Initial Package Version: 1.1.0
+Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-October/003975.html
+        Posted by Michael Brömer
+Description: Fixes compilation with jdk-1.4.2
+Upstream Status:  Not applied
+
+$LastChangedBy$
+$Date$
+
+--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java.orig	2003-10-14 00:36:53.000000000 -0500
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java	2003-10-14 00:38:40.000000000 -0500
+@@ -207,7 +207,7 @@
+    index--;
+   }
+ 
+-  public org.openide.WizardDescriptor$Panel current()
++  public org.openide.WizardDescriptor.Panel current()
+    {
+      return panels[index];
+    }
+--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java.orig	2003-10-14 00:37:27.000000000 -0500
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java	2003-10-14 00:38:53.000000000 -0500
+@@ -214,7 +214,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     
+--- oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java.orig	2003-10-14 00:37:55.000000000 -0500
++++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java	2003-10-14 00:39:05.000000000 -0500
+@@ -200,7 +200,7 @@
+         index--;
+     }
+     
+-    public org.openide.WizardDescriptor$Panel current() {
++    public org.openide.WizardDescriptor.Panel current() {
+         return panels[index];
+     }
+     

Added: trunk/patches/openoffice-1.1.4-no_pam-1.patch
===================================================================
--- trunk/patches/openoffice-1.1.4-no_pam-1.patch	2004-12-26 04:18:05 UTC (rev 3147)
+++ trunk/patches/openoffice-1.1.4-no_pam-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -0,0 +1,192 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2004-12-24
+Initial Package Version: 1.1rc4
+Origin: openoffice-1.1.2-no_pam-1.patch (Tushar Teredesai)
+Description: OpenOffice requires PAM headers in /usr/include/security; 
+  these headers are not available in most of the LFS based systems. This 
+  patch removes the need for PAM headers by removing the functions that 
+  use PAM.  Updated for OpenOffice-1.1.3
+Upstream Status:  Not Required
+
+$LastChangedBy$
+$Date$
+
+--- OOo_1.1.3_src/sal/osl/unx/security.c.orig	2004-12-24 14:18:55.966151056 -0600
++++ OOo_1.1.3_src/sal/osl/unx/security.c	2004-12-24 14:20:47.761155632 -0600
+@@ -133,8 +133,6 @@
+  *
+  */
+ 
+-#include <security/pam_appl.h>
+-
+ typedef struct {
+ 	char* name;
+ 	char* password;
+@@ -143,10 +141,10 @@
+ typedef struct {
+ 	int (*pam_start)(const char *service_name, const char *user,
+ 		     	     const struct pam_conv *pam_conversation,
+-		     		 pam_handle_t **pamh);
+-	int (*pam_end)          (pam_handle_t *pamh, int pam_status);
+-	int (*pam_authenticate) (pam_handle_t *pamh, int flags);
+-	int (*pam_acct_mgmt)    (pam_handle_t *pamh, int flags);
++		     		 void **pamh);
++	int (*pam_end)          (void *pamh, int pam_status);
++	int (*pam_authenticate) (void *pamh, int flags);
++	int (*pam_acct_mgmt)    (void *pamh, int flags);
+ } sal_PamModule;
+ 
+ /*
+@@ -164,69 +162,7 @@
+ osl_PamConversation (int num_msg, const struct pam_message **msgm,
+                      struct pam_response **response, void *appdata_ptr)
+ {
+-	int	  		i;
+-	sal_Bool	error;
+-	sal_PamData         *pam_data;
+-	struct pam_response *p_reply;
+-
+-	/* resource initialization */
+-	pam_data = (sal_PamData*) appdata_ptr;
+-	p_reply  = (struct pam_response *) calloc( num_msg, 
+-											   sizeof(struct pam_response));
+-	if ( p_reply == NULL || pam_data == NULL )
+-	{
+-		if ( p_reply != NULL )
+-			free ( p_reply );
+-		*response = NULL;
+-		return PAM_CONV_ERR;
+-	}
+-
+-	/* pseudo dialog */
+-	error = sal_False;
+-	for ( i = 0; i < num_msg ; i++ )
+-	{
+-		switch ( msgm[ i ]->msg_style )
+-		{
+-			case PAM_PROMPT_ECHO_OFF: 
+-				p_reply[ i ].resp_retcode = 0;
+-				p_reply[ i ].resp 		  = strdup( pam_data->password );
+-			 	break;
+-			case PAM_PROMPT_ECHO_ON:  
+-				p_reply[ i ].resp_retcode = 0;
+-				p_reply[ i ].resp 		= strdup( pam_data->name );
+-				break;
+-			case PAM_ERROR_MSG:
+-			case PAM_TEXT_INFO:
+- 			case PAM_BINARY_PROMPT:
+-			case PAM_BINARY_MSG:
+-				p_reply[ i ].resp_retcode 	= 0;
+-				p_reply[ i ].resp 			= NULL;
+-				break;
+-			default:
+-				error = sal_True; 
+-				break;
+-		}
+-	}
+-
+-	/* free resources on error */
+-	if ( error )
+-	{
+-		for ( i = 0; i < num_msg ; i++ )
+-			if ( p_reply[ i ].resp )
+-			{
+-				memset ( p_reply[ i ].resp, 0, 
+-						 strlen( p_reply[ i ].resp ) );  
+-				free   ( p_reply[ i ].resp );
+-			}
+-		free ( p_reply );
+-
+-		*response = NULL;
+-		return PAM_CONV_ERR;
+-	}
+-
+-	/* well done */
+-	*response = p_reply;
+-	return PAM_SUCCESS;
++	return -1;
+ }
+ 
+ /*
+@@ -239,45 +175,6 @@
+ static sal_PamModule* osl_getPAM()
+ {
+ 	static sal_PamModule *pam_module = NULL;
+-	static sal_Bool load_once = sal_False;
+-
+-	if ( !load_once )
+-	{
+-		/* get library-handle. cannot use osl-module, since 
+- 		   RTLD_GLOBAL is required for PAM-0.64 RH 5.2 
+-		   (but not for PAM-0.66 RH 6.0) */
+-		void *pam_hdl;
+-		
+-		pam_hdl = dlopen( "libpam.so.0", RTLD_GLOBAL | RTLD_LAZY );  
+-		
+-		if ( pam_hdl != NULL )
+-			pam_module = (sal_PamModule*)calloc( 1, sizeof(sal_PamModule) );
+-		
+-		/* load functions */
+-		if ( pam_module  != NULL )
+-		{
+-			pam_module->pam_acct_mgmt = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_acct_mgmt" );
+-			pam_module->pam_authenticate 
+-									  = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_authenticate" );
+-			pam_module->pam_end       = (int (*)(pam_handle_t *, int)) dlsym ( pam_hdl, "pam_end" );
+-			pam_module->pam_start     = (int (*)(const char *, const char *, const struct pam_conv *, pam_handle_t **)) dlsym ( pam_hdl, "pam_start" );
+-
+-			/* free resources, if not completely successful */
+-			if (   (pam_module->pam_start 		 == NULL) 
+-				|| (pam_module->pam_end 		 == NULL)  
+-				|| (pam_module->pam_authenticate == NULL) 
+-				|| (pam_module->pam_acct_mgmt 	 == NULL) )
+-			{
+-				free( pam_module );
+-				pam_module = NULL;
+-				dlclose( pam_hdl );
+-			}
+-		}
+-
+-		/* never try again */
+-		load_once = sal_True;
+-	}
+-
+ 	return pam_module;	
+ }
+ 
+@@ -289,35 +186,6 @@
+ osl_PamAuthentification( const sal_Char* name, const sal_Char* password )
+ {
+ 	sal_Bool success = sal_False;
+-
+-	sal_PamModule* pam_module;
+-
+-	pam_module = osl_getPAM();
+-	if ( pam_module != NULL )
+-	{
+-		pam_handle_t   *pam_handle = NULL;
+-		struct pam_conv pam_conversation;
+-		sal_PamData     pam_data;
+-
+-		int				return_value;
+-
+-		pam_data.name     = (char*) name;
+-		pam_data.password = (char*) password; 
+-	
+-		pam_conversation.conv 		 = osl_PamConversation;
+-		pam_conversation.appdata_ptr = (void*)(&pam_data); 
+-
+-  		return_value = pam_module->pam_start( "su", name, 
+-			&pam_conversation, &pam_handle);
+-		if (return_value == PAM_SUCCESS ) 
+-			return_value = pam_module->pam_authenticate(pam_handle, 0);
+-  		if (return_value == PAM_SUCCESS ) 
+-			return_value = pam_module->pam_acct_mgmt(pam_handle, 0);
+-		pam_module->pam_end( pam_handle, return_value );
+-	
+-		success = (sal_Bool)(return_value == PAM_SUCCESS);
+-	}
+-
+   	return success;
+ }
+ 


Property changes on: trunk/patches/openoffice-1.1.4-no_pam-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Copied: trunk/patches/openoffice-1.1.4-nptl-1.patch (from rev 3145, trunk/patches/openoffice-1.1.3-nptl-1.patch)

Copied: trunk/patches/openoffice-1.1.4-test_bin_loc-1.patch (from rev 3145, trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch)
===================================================================
--- trunk/patches/openoffice-1.1.3-test_bin_loc-1.patch	2004-12-25 23:40:57 UTC (rev 3145)
+++ trunk/patches/openoffice-1.1.4-test_bin_loc-1.patch	2004-12-26 04:19:23 UTC (rev 3148)
@@ -0,0 +1,84 @@
+Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
+Date: 2003-09-21
+Origin: http://www.openoffice.org/issues/show_bug.cgi?id=10719
+Initial Package Version: 1.1rc4
+Description: The installation script looks for test binary in the wrong 
+  location. LFS installs the binary in /bin. If the test binary is not found, 
+  it results in a corrupted installation. This patch is part of the BLFS book.
+Upstream Status: Not applied
+
+$LastChangedBy$
+$Date$
+
+diff -ur oo_1.1rc4_src.orig/setup2/script/serverstartup.sh oo_1.1rc4_src/setup2/script/serverstartup.sh
+--- oo_1.1rc4_src.orig/setup2/script/serverstartup.sh	2003-06-12 04:53:08.000000000 -0500
++++ oo_1.1rc4_src/setup2/script/serverstartup.sh	2003-09-21 02:13:07.000000000 -0500
+@@ -66,7 +66,7 @@
+         SCO_SV) test=/bin/test     ;;
+         NetBSD) test=/bin/test     ;;
+         FreeBSD) test=/bin/test     ;;
+-        *)      test=/usr/bin/test ;;
++        *)      test=/bin/test ;;
+ esac
+ 
+ if $test -L "$0" ; then
+diff -ur oo_1.1rc4_src.orig/setup2/script/setupserver oo_1.1rc4_src/setup2/script/setupserver
+--- oo_1.1rc4_src.orig/setup2/script/setupserver	2003-06-12 04:53:18.000000000 -0500
++++ oo_1.1rc4_src/setup2/script/setupserver	2003-09-21 02:13:16.000000000 -0500
+@@ -235,7 +235,7 @@
+ case $sd_platform in
+ 	SCO_SV) test=/bin/test     ;;
+ 	FreeBSD) test=/bin/test    ;;
+-  	*)      test=/usr/bin/test ;;
++  	*)      test=/bin/test ;;
+ esac
+ sd_cwd="`pwd`"
+ 
+diff -ur oo_1.1rc4_src.orig/setup2/script/websnooper oo_1.1rc4_src/setup2/script/websnooper
+--- oo_1.1rc4_src.orig/setup2/script/websnooper	2003-06-12 04:53:55.000000000 -0500
++++ oo_1.1rc4_src/setup2/script/websnooper	2003-09-21 02:13:23.000000000 -0500
+@@ -7,7 +7,7 @@
+         SCO_SV) test=/bin/test     ;;
+         NetBSD) test=/bin/test     ;;
+         FreeBSD) test=/bin/test     ;;
+-        *)      test=/usr/bin/test ;;
++        *)      test=/bin/test ;;
+ esac
+ 
+ if $test -L "$0" ; then
+diff -ur oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh
+--- oo_1.1rc4_src.orig/setup2/source/custom/jvmsetup/loader/jvmsetup.sh	2003-06-12 04:54:49.000000000 -0500
++++ oo_1.1rc4_src/setup2/source/custom/jvmsetup/loader/jvmsetup.sh	2003-09-21 02:13:29.000000000 -0500
+@@ -67,7 +67,7 @@
+ case $sd_platform in
+ 	SCO_SV) test=/bin/test     ;;
+ 	FreeBSD) test=/bin/test    ;;
+-	*)      test=/usr/bin/test ;;
++	*)      test=/bin/test ;;
+ esac
+ 
+ sd_cwd="`pwd`"
+diff -ur oo_1.1rc4_src.orig/ucb/source/main/ucb.sh oo_1.1rc4_src/ucb/source/main/ucb.sh
+--- oo_1.1rc4_src.orig/ucb/source/main/ucb.sh	2001-04-08 16:29:21.000000000 -0500
++++ oo_1.1rc4_src/ucb/source/main/ucb.sh	2003-09-21 02:13:43.000000000 -0500
+@@ -78,7 +78,7 @@
+ 	SCO_SV) test=/bin/test     ;;
+ 	NetBSD) test=/bin/test     ;;
+ 	FreeBSD) test=/bin/test     ;;
+-  	*)      test=/usr/bin/test ;;
++  	*)      test=/bin/test ;;
+ esac
+ 
+ sd_cwd="`pwd`"
+diff -ur oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh
+--- oo_1.1rc4_src.orig/xmlhelp/source/com/sun/star/help/helpserver.sh	2003-03-27 12:07:29.000000000 -0600
++++ oo_1.1rc4_src/xmlhelp/source/com/sun/star/help/helpserver.sh	2003-09-21 02:13:37.000000000 -0500
+@@ -124,7 +124,7 @@
+ sd_platform=`uname -s`
+ case $sd_platform in
+ 	SCO_SV) test=/bin/test     ;;
+-  	*)      test=/usr/bin/test ;;
++  	*)      test=/bin/test ;;
+ esac
+ sd_cwd="`pwd`"
+ 




More information about the blfs-book mailing list