summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch16
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch269
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/no-mozab.patch78
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/nptl.patch42
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3266
-rw-r--r--app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch36
-rw-r--r--app-office/openoffice/files/digest-openoffice-1.1.1_rc12
-rw-r--r--app-office/openoffice/openoffice-1.1.1_rc1.ebuild535
8 files changed, 0 insertions, 1244 deletions
diff --git a/app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch b/app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch
deleted file mode 100644
index 3f2ee40700af..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/fixed-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config_office/configure.orig 2003-08-13 15:03:11.000000000 +0200
-+++ config_office/configure 2003-08-13 15:03:46.000000000 +0200
-@@ -2895,13 +2895,6 @@
-
- if test "$_gcc_major" = "3"; then
- USE_GCC3="TRUE"
-- if test "$_gcc_longver" -eq "030203"; then
-- { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\"
-- gives internal error, use another version please." >&5
--echo "$as_me: error: found version \"$_gcc_version\"
-- gives internal error, use another version please." >&2;}
-- { (exit 1); exit 1; }; }
-- fi
- else
- USE_GCC3="FALSE"
- if test "$_gcc_longver" -lt "029502"; then
diff --git a/app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch b/app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch
deleted file mode 100644
index dc958c84a6f8..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/newstlportfix.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -urN stlport.orig/STLport-4.5.3.patch stlport/STLport-4.5.3.patch
---- stlport.orig/STLport-4.5.3.patch 1970-01-01 01:00:00.000000000 +0100
-+++ stlport/STLport-4.5.3.patch 2004-02-08 11:52:28.424007600 +0100
-@@ -0,0 +1,247 @@
-+*** 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
-+***************
-+*** 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,59 ----
-+! #
-+! # Note : this makefile is for gcc-3 !
-+! #
-+!
-+! #
-+! # compiler
-+! #
-+! CC = $(CCCOMP)
-+! CXX = $(CXXCOMP) -D_REENTRANT -fexceptions
-+!
-+! #
-+! # Basename for libraries
-+! #
-+! LIB_BASENAME = libstlport_gcc
-+!
-+! #
-+! # guts for common stuff
-+! #
-+! #
-+! LINK=ar cr
-+! DYN_LINK=$(CXX) --fexceptions -shared -o
-+!
-+! OBJEXT=o
-+! DYNEXT=so
-+! STEXT=a
-+! RM=rm -rf
-+! PATH_SEP=/
-+! MKDIR=mkdir -p
-+! COMP=GCC$(ARCH)
-+! INSTALL_STEP = install_unix
-+!
-+! all: all_dynamic all_static symbolic_links
-+!
-+! include common_macros.mak
-+!
-+! WARNING_FLAGS= -Wall -W -Wno-sign-compare -Wno-unused -Wno-uninitialized -ftemplate-depth-32
-+!
-+! CXXFLAGS_COMMON = -I${STLPORT_DIR} ${WARNING_FLAGS}
-+!
-+! CXXFLAGS_RELEASE_static = $(CXXFLAGS_COMMON) -O2 -fPIC
-+! CXXFLAGS_RELEASE_dynamic = $(CXXFLAGS_COMMON) -O2 -fPIC
-+!
-+! CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -g -fPIC
-+! CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -g -fPIC
-+!
-+! CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG
-+! CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG
-+!
-+! include common_percent_rules.mak
-+! include common_rules.mak
-+!
-+!
-+! #install: all
-+! # cp -p $(LIB_TARGET) ${D_LIB_TARGET} ../lib
-+!
-+! #%.s: %.cpp
-+! # $(CXX) $(CXXFLAGS) -O4 -S -pto $< -o $@
-+!
-+!
-+*** 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
-+***************
-+*** 10,16 ****
-+ COMP=VC6
-+
-+ # 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)"
-+
-+ # 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)"
-+***************
-+*** 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
-+
-+ 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,59 ----
-+
-+ _STLP_BEGIN_NAMESPACE
-+
-++ /* maybe limit to gcc 3.x */
-++ #if defined( __GNUC__)
-++ #define _STLP_NOTHROW_INHERENTLY throw()
-++ #endif
-++
-+ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE {
-+ public:
-+ __Named_exception(const string& __str)
-+*** 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
-+***************
-+*** 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)
-+
-+--- 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)
-+
-+ 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)
-+
-+ install_unix :
-diff -urN stlport.orig/makefile.mk stlport/makefile.mk
---- stlport.orig/makefile.mk 2004-01-28 11:52:04.000000000 +0100
-+++ stlport/makefile.mk 2004-02-08 12:01:34.362287427 +0100
-@@ -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"
diff --git a/app-office/openoffice/files/1.1.1_rc1/no-mozab.patch b/app-office/openoffice/files/1.1.1_rc1/no-mozab.patch
deleted file mode 100644
index f8ccda1bda3b..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/no-mozab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN oo_1.1rc2_src/connectivity/prj/build.lst oo_1.1rc2_src.new/connectivity/prj/build.lst
---- oo_1.1rc2_src/connectivity/prj/build.lst 2003-06-02 09:53:47.000000000 +0200
-+++ oo_1.1rc2_src.new/connectivity/prj/build.lst 2003-08-08 11:56:21.000000000 +0200
-@@ -1,4 +1,4 @@
--cn connectivity : comphelper moz svtools unixODBC NULL
-+cn connectivity : comphelper svtools unixODBC NULL
- cn connectivity usr1 - all cn_mkout NULL
- cn connectivity\source\types nmake - all cn_types NULL
- cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_types NULL
-@@ -7,8 +7,6 @@
- cn connectivity\source\resource nmake - all cn_res NULL
- cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_types NULL
- cn connectivity\source\drivers\ado nmake - w cn_ado cn_dbtools NULL
--cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file NULL
--cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_mozillasrc cn_dbtools NULL
- cn connectivity\source\drivers\evoab nmake - all cn_evoab cn_dbtools cn_file NULL
- cn connectivity\source\drivers\calc nmake - all cn_calc cn_file NULL
- cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
-diff -urN oo_1.1rc2_src/scp/source/office/files.scp oo_1.1rc2_src.new/scp/source/office/files.scp
---- oo_1.1rc2_src/scp/source/office/files.scp 2003-07-16 16:37:14.000000000 +0200
-+++ oo_1.1rc2_src.new/scp/source/office/files.scp 2003-08-08 12:15:21.000000000 +0200
-@@ -433,19 +433,6 @@
- Styles = (PACKED);
- End
-
--#ifndef MACOSX
--File GID_FILE_LIB_MOZABDRV
-- TXT_FILE_BODY;
-- #ifdef UNX
-- Name = STRING(CONCAT2(libmozabdrv2,UNXSUFFIX));
-- #else
-- Name = "mozabdrv2.dll";
-- #endif
-- Dir = GID_DIR_PROGRAM;
-- Styles = (PACKED);
--End
--#endif
--
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
- STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
-
-@@ -795,20 +782,6 @@
- #endif
- End
-
--#ifndef MACOSX
--File GID_FILE_LIB_MOZAB_2
-- TXT_FILE_BODY;
-- Styles = (PACKED,UNO_COMPONENT);
-- RegistryID = GID_STARREGISTRY_SERVICES_RDB;
-- Dir = GID_DIR_PROGRAM;
-- #ifdef UNX
-- Name = STRING(CONCAT2(libmozab2,UNXSUFFIX));
-- #else
-- Name = "mozab2.dll";
-- #endif
--End
--#endif
--
- #ifdef UNX
-
- File GID_FILE_LIB_EVOAB_1
-@@ -3241,15 +3214,6 @@
- #endif
-
- #endif
-- // of #ifdef SOLAR_JAVA
--#ifndef MACOSX
--File GID_FILE_MOZILLA_RUNTIME
-- TXT_FILE_BODY;
-- Styles = (ARCHIVE);
-- Dir = GID_DIR_PROGRAM;
-- Name = "mozruntime.zip";
--End
--#endif
-
- File GID_FILE_HTML_THIRDPARTYLICENSEREADME
- Name = "THIRDPARTYLICENSEREADME.html";
diff --git a/app-office/openoffice/files/1.1.1_rc1/nptl.patch b/app-office/openoffice/files/1.1.1_rc1/nptl.patch
deleted file mode 100644
index 212ff05c51b6..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/nptl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100
-+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore */
- /*****************************************************************************/
-
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */
-
- typedef struct {
-@@ -100,7 +100,7 @@
- * larger of both
- * XXX
- */
--#ifdef LINUX
-+#if 0
- if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- Semaphore= malloc(sizeof(glibc_21_sem_t));
- else
---- oo_1.1rc3_src/tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100
-+++ oo_1.1rc3_src/tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100
-@@ -577,7 +577,7 @@
-
- {
- char* p = NULL;
-- InfoMemoryAccess( p );
-+ /*InfoMemoryAccess( p );*/
- p = (char*)&p;
- InfoMemoryAccess( p );
- InfoMemoryTypeAccess( t_short );
---- oo_1.1_src/neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100
-+++ oo_1.1_src/neon/neon.patch 2003-10-04 10:32:49.123426384 +0100
-@@ -19,7 +19,7 @@
- !
- ! /* Define as __inline if that's what the C compiler calls it. */
- ! #ifdef UNX
--! #define inline
-+! #define inline inline
- ! #endif
- !
- ! /* Define if you need to in order for stat and other things to work. */
diff --git a/app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3 b/app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3
deleted file mode 100644
index c168e6eb803c..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/ooffice-wrapper-1.3
+++ /dev/null
@@ -1,266 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-# Modifications by Chris Halls
-# Modifications by Lucien Saviot
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program 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
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# this string should be exactly as in ~/.sversionrc
-PV=<pv>
-OOVERSION="OpenOffice.org ${PV}"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-###
-### Get user settings directory from ~/.sversionrc and echo directory name to stdout
-### get_settings_dir <Version>
-### return: 0 - directory found,
-### 1 - ~/.sversionrc non existent
-### 2 - entry exists in ~/.sversionrc but directory not found
-### 3 - ~/.sversionrc exists but no entry found
-get_settings_dir()
-{
- [ -r ${HOME}/.sversionrc ] || exit 1
- # warning, .sversionrc is DOS encoded so strip ^M
- settings_dir="`tr -d '\r' < ~/.sversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`"
- echo "$settings_dir"
- [ -n "$settings_dir" ] || exit 3
- [ -d "$settings_dir" ] || exit 2
-}
-
-##
-## where does OO live for this user ?
-##
-OOHOME="`get_settings_dir "$OOVERSION"`"
-if [ $? -eq 2 ] ; then
- # .sversionrc contains a version yet the directory does not exist
- echo "I'm confused because I can't find OpenOffice's user files."
- echo "Your ~/.sversionrc file tells they should be under $OOHOME,"
- echo "but they are not. Please fix the situation manually."
- echo "You may want to edit ~/.sversionrc to indicate where is OO"
- echo "installed, or remove it if you did remove your installation"
- echo "directory manually (you bad one)."
- exit 1
-fi
-
-##
-## Unset SESSION_MANAGER if gnome-session is the session manager
-## See http://www.openoffice.org/issues/show_bug.cgi?id=4494
-##
-SMPID=`echo $SESSION_MANAGER | sed --quiet "s,local.*/,,p"`
-if [ -n "$SMPID" ] && [ -L /proc/"$SMPID"/exe ]; then
-
- SESMGR="`readlink -f /proc/$SMPID/exe`"
- case "$SESMGR" in
- /usr/bin/gnome-session*)
- echo "Gnome session manager detected - session management disabled"
- unset SESSION_MANAGER
- ;;
- esac
-fi
-
-##
-## Add known Debian fonts locations to search path
-##
-## Please report if you have problems with fonts, or know of non-defoma integrated packages that place fonts in other
-## paths.
-##
-
-# Default font path. This is used if SAL_FONTPATH_USER is not defined.
-DEBOO_FONTPATH="/usr/lib/X11/fonts/misc/;/usr/lib/X11/fonts/cyrillic/;\
-/usr/lib/X11/fonts/100dpi/:unscaled;/usr/lib/X11/fonts/75dpi/:unscaled;\
-/usr/lib/X11/fonts/Type1/;/usr/lib/X11/fonts/CID;/usr/lib/X11/fonts/Speedo/;\
-/usr/lib/X11/fonts/100dpi/;/usr/lib/X11/fonts/75dpi/;\
-/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType;\
-/usr/lib/X11/fonts/TrueType;\
-/usr/share/fonts/truetype/kochi;\
-/usr/lib/X11/fonts/TrueType/larabie-straight;\
-/usr/lib/X11/fonts/TrueType/larabie-uncommon"
-
-SAL_FONTPATH_USER=${SAL_FONTPATH_USER:-"$DEBOO_FONTPATH"}
-export SAL_FONTPATH_USER
-
-## search LOCALE
-if [ -n "$LC_ALL" ]; then
- LOCALE="$LC_ALL"
- # OOo doesn't understand LC_ALL, so set LANG
- LANG="$LC_ALL"
-elif [ -n "$LANG" ]; then
- LOCALE="$LANG"
-elif [ -n "$LC_MESSAGES" ]; then
- LOCALE="$LC_MESSAGES"
- LANG="$LC_MESSAGES"
-else
- LOCALE="en_US"
-fi
-
-# Set locale to en_US if locale is C
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi
-
-LOCALEOO=`echo $LOCALE | sed 's/_/-/'`
-
-##
-## install OO for this user if needed
-##
-if [ -z "$OOHOME" ] ; then
- if [ -e /etc/openoffice/autoresponse-<pv>.conf ] && \
- grep -q DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf ; then
-
-# Do not take old settings as migration results in broken behaviour
-#
-# UPDATEFLAG=""
-# if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
-# OOHOME="$oldhome"
-# echo "Using settings from 1.0.3: /${oldhome}"
-# /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
-# UPDATEFLAG="-update:/$oldhome"
-# fi
- # first install
- OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse-<pv>.conf | \
- sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
- if [ -d "$OOHOME" ]; then
- echo "openoffice.org: You have no entry for $OOVERSION in ~/.sversionrc, "
- echo "yet the directory $OOHOME exists."
- echo "Please remove $OOHOME and try again."
- exit 1
- fi
-
- echo "running openoffice.org setup..."
- if ! /opt/OpenOffice.org${PV}/program/setup ${UPDATEFLAG} -R:/etc/openoffice/autoresponse-<pv>.conf >& /dev/null; then
- echo "setup failed.. abort"
- exit 1
- fi
-
-
-# fi
-
- echo "Setup complete. Running openoffice.org..."
-
-else
- echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break"
- echo "the /etc/openoffice/autoresponse-<pv>.conf file manually ?"
- echo "This file should contain DESTINATIONPATH"
- exit 1
- fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
- case `basename $0` in
- oocalc) set -- private:factory/scalc;;
- oodraw) set -- private:factory/sdraw;;
- ooimpress) set -- private:factory/simpress;;
- oomath) set -- private:factory/smath;;
- oowriter) set -- private:factory/swriter;;
- oohtml) set -- private:factory/swriter/web;;
- oomaster) set -- private:factory/swriter/Global;;
- esac
-fi
-
-## Previous dead installation?
-[ -d $HOME/.openoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.openoffice/user - this is no longer used"
-
-# There is no locale import file
-## Change the ooLocale key in SETUPFILE acording to LOCALE
-#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-# cat >${TMPFILE} <<EOF
-#<?xml version="1.0" encoding="UTF-8"?>
-#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
-# <node oor:name="L10N">
-# <prop oor:name="ooLocale" oor:type="xs:string">
-# <value>$LOCALEOO</value>
-# </prop>
-# </node>
-#</oor:node>
-#EOF
-# ooconfigimport $TMPFILE >/dev/null
-# rm -f ${TMPFILE}
-#}
-
-# Check whether the programs actually link to anything, or are from an old
-# version.
-
-if [ ! -s $OOHOME/setup ]; then
- echo "${OOHOME}/setup links to nothing, resetting link"
- ln -sf /opt/OpenOffice.org${PV}/program/setup ${OOHOME}/setup
-fi
-if [ ! -s $OOHOME/soffice ]; then
- echo "${OOHOME}/soffice links to nothing, resetting link"
- ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/soffice
-fi
-if [ ! -s $OOHOME/spadmin ]; then
- echo "${OOHOME}/spadmin links to nothing, resetting link"
- ln -sf /opt/OpenOffice.org${PV}/program/soffice ${OOHOME}/spadmin
-fi
-
-
-##
-## That's it. Launch the beast (with the given args)
-##
-LANG=$LOCALE
-export LANG
-case `basename $0` in
- oosetup) exec "$OOHOME/setup"
- ;;
- oopadmin) exec "$OOHOME/spadmin"
- ;;
- *) exec "$OOHOME/soffice" "$@"
- ;;
-esac
-## Changelog
-# 2003/04/01 halls
-# * Version 1.1beta
-# 2003/02/03 halls
-# * Check for nonexistent ooLocale every run
-# 2003/01/09 halls
-# * Version 1.0.2
-# 12/15 saviot
-# * Change ooLocale at startup in Setup.xml
-# <ooLocale cfg:type="string"/> doesn't work for help.
-# 12/03 challs
-# * Add Debian font paths to user font path
-# 11/14 saviot
-# * correct handling of UI language
-# * don't change Linguistic.xml after first startup(#168780)
-# * TODO: provide better defaults on first startup
-# 10/03 challs
-# * Fix use with LC_ALL
-# 07/10 challs
-# * use 1.0.1 directory and improve error checking
-# 07/02 challs
-# * use readlink in /proc/PID/exe to get
-# real session manager name
-# 06/12 challs
-# * merge into main package
-# * change $@ to "$@"
-# * source configuration file:
-# /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-# * strace only when DEBUG is set to yes
-# * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-# * Make sure the OLDLOCALE is never empty
-# * handle the case where the locale is C
diff --git a/app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch b/app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch
deleted file mode 100644
index 46a6e9734aa6..000000000000
--- a/app-office/openoffice/files/1.1.1_rc1/openoffice-java.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2004-02-10 01:00:11.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOAddInCreateIterator.java 2004-02-09 11:19:53.000000000 +0100
-@@ -200,7 +200,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current() {
-+ public org.openide.WizardDescriptor.Panel current() {
- return panels[index];
- }
-
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2004-02-10 01:00:48.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOIDLWizardIterator.java 2004-02-09 11:20:15.000000000 +0100
-@@ -207,7 +207,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current()
-+ public org.openide.WizardDescriptor.Panel current()
- {
- return panels[index];
- }
-diff -urN oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java
---- oo_1.1_src.orig/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2004-02-10 01:01:29.000000000 +0100
-+++ oo_1.1_src/odk/source/OOSupport/org/netbeans/modules/openoffice/wizard/OOServiceCreateIterator.java 2004-02-09 11:20:35.000000000 +0100
-@@ -214,7 +214,7 @@
- index--;
- }
-
-- public org.openide.WizardDescriptor$Panel current() {
-+ public org.openide.WizardDescriptor.Panel current() {
- return panels[index];
- }
-
diff --git a/app-office/openoffice/files/digest-openoffice-1.1.1_rc1 b/app-office/openoffice/files/digest-openoffice-1.1.1_rc1
deleted file mode 100644
index 957870d51900..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.1.1_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 24ed3d57a01a59edfae95fe575476719 OOo_1.1.1rc_source.tar.bz2 194278533
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
diff --git a/app-office/openoffice/openoffice-1.1.1_rc1.ebuild b/app-office/openoffice/openoffice-1.1.1_rc1.ebuild
deleted file mode 100644
index 3c883f0d7464..000000000000
--- a/app-office/openoffice/openoffice-1.1.1_rc1.ebuild
+++ /dev/null
@@ -1,535 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1_rc1.ebuild,v 1.2 2004/03/28 11:50:59 suka Exp $
-
-# IMPORTANT: This is extremely alpha!!!
-
-# Notes:
-#
-# This will take a HELL of a long time to compile, be warned.
-# According to openoffice.org, it takes approximately 12 hours on a
-# P3/600 with 256mb ram. And thats where building is its only task.
-#
-# It takes about 6 hours on my P4 1.8 with 512mb memory, and the
-# build only needs about 2.1GB of disk space - Azarah.
-#
-# You will also need a bucketload of diskspace ... in the order of
-# 4-5 gb free to store all the compiled files and installation
-# directories.
-#
-# The information on how to build and what is required comes from:
-# http://www.openoffice.org/dev_docs/source/build_linux.html
-# http://tools.openoffice.org/ext_comp.html
-#
-# Todo:
-#
-# Get support going for installing a custom language pack. Also
-# need to be able to install more than one language pack.
-
-inherit flag-o-matic eutils gcc
-
-# Compile problems with these ...
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-filter-flags "-fprefetch-loop-arrays"
-append-flags "-fno-strict-aliasing"
-replace-flags "-O3" "-O2"
-replace-flags "-Os" "-O2"
-
-# Enable Bytecode Interpreter for freetype ...
-append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
-
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
-
-# Set $ECPUS to amount of processes multiprocessing build should use.
-# NOTE: Setting this too high might cause dmake to segfault!!
-# Setting this to anything but "1" on my pentium4 causes things
-# to segfault :(
-[ -z "${ECPUS}" ] && export ECPUS="1"
-
-
-LOC="/opt"
-INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${PV/_rc1}_src"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/contrib/rc/${PV//_rc1/rc}/OOo_${PV//_rc1/rc}_source.tar.bz2
- ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"
-HOMEPAGE="http://www.openoffice.org/"
-
-LICENSE="LGPL-2 | SISSL-1.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gnome kde"
-
-RDEPEND=">=sys-libs/glibc-2.1
- !=sys-libs/glibc-2.3.1*
- >=dev-lang/perl-5.0
- x11-libs/startup-notification
- virtual/x11
- app-arch/zip
- app-arch/unzip
- dev-libs/expat
- >=virtual/jre-1.4.1
- virtual/lpr
- ppc? ( >=sys-libs/glibc-2.2.5-r7
- >=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
-
-DEPEND="${RDEPEND}
- app-shells/tcsh
- !app-office/openoffice-bin
- >=virtual/jdk-1.4.1
- sys-apps/findutils
- dev-util/pkgconfig"
-
-pkg_setup() {
-
- if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
- then
- eerror
- eerror "This build needs gcc-3.{2,3}.x, but due to profile"
- eerror "settings, it cannot DEPEND on it, so please merge it"
- eerror "manually:"
- eerror
- eerror " # ebuild ${PORTDIR}/sys-devel/gcc/gcc-3.2.1.ebuild merge"
- eerror
- eerror "Please make sure that you use the latest availible revision of"
- eerror "gcc."
- eerror
- die
- fi
-
- if [ -z "$(/usr/bin/java-config -O | grep "blackdown-jdk")" ] && [ "${FORCE_JAVA}" != "yes" ]
- then
- eerror
- eerror "This ebuild has only been tested with the blackdown port of"
- eerror "java. If you use another java implementation, it could fail"
- eerror "horribly, so please merge the blackdown-jdk and set it as"
- eerror "system VM before proceeding:"
- eerror
- eerror " # emerge blackdown-jdk"
- eerror " # java-config --set-system-vm=blackdown-jdk-<VERSION>"
- eerror " # env-update"
- eerror " # source /etc/profile"
- eerror
- eerror "Please adjust <VERSION> according to the version installed in"
- eerror "/opt."
- eerror
- eerror "If you however want to test another JDK (not officially supported),"
- eerror "you could do the following:"
- eerror
- eerror " # export FORCE_JAVA=yes"
- eerror
- die
- fi
-
- ewarn "****************************************************************"
- ewarn " It is important to note that OpenOffice.org is a very fragile "
- ewarn " build when it comes to CFLAGS. A number of flags have already "
- ewarn " been filtered out. If you experience difficulty merging this "
- ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to "
- ewarn " merge again. "
- ewarn "****************************************************************"
-
- set_languages
-
-}
-
-set_languages () {
- if [ -z "$LANGUAGE" ]; then
- LANGUAGE=01
- fi
-
- case "$LANGUAGE" in
- 01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)"
- ;;
- 03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese
- ;;
- 07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian
- ;;
- 30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek
- ;;
- 31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch
- ;;
- 33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French
- ;;
- 34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish
- ;;
- 35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish
- ;;
- 37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan
- ;;
- 39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian
- ;;
- 42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech
- ;;
- 43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak
- ;;
- 45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish
- ;;
- 46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish
- ;;
- 48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish
- ;;
- 49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German
- ;;
- 55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian"
- ;;
- 66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai
- ;;
- 77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian
- ;;
- 81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese"
- ;;
- 82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean
- ;;
- 86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)"
- ;;
- 88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)"
- ;;
- 90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish
- ;;
- 91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi
- ;;
- 96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic
- ;;
- 97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew
- ;;
- * )
- eerror "Unknown LANGUAGE setting!"
- eerror
- eerror "Known LANGUAGE settings are:"
- eerror " ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |"
- eerror " CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |"
- eerror " JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW"
- die
- ;;
- esac
-}
-
-oo_setup() {
-
- unset LANGUAGE
- unset LANG
-
- export NEW_GCC="0"
-
- if [ -x /usr/sbin/gcc-config ]
- then
- # Do we have a gcc that use the new layout and gcc-config ?
- if /usr/sbin/gcc-config --get-current-profile &> /dev/null
- then
- export NEW_GCC="1"
- export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
- # Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
- then
- # See if we can get a gcc profile we know is proper ...
- if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
- then
- export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}"
- export GCC_PROFILE="${CHOST}-3.2.1"
- else
- eerror "This build needs gcc-3.2 or gcc-3.3!"
- eerror
- eerror "Use gcc-config to change your gcc profile:"
- eerror
- eerror " # gcc-config $CHOST-3.2.1"
- eerror
- eerror "or whatever gcc version is relevant."
- die
- fi
- fi
- fi
- fi
-
- export JAVA_BINARY="`which java`"
-}
-
-src_unpack() {
-
- oo_setup
-
- cd ${WORKDIR}
- unpack OOo_${PV//_rc1/rc}_source.tar.bz2 gpc231.tar.Z
-
- # Install gpc
- cd ${WORKDIR}/gpc231
- cp gpc.* ${S}/external/gpc
-
- cd ${S}
- rm stlport/STLport-4.5.3.patch
- epatch ${FILESDIR}/${PV}/newstlportfix.patch
-
- epatch ${FILESDIR}/${PV}/nptl.patch
-
- epatch ${FILESDIR}/${PV}/openoffice-java.patch
-
-# if [ ${ARCH} = "sparc" ]; then
-# epatch ${FILESDIR}/${PV}/openoffice-1.1.0-sparc64-fix.patch
-# fi
-
- if [ "$(gcc-version)" == "3.2" ]; then
- einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
- replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
- fi
-
- # Now for our optimization flags ...
- export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
- perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
- ${S}/solenv/inc/unxlngi4.mk
- perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \
- ${S}/solenv/inc/unxlngi4.mk
-
- #Do our own branding by setting gentoo linux as the vendor
- sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src
-}
-
-get_EnvSet() {
-
- # Determine what Env file we should be using (Az)
- export LinuxEnvSet="LinuxIntelEnv.Set.sh"
- use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh"
- use sparc64 && export LinuxEnvSet="LinuxSparcEnv.Set.sh"
- use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh"
- use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh"
-
- # Get build specific stuff (Az)
- export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})"
- export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})"
-
-}
-
-src_compile() {
-
- addpredict /bin
- addpredict /root/.gconfd
- local buildcmd=""
-
- set_languages
-
- oo_setup
-
- # Do NOT compile with a external STLport, as gcc-2.95.3 users will
- # get linker errors due to the ABI being different (STLport will be
- # compiled with 2.95.3, while OO is compiled with 3.x). (Az)
- einfo "Configuring OpenOffice.org with language support for ${LFULLNAME}..."
- cd ${S}/config_office
- rm -f config.cache
- if [ "LANGNAME" != "ENUS" ]; then
- LANGNAME="${LANGNAME},ENUS"
- fi
- ./configure --enable-gcc3 \
- --with-jdk-home=${JAVA_HOME} \
- --with-lang=${LANGNAME}\
- --enable-libsn\
- --without-fonts\
- --with-x || die
-
- cd ${S}
- get_EnvSet
-
- # Should the build use multiprocessing?
- # We use build.pl directly, as dmake tends to segfault. (Az)
- if [ "${ECPUS}" -gt 1 ]
- then
- buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full"
- else
- buildcmd="${S}/solenv/bin/build.pl --all product=full"
- fi
-
- if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
- then
- # Set CCCOMP and CXXCOMP. This is still needed for STLport
- export CCCOMP=${CC}
- export CXXCOMP=${CXX}
- fi
-
- einfo "Bootstrapping OpenOffice.org..."
- # Get things ready for bootstrap (Az)
- chmod 0755 ${S}/solenv/bin/*.pl
- # Bootstrap ...
- ./bootstrap
-
- einfo "Building OpenOffice.org..."
- echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.sh
- sh build.sh || die "Build failed!"
-
- [ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
-}
-
-src_install() {
-
- # Sandbox issues; bug #11838
- addpredict "/user"
- addpredict "/share"
- addpredict "/dev/dri"
- addpredict "/usr/bin/soffice"
- addpredict "/pspfontcache"
-
- set_languages
-
- get_EnvSet
-
- # The install part should now be relatively OK compared to
- # what it was. Basically we use autoresponse files to install
- # unattended. Afterwards we
- # just cleanout ${D} from the registry, etc. This way we
- # do not need pre-generated registry, and also fixes some weird
- # bugs related to the old way we did things.
- #
- # <azarah@gentoo.org> (9 Sep 2002)
-
- # Autoresponse file for main installation
- cat > ${T}/rsfile-global <<-"END_RS"
- [ENVIRONMENT]
- INSTALLATIONMODE=INSTALL_NETWORK
- INSTALLATIONTYPE=STANDARD
- DESTINATIONPATH=<destdir>
- OUTERPATH=
- LOGFILE=
- LANGUAGELIST=<LANGUAGE>
-
- [JAVA]
- JavaSupport=preinstalled_or_none
- END_RS
-
- # Autoresponse file for user installation
- cat > ${T}/rsfile-local <<-"END_RS"
- [ENVIRONMENT]
- INSTALLATIONMODE=INSTALL_WORKSTATION
- INSTALLATIONTYPE=WORKSTATION
- DESTINATIONPATH=<home>/.openoffice/<pv>
-
- [JAVA]
- JavaSupport=none
- END_RS
-
- # Fixing install location in response file
- sed -e "s|<destdir>|${D}${INSTDIR}|" \
- ${T}/rsfile-global > ${T}/autoresponse
-
- einfo "Installing OpenOffice.org into build root..."
- dodir ${INSTDIR}
- cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal
- ./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
-
- echo
- einfo "Removing build root from registry..."
- # Remove totally useless stuff.
- rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
- # Remove build root from registry and co
- egrep -rl "${D}" ${D}${INSTDIR}/* | \
- xargs -i perl -pi -e "s|${D}||g" {} || :
-
- einfo "Fixing permissions..."
- # Fix permissions
- find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
- chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
-
- # Fix symlinks
- for x in "soffice program/spadmin" \
- "program/setup setup" \
- "program/spadmin spadmin"
- do
- dosym $(echo ${x} | awk '{print $1}') \
- ${INSTDIR}/$(echo ${x} | awk '{print $2}')
- done
-
- # Install user autoresponse file
- insinto /etc/openoffice
- sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
- doins ${T}/autoresponse-${PV}.conf
-
- # Install wrapper script
- exeinto /usr/bin
- sed -e "s|<pv>|${PV}|g" \
- ${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
- doexe ${T}/ooffice
-
- # Component symlinks
- for app in calc draw impress math writer web setup padmin; do
- dosym ooffice /usr/bin/oo${app}
- done
-
- einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
- if [ -n "`use gnome`" ]
- then
- insinto /usr/share/gnome/apps/OpenOffice.org
- # Install the files needed for the catagory
- doins ${D}${INSTDIR}/share/gnome/net/.directory
- doins ${D}${INSTDIR}/share/gnome/net/.order
-
- # Change this to ooo*.desktop from *.desktop for now, since
- # otherwise two sets of icons will appear in the GNOME menu.
- # <brad@gentoo.org> (04 Aug 2003)
- for x in ${D}${INSTDIR}/share/gnome/net/ooo*.desktop
- do
- # We have to handle soffice and setup differently
- perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
- perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
- # Now fix the rest
- perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
- doins ${x}
- done
- fi
-
- if [ -n "`use kde`" ]
- then
- local kdeloc="${D}${INSTDIR}/share/kde/net/"
-
- insinto /usr/share/applnk/OpenOffice.org\ 1.1
- # Install the files needed for the catagory
- doins ${kdeloc}/.directory
- dodir /usr/share
- # Install the icons and mime info
- cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
-
- for x in ${kdeloc}/*.desktop
- do
- # We have to handle soffice and setup differently
- perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
- perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x}
- # Now fix the rest
- perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
- doins ${x}
- done
- fi
-
- # Do not actually install the desktop bindings for users, we have
- # installed them globally
- for module in gid_Module_Optional_Gnome gid_Module_Optional_Kde gid_Module_Optional_Cde
- do
- perl -pi -e "/^Module $module/ .. /^End/ and s|(Installed.*)=.*|\1= NO;|" \
- ${D}${INSTDIR}/program/instdb.ins
- done
-
-
-
- # Remove unneeded stuff
- rm -rf ${D}${INSTDIR}/share/cde
-
- # Make sure these do not get nuked.
- keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
- keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
- keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
-}
-
-pkg_postinst() {
-
- einfo "******************************************************************"
- einfo " To start OpenOffice.org, run:"
- einfo
- einfo " $ ooffice"
- einfo
- einfo " Also, for individual components, you can use any of:"
- einfo
- einfo " oocalc, oodraw, ooimpress, oomath, ooweb or oowriter"
- einfo
- einfo " If the fonts appear garbled in the user interface refer to "
- einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
- einfo
- einfo "******************************************************************"
-}
-