Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office/openoffice
diff options
context:
space:
mode:
authorSeth Chandler <sethbc@gentoo.org>2003-04-10 20:44:28 +0000
committerSeth Chandler <sethbc@gentoo.org>2003-04-10 20:44:28 +0000
commit0c9bd40a12157265f2a9b8e9e6631d338673bb63 (patch)
tree5112671fa8149aec0d24bb8ebbf0fe826aa252c3 /app-office/openoffice
parentadded 1.0.3 to portage, will unmask when it comes out (diff)
downloadhistorical-0c9bd40a12157265f2a9b8e9e6631d338673bb63.tar.gz
historical-0c9bd40a12157265f2a9b8e9e6631d338673bb63.tar.bz2
historical-0c9bd40a12157265f2a9b8e9e6631d338673bb63.zip
added 1.0.3 to portage, will unmask when it comes out
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/Manifest6
-rw-r--r--app-office/openoffice/files/1.0.3/freetype-2.1.3.patch33
-rw-r--r--app-office/openoffice/files/1.0.3/ooffice-wrapper-1.2238
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-compiler-flags.patch24
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-asm.patch86
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch57
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-no-mozab.patch68
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch285
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch285
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch319
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch22
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.2-default-fonts.patch174
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch14
-rw-r--r--app-office/openoffice/files/1.0.3/openoffice-errno.patch10
-rw-r--r--app-office/openoffice/files/digest-openoffice-1.0.34
-rw-r--r--app-office/openoffice/files/digest-openoffice-1.1_beta1
-rw-r--r--app-office/openoffice/openoffice-1.0.3.ebuild589
17 files changed, 2210 insertions, 5 deletions
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 6bac171e93b5..6650c6441fc2 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,6 +1,6 @@
-MD5 7ec7b2a4bccf2a8b47afe171def93125 openoffice-1.0.3.ebuild 18329
+MD5 4bdb5ab0281ec89c3d6a95fe1368bf4e openoffice-1.0.3.ebuild 18326
MD5 2bcfc01a7018c7309e5afe484897f1ba openoffice-1.1_beta.ebuild 16779
-MD5 042262baad13a7a5a5b17a6fe1cf2e85 manifest 2178
+MD5 922df18eea6a194f4a981422ba31ce04 manifest 2178
MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
MD5 58f842fee23dd5bb144251bd3543016e ChangeLog 4519
@@ -31,8 +31,6 @@ MD5 80d0277676c6b7e55b29a12b02eae325 files/1.0.2/openoffice-1.0.2-ft-antialias-a
MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.3/openoffice-1.0.1-fix-asm.patch 2207
MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.3/freetype-2.1.3.patch 1367
MD5 271539dafab707398e9b806eef8f250a files/1.0.3/ooffice-wrapper-1.2 8220
-MD5 bda06da1ebc54aa07da68831cb77480f files/1.0.3/openoffice-1.0.1-dont-unset-home.patch 1000
-MD5 92e731a066e45536e55b07894f18096c files/1.0.3/ooffice-wrapper 7460
MD5 58a4bf52e74e8e287c29956229b94ff9 files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch 1052
MD5 d56f7c3ee055eb733a7d6a9d87ccc6d7 files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch 2091
MD5 5d4663d4ee957ca7329fed3e72e9555c files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch 10481
diff --git a/app-office/openoffice/files/1.0.3/freetype-2.1.3.patch b/app-office/openoffice/files/1.0.3/freetype-2.1.3.patch
new file mode 100644
index 000000000000..4aaad505a30d
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/freetype-2.1.3.patch
@@ -0,0 +1,33 @@
+diff -ru misc/freetype-2.1.3/builds/compiler/visualc.mk misc/build/freetype-2.1.3/builds/compiler/visualc.mk
+--- misc/freetype-2.1.3/builds/compiler/visualc.mk 2000-12-14 00:44:33.000000000 +0100
++++ misc/build/freetype-2.1.3/builds/compiler/visualc.mk 2002-09-20 10:20:11.000000000 +0200
+@@ -63,7 +63,7 @@
+ # ANSI compliance.
+ #
+ ifndef CFLAGS
+- CFLAGS := /nologo /c /Ox /G5 /W3 /WX
++ CFLAGS := /nologo /c /Ox /G5 /W3 /WX /MT /Gd -D_CTYPE_DISABLE_MACROS
+ endif
+
+ # ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
+diff -ru misc/freetype-2.1.3/builds/unix/ltmain.sh misc/build/freetype-2.1.3/builds/unix/ltmain.sh
+--- misc/freetype-2.1.3/builds/unix/ltmain.sh 2002-03-05 16:09:59.000000000 +0100
++++ misc/build/freetype-2.1.3/builds/unix/ltmain.sh 2002-09-20 10:20:11.000000000 +0200
+@@ -643,7 +643,7 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $srcfile -DPIC $pic_flag"
+ else
+ # All platforms use -DPIC, to notify preprocessed assembler code.
+ command="$base_compile $srcfile $pic_flag -DPIC"
+@@ -2274,7 +2274,7 @@
+ ;;
+
+ irix)
+- major=`expr $current - $age + 1`
++ major=`expr $current - $age`
+ verstring="sgi$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
diff --git a/app-office/openoffice/files/1.0.3/ooffice-wrapper-1.2 b/app-office/openoffice/files/1.0.3/ooffice-wrapper-1.2
new file mode 100644
index 000000000000..5f92769b809c
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/ooffice-wrapper-1.2
@@ -0,0 +1,238 @@
+#!/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
+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 ~/.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.conf ] && \
+ grep -q DESTINATIONPATH /etc/openoffice/autoresponse.conf ; then
+ # first install
+ OOHOME=`grep DESTINATIONPATH /etc/openoffice/autoresponse.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
+
+ if oldhome="`get_settings_dir "OpenOffice.org 1.0.1"`" ; then
+ OOHOME="$oldhome"
+ echo "Using settings from 1.0.1"
+ /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.sversionrc
+ else
+ echo "running openoffice.org setup..."
+ if ! /opt/OpenOffice.org<pv>/program/setup -R:/etc/openoffice/autoresponse.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.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"
+
+SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
+mv $SETUPFILE $SETUPFILE.tmp
+
+if ! grep -q "\<ooLocale" $SETUPFILE.tmp ; then
+ # Set ooLocale to nothing in $SETUPFILE. The UI language is handled by LANG.
+ # A good value for ooLocale will be set before starting.
+ cat $SETUPFILE.tmp | \
+ perl -e "while (<>) { /<Office>/ && print \" <L10N>\n <ooLocale cfg:type=\\\"string\\\"/>\n </L10N>\n\";print \$_;}" > \
+ $SETUPFILE
+ rm -f $SETUPFILE.tmp
+ mv $SETUPFILE $SETUPFILE.tmp
+fi
+
+## Change the ooLocale key in SETUPFILE acording to LOCALE
+cat $SETUPFILE.tmp | \
+ sed 's#<ooLocale\>[^/]*/[^>]*>#<ooLocale cfg:type="string">'$LOCALEOO'</ooLocale>#'\
+ > $SETUPFILE
+rm -f $SETUPFILE.tmp
+
+##
+## That's it. Launch the beast (with the given args)
+##
+LANG=$LOCALE
+export LANG
+export LD_PRELOAD=/usr/lib/libfreetype.so
+exec "$OOHOME/soffice" "$@"
+
+## Changelog
+# 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.0.3/openoffice-1.0.1-compiler-flags.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-compiler-flags.patch
new file mode 100644
index 000000000000..a7084201a5b7
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-compiler-flags.patch
@@ -0,0 +1,24 @@
+Index: oo_cvs/solenv/inc/unxlngi4.mk
+===================================================================
+RCS file: /cvs/oo/tools/solenv/inc/unxlngi4.mk,v
+retrieving revision 1.13
+diff -u -3 -p -u -r1.13 unxlngi4.mk
+--- oo_cvs/solenv/inc/unxlngi4.mk 2002/03/04 15:53:59 1.13
++++ oo_cvs/solenv/inc/unxlngi4.mk 2002/08/12 08:59:08
+@@ -96,14 +96,14 @@ CFLAGS=
+ .ENDIF
+ CFLAGS+=-fmessage-length=0 -c $(INCLUDE)
+ # flags for the C++ Compiler
+-CFLAGSCC= -pipe -mcpu=pentiumpro
++CFLAGSCC= -pipe
+ # Flags for enabling exception handling
+ CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+ # Flags for disabling exception handling
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+
+ # -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe -mcpu=pentiumpro -fno-for-scope -fpermissive
++CFLAGSCXX= -pipe -fno-for-scope -fpermissive
+
+ # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers
+ .IF "$(BUILD_SOSL)"==""
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-asm.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-asm.patch
new file mode 100644
index 000000000000..476cd704bfec
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-asm.patch
@@ -0,0 +1,86 @@
+--- oo_1.0_src/sal/osl/unx/interlck.c.jj Wed May 2 17:03:13 2001
++++ oo_1.0_src/sal/osl/unx/interlck.c Thu May 30 10:45:19 2002
+@@ -83,9 +83,11 @@ oslInterlockedCount SAL_CALL osl_increme
+ "lock\n\t"
+ "xadd %0, %2\n\t"
+ "incl %0"
+- : "=a" (nCount), "=m" (*pCount)
++ : "=&r" (nCount), "=m" (*pCount)
+ : "m" (*pCount)
+ : "memory");
++
++ return nCount;
+ }
+
+ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount* pCount)
+@@ -97,9 +99,11 @@ oslInterlockedCount SAL_CALL osl_decreme
+ "lock\n\t"
+ "xadd %0, %2\n\t"
+ "decl %0"
+- : "=a" (nCount), "=m" (*pCount)
++ : "=&r" (nCount), "=m" (*pCount)
+ : "m" (*pCount)
+ : "memory");
++
++ return nCount;
+ }
+
+ #elif defined ( GCC ) && defined ( POWERPC )
+@@ -117,7 +121,7 @@ oslInterlockedCount SAL_CALL osl_increme
+ " addi %0,%0,1\n\t"
+ " stwcx. %0,0,%2\n\t"
+ " bne- 1b"
+- : "=r" (nCount), "=m" (*pCount)
++ : "=&r" (nCount), "=m" (*pCount)
+ : "r" (pCount)
+ : "r4", "memory");
+
+@@ -134,7 +138,7 @@ oslInterlockedCount SAL_CALL osl_decreme
+ " subi %0,%0,1\n\t"
+ " stwcx. %0,0,%2\n\t"
+ " bne- 1b"
+- : "=r" (nCount), "=m" (*pCount)
++ : "=&r" (nCount), "=m" (*pCount)
+ : "r" (pCount)
+ : "r4", "memory");
+
+--- oo_1.0_src/bridges/source/c_uno/intelx86.cxx.jj Wed Apr 18 13:05:48 2001
++++ oo_1.0_src/bridges/source/c_uno/intelx86.cxx Thu May 30 11:37:26 2002
+@@ -95,24 +95,21 @@ Lcopy: sub eax, 4
+ add esp, eax
+ }
+ #elif GCC
++ int ecx, edx;
++
+ __asm__
+ (
+- "mov %2, %%eax\n\t"
+- "mov %%eax, %%ecx\n\t"
+- "shl $2, %%eax\n\t"
+- "add %1, %%eax\n"
+- "Lcopy:\n\t"
+- "sub $4, %%eax\n\t"
+- "pushl (%%eax)\n\t"
+- "dec %%ecx\n\t"
+- "jne Lcopy\n\t"
+- "mov %0, %%eax\n\t"
+- "call *%%eax\n\t"
+- "mov %%eax, %3\n"
+- "mov %2, %%eax\n\t"
+- "shl $2, %%eax\n\t"
+- "add %%eax, %%esp\n\t"
+- : : "m"(fptr), "m"(pParams), "m"(nParams), "m"(retVal)
++ "1:\n\t"
++ "subl $4, %0\n\t"
++ "pushl (%0)\n\t"
++ "decl %1\n\t"
++ "jne 1b\n\t"
++ "call *%2\n\t"
++ "leal 0(%%esp,%3,4), %%esp\n\t"
++ : "=a"(retVal), "=c"(ecx), "=d"(edx)
++ : "S"(nParams),
++ "0" (((int *) pParams) + nParams), "1" (nParams), "2"(fptr)
++ : "memory", "cc"
+ );
+ #else
+ #error "### unsupported x86 compiler!"
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch
new file mode 100644
index 000000000000..ff9fe8b5dd7a
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-fix-jdk-1.4.0.patch
@@ -0,0 +1,57 @@
+--- XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java.orig 2002-12-02 22:59:26.000000000 -0500
++++ XmlSearch/src/com/sun/xmlsearch/util/ExtensibleURLStreamHandlerFactory.java 2002-12-02 23:01:49.000000000 -0500
+@@ -79,7 +79,7 @@
+ Class.forName(className != null
+ ? className
+ : "sun.net.www.protocol." + protocol + ".Handler");
+- return (URLStreamHandler)handlerClass.newInstance();;
++ return (URLStreamHandler)handlerClass.newInstance();
+ }
+ catch (Exception e) {
+ System.err.println(e);
+
+--- sj2/stardiv/app/AppletViewer.java.orig 2002-11-25 15:30:49.000000000 -0500
++++ sj2/stardiv/app/AppletViewer.java 2002-11-25 15:29:15.000000000 -0500
+@@ -196,7 +196,7 @@
+ public AppletViewer(int x, int y, URL doc, Hashtable atts, PrintStream statusMsgStream) {
+ // resourceViewer = new stardiv.util.ResourceViewer();
+ // resourceViewer.show();
+- System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
++// System.err.println("#*#*#*:" + sun.awt.ScreenUpdater.updater);
+ this.statusMsgStream = statusMsgStream;
+ this.atts = atts;
+
+--- sj2/stardiv/applet/DocumentProxy.java.orig 2002-11-25 22:11:41.000000000 -0500
++++ sj2/stardiv/applet/DocumentProxy.java 2002-11-25 22:16:25.000000000 -0500
+@@ -73,6 +73,8 @@
+ import java.util.Hashtable;
+ import java.util.Observer;
+ import java.util.Observable;
++import java.util.Iterator;
++import java.io.InputStream;
+
+ import java.net.URL;
+
+@@ -96,6 +98,22 @@
+ return documentProxy;
+ }
+
++ // AppletContext. This method is new since 1.4. We insert it so as to
++ // have the project buildable
++ public void setStream( String key,InputStream stream)
++ throws java.io.IOException {
++ }
++ // AppletContext. This method is new since 1.4. We insert it so as to
++ // have the project buildable
++ public InputStream getStream( String key) {
++ return null;
++ }
++ // AppletContext. This method is new since 1.4. We insert it so as to
++ // have the project buildable
++ public Iterator getStreamKeys() {
++ return null;
++ }
++
+
+ /*
+ ** interface cachable methods
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-no-mozab.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-no-mozab.patch
new file mode 100644
index 000000000000..542253fb1b86
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-no-mozab.patch
@@ -0,0 +1,68 @@
+--- oo_1.0_src/connectivity/prj/build.lst.no-mozab 2001-11-07 12:00:01.000000000 +0100
++++ oo_1.0_src/connectivity/prj/build.lst 2002-05-02 13:25:49.000000000 +0200
+@@ -1,4 +1,4 @@
+-cn connectivity : comphelper moz svtools NULL
++cn connectivity : comphelper svtools 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_types NULL
+@@ -7,8 +7,6 @@ cn connectivity\source\cpool nmake -
+ 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\calc nmake - all cn_calc cn_file NULL
+ cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools NULL
+ cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools NULL
+--- oo_1.0_src/scp/source/office/files.scp.no-mozab 2002-04-17 10:18:19.000000000 +0200
++++ oo_1.0_src/scp/source/office/files.scp 2002-05-06 11:13:47.000000000 +0200
+@@ -453,17 +453,6 @@ File GID_FILE_LIB_DBODBCBASE
+ Dir = GID_DIR_PROGRAM;
+ Styles = (PACKED);
+ End
+-File GID_FILE_LIB_MOZABDRV
+- BIN_FILE_BODY;
+- #ifdef UNX
+- Name = "libmozabdrv2.so";
+- #else
+- Name = "mozabdrv2.dll";
+- #endif
+- Dir = GID_DIR_PROGRAM;
+- Styles = (PACKED);
+-End
+-
+
+ STD_UNO_LIB_FILE( GID_FILE_LIB_DBU, dbu )
+ STD_UNO_LIB_FILE( GID_FILE_LIB_DBA, dba)
+@@ -852,18 +841,6 @@ File GID_FILE_LIB_ODBC_2
+ #endif
+ End
+
+-File GID_FILE_LIB_MOZAB_2
+- BIN_FILE_BODY;
+- Styles = (PACKED,UNO_COMPONENT);
+- RegistryID = GID_STARREGISTRY_APPLICAT_RDB;
+- Dir = GID_DIR_PROGRAM;
+- #ifdef UNX
+- Name = "libmozab2.so";
+- #else
+- Name = "mozab2.dll";
+- #endif
+-End
+-
+ File GID_FILE_LIB_SDBC_2
+ BIN_FILE_BODY;
+ Styles = (PACKED,UNO_COMPONENT);
+@@ -2954,11 +2931,3 @@ End
+ #endif
+
+ #endif // of #ifdef SOLAR_JAVA
+-
+-File GID_FILE_MOZILLA_RUNTIME
+- BIN_FILE_BODY;
+- Styles = (ARCHIVE);
+- Dir = GID_DIR_PROGRAM;
+- Name = "mozruntime.zip";
+-End
+-
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
new file mode 100644
index 000000000000..6e96f366c4e2
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
@@ -0,0 +1,285 @@
+diff -urN stlport/STLport-4.5.3.patch stlport.azarah/STLport-4.5.3.patch
+--- stlport/STLport-4.5.3.patch Thu Jan 1 02:00:00 1970
++++ stlport.azarah/STLport-4.5.3.patch Tue Sep 10 22:50:10 2002
+@@ -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/makefile.mk stlport.azarah/makefile.mk
+--- stlport/makefile.mk Tue Sep 10 22:38:00 2002
++++ stlport.azarah/makefile.mk Tue Sep 10 22:39:11 2002
+@@ -72,8 +72,8 @@
+ # --- Files --------------------------------------------------------
+
+ .IF "$(COMID)"=="gcc3"
+-TARFILE_NAME=STLport-4.5
+-PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
++TARFILE_NAME=STLport-4.5.3
++PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
+ .ELSE # "$(COMID)"=="gcc3"
+ TARFILE_NAME=STLport-4.0
+ PATCH_FILE_NAME=STLport-4.0.patch
+@@ -152,7 +152,7 @@
+ @echo " Therefore the version provided here does not need to be built in addition."
+ +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
+ .ELSE
+-all : $(MISC)$/STLport-4.5.patch ALLTAR
++all : $(MISC)$/STLport-4.5.3.patch ALLTAR
+ .ENDIF
+
+ .INCLUDE : set_ext.mk
+@@ -160,8 +160,8 @@
+ .INCLUDE : tg_ext.mk
+
+
+-$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
+- +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
++$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch
++ +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch
+
+ .IF "$(GUI)"=="WNT"
+
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch
new file mode 100644
index 000000000000..0517cd7fcc09
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-STLport-4.5.3.patch
@@ -0,0 +1,285 @@
+diff -urN stlport/STLport-4.5.3.patch stlport.azarah/STLport-4.5.3.patch
+--- stlport/STLport-4.5.3.patch Thu Jan 1 02:00:00 1970
++++ stlport.azarah/STLport-4.5.3.patch Tue Sep 10 22:50:10 2002
+@@ -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++-v32
++! # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v32/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++-v32
++ # 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++-v32
++ # 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/makefile.mk stlport.azarah/makefile.mk
+--- stlport/makefile.mk Tue Sep 10 22:38:00 2002
++++ stlport.azarah/makefile.mk Tue Sep 10 22:39:11 2002
+@@ -72,8 +72,8 @@
+ # --- Files --------------------------------------------------------
+
+ .IF "$(COMID)"=="gcc3"
+-TARFILE_NAME=STLport-4.5
+-PATCH_FILE_NAME=$(MISC)$/STLport-4.5.patch
++TARFILE_NAME=STLport-4.5.3
++PATCH_FILE_NAME=$(MISC)$/STLport-4.5.3.patch
+ .ELSE # "$(COMID)"=="gcc3"
+ TARFILE_NAME=STLport-4.0
+ PATCH_FILE_NAME=STLport-4.0.patch
+@@ -152,7 +152,7 @@
+ @echo " Therefore the version provided here does not need to be built in addition."
+ +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
+ .ELSE
+-all : $(MISC)$/STLport-4.5.patch ALLTAR
++all : $(MISC)$/STLport-4.5.3.patch ALLTAR
+ .ENDIF
+
+ .INCLUDE : set_ext.mk
+@@ -160,8 +160,8 @@
+ .INCLUDE : tg_ext.mk
+
+
+-$(MISC)$/STLport-4.5.patch : STLport-4.5.patch
+- +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.patch > $(MISC)$/STLport-4.5.patch
++$(MISC)$/STLport-4.5.3.patch : STLport-4.5.3.patch
++ +$(SED) -e 's#GXX_INCLUDE_PATH#$(GXX_INCLUDE_PATH)#g' < STLport-4.5.3.patch > $(MISC)$/STLport-4.5.3.patch
+
+ .IF "$(GUI)"=="WNT"
+
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch
new file mode 100644
index 000000000000..0d079c32864f
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-use-freetype-2.1.3.patch
@@ -0,0 +1,319 @@
+Index: oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx
+===================================================================
+RCS file: /cvs/oo/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
+retrieving revision 1.69
+diff -u -3 -p -r1.69 gcach_ftyp.cxx
+--- oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx 2002/01/02 10:38:06 1.69
++++ oo_cvs/vcl/source/glyphs/gcach_ftyp.cxx 2002/06/17 14:37:50
+@@ -104,6 +104,13 @@
+ #include "freetype/internal/sfnt.h"
+ #include "freetype/internal/ftstream.h"
+
++// Freetype versions < 2.1 used different stream macro names
++#ifndef FT_NEXT_USHORT
++#define FT_NEXT_USHORT NEXT_UShort
++#define FT_NEXT_SHORT NEXT_Short
++#define FT_NEXT_LONG NEXT_Long
++#endif
++
+ #include <svapp.hxx>
+ #include <settings.hxx>
+ #include <tools/lang.hxx>
+@@ -1200,29 +1207,29 @@ ULONG FreetypeServerFont::GetKernPairs(
+ ImplKernPairData aKernPair;
+
+ const FT_Byte* pBuffer = pKern;
+- USHORT nVersion = NEXT_UShort( pBuffer );
+- USHORT nTableCnt = NEXT_UShort( pBuffer );
++ USHORT nVersion = FT_NEXT_USHORT( pBuffer );
++ USHORT nTableCnt = FT_NEXT_USHORT( pBuffer );
+ if( nVersion != 0 ) // ignore Apple's versions for now
+ nTableCnt = 0;
+ for( USHORT nTableIdx = 0; nTableIdx < nTableCnt; ++nTableIdx )
+ {
+- USHORT nSubVersion = NEXT_UShort( pBuffer );
+- USHORT nSubLength = NEXT_UShort( pBuffer );
+- USHORT nSubCoverage = NEXT_UShort( pBuffer );
++ USHORT nSubVersion = FT_NEXT_USHORT( pBuffer );
++ USHORT nSubLength = FT_NEXT_USHORT( pBuffer );
++ USHORT nSubCoverage = FT_NEXT_USHORT( pBuffer );
+ if( (nSubCoverage&0x03) != 0x01 ) // no interest in minimum info here
+ continue;
+ switch( nSubCoverage >> 8 )
+ {
+ case 0: // version 0, kerning format 0
+ {
+- USHORT nPairs = NEXT_UShort( pBuffer );
++ USHORT nPairs = FT_NEXT_USHORT( pBuffer );
+ pBuffer += 6; // skip search hints
+ aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
+ for( int i = 0; i < nPairs; ++i )
+ {
+- aKernPair.mnChar1 = NEXT_UShort( pBuffer );
+- aKernPair.mnChar2 = NEXT_UShort( pBuffer );
+- /*long nUnscaledKern=*/ NEXT_Short( pBuffer );
++ aKernPair.mnChar1 = FT_NEXT_USHORT( pBuffer );
++ aKernPair.mnChar2 = FT_NEXT_USHORT( pBuffer );
++ /*long nUnscaledKern=*/ FT_NEXT_SHORT( pBuffer );
+ aKernGlyphVector.push_back( aKernPair );
+ }
+ }
+@@ -1231,18 +1238,18 @@ ULONG FreetypeServerFont::GetKernPairs(
+ case 2: // version 0, kerning format 2
+ {
+ const FT_Byte* pSubTable = pBuffer;
+- /*USHORT nRowWidth =*/ NEXT_UShort( pBuffer );
+- USHORT nOfsLeft = NEXT_UShort( pBuffer );
+- USHORT nOfsRight = NEXT_UShort( pBuffer );
+- USHORT nOfsArray = NEXT_UShort( pBuffer );
++ /*USHORT nRowWidth =*/ FT_NEXT_USHORT( pBuffer );
++ USHORT nOfsLeft = FT_NEXT_USHORT( pBuffer );
++ USHORT nOfsRight = FT_NEXT_USHORT( pBuffer );
++ USHORT nOfsArray = FT_NEXT_USHORT( pBuffer );
+
+ const FT_Byte* pTmp = pSubTable + nOfsLeft;
+- USHORT nFirstLeft = NEXT_UShort( pTmp );
+- USHORT nLastLeft = NEXT_UShort( pTmp ) + nFirstLeft - 1;
++ USHORT nFirstLeft = FT_NEXT_USHORT( pTmp );
++ USHORT nLastLeft = FT_NEXT_USHORT( pTmp ) + nFirstLeft - 1;
+
+ pTmp = pSubTable + nOfsRight;
+- USHORT nFirstRight = NEXT_UShort( pTmp );
+- USHORT nLastRight = NEXT_UShort( pTmp ) + nFirstRight - 1;
++ USHORT nFirstRight = FT_NEXT_USHORT( pTmp );
++ USHORT nLastRight = FT_NEXT_USHORT( pTmp ) + nFirstRight - 1;
+
+ ULONG nPairs = (ULONG)(nLastLeft - nFirstLeft + 1) * (nLastRight - nFirstRight + 1);
+ aKernGlyphVector.reserve( aKernGlyphVector.size() + nPairs );
+@@ -1253,7 +1260,7 @@ ULONG FreetypeServerFont::GetKernPairs(
+ aKernPair.mnChar1 = nLeft;
+ for( int nRight = 0; nRight < nLastRight; ++nRight )
+ {
+- if( NEXT_Short( pTmp ) != 0 )
++ if( FT_NEXT_SHORT( pTmp ) != 0 )
+ {
+ aKernPair.mnChar2 = nRight;
+ aKernGlyphVector.push_back( aKernPair );
+@@ -1531,10 +1538,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ // parse GSUB header
+ const FT_Byte* pGsubHeader = pGsubBase;
+- const ULONG nVersion = NEXT_Long( pGsubHeader );
+- const USHORT nOfsScriptList = NEXT_UShort( pGsubHeader );
+- const USHORT nOfsFeatureTable = NEXT_UShort( pGsubHeader );
+- const USHORT nOfsLookupList = NEXT_UShort( pGsubHeader );
++ const ULONG nVersion = FT_NEXT_LONG( pGsubHeader );
++ const USHORT nOfsScriptList = FT_NEXT_USHORT( pGsubHeader );
++ const USHORT nOfsFeatureTable = FT_NEXT_USHORT( pGsubHeader );
++ const USHORT nOfsLookupList = FT_NEXT_USHORT( pGsubHeader );
+
+ typedef std::vector<USHORT> UshortList;
+ UshortList aFeatureIndexList;
+@@ -1542,22 +1549,22 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ // parse Script Table
+ const FT_Byte* pScriptHeader = pGsubBase + nOfsScriptList;
+- const USHORT nCntScript = NEXT_UShort( pScriptHeader );
++ const USHORT nCntScript = FT_NEXT_USHORT( pScriptHeader );
+ for( USHORT nScriptIndex = 0; nScriptIndex < nCntScript; ++nScriptIndex )
+ {
+- const ULONG nTag = NEXT_Long( pScriptHeader ); // e.g. hani/arab/kana/hang
+- const USHORT nOfsScriptTable= NEXT_UShort( pScriptHeader );
++ const ULONG nTag = FT_NEXT_LONG( pScriptHeader ); // e.g. hani/arab/kana/hang
++ const USHORT nOfsScriptTable= FT_NEXT_USHORT( pScriptHeader );
+ if( (nTag != nRequestedScript) && (nRequestedScript != 0) )
+ continue;
+
+ const FT_Byte* pScriptTable = pGsubBase + nOfsScriptList + nOfsScriptTable;
+- const USHORT nDefaultLangsysOfs = NEXT_UShort( pScriptTable );
+- const USHORT nCntLangSystem = NEXT_UShort( pScriptTable );
++ const USHORT nDefaultLangsysOfs = FT_NEXT_USHORT( pScriptTable );
++ const USHORT nCntLangSystem = FT_NEXT_USHORT( pScriptTable );
+ USHORT nLangsysOffset = 0;
+ for( USHORT nLangsysIndex = 0; nLangsysIndex < nCntLangSystem; ++nLangsysIndex )
+ {
+- const ULONG nTag = NEXT_Long( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN
+- const USHORT nOffset= NEXT_UShort( pScriptTable );
++ const ULONG nTag = FT_NEXT_LONG( pScriptTable ); // e.g. KOR/ZHS/ZHT/JAN
++ const USHORT nOffset= FT_NEXT_USHORT( pScriptTable );
+ if( (nTag != nRequestedLangsys) && (nRequestedLangsys != 0) )
+ continue;
+ nLangsysOffset = nOffset;
+@@ -1567,13 +1574,13 @@ bool FreetypeServerFont::ApplyGSUB( cons
+ if( (nDefaultLangsysOfs != 0) && (nDefaultLangsysOfs != nLangsysOffset) )
+ {
+ const FT_Byte* pLangSys = pGsubBase + nOfsScriptList + nOfsScriptTable + nDefaultLangsysOfs;
+- const USHORT nLookupOrder = NEXT_UShort( pLangSys );
+- const USHORT nReqFeatureIdx = NEXT_UShort( pLangSys );
+- const USHORT nCntFeature = NEXT_UShort( pLangSys );
++ const USHORT nLookupOrder = FT_NEXT_USHORT( pLangSys );
++ const USHORT nReqFeatureIdx = FT_NEXT_USHORT( pLangSys );
++ const USHORT nCntFeature = FT_NEXT_USHORT( pLangSys );
+ aFeatureIndexList.push_back( nReqFeatureIdx );
+ for( USHORT i = 0; i < nCntFeature; ++i )
+ {
+- const USHORT nFeatureIndex = NEXT_UShort( pLangSys );
++ const USHORT nFeatureIndex = FT_NEXT_USHORT( pLangSys );
+ aFeatureIndexList.push_back( nFeatureIndex );
+ }
+ }
+@@ -1581,13 +1588,13 @@ bool FreetypeServerFont::ApplyGSUB( cons
+ if( nLangsysOffset != 0 )
+ {
+ const FT_Byte* pLangSys = pGsubBase + nOfsScriptList + nOfsScriptTable + nLangsysOffset;
+- const USHORT nLookupOrder = NEXT_UShort( pLangSys );
+- const USHORT nReqFeatureIdx = NEXT_UShort( pLangSys );
+- const USHORT nCntFeature = NEXT_UShort( pLangSys );
++ const USHORT nLookupOrder = FT_NEXT_USHORT( pLangSys );
++ const USHORT nReqFeatureIdx = FT_NEXT_USHORT( pLangSys );
++ const USHORT nCntFeature = FT_NEXT_USHORT( pLangSys );
+ aFeatureIndexList.push_back( nReqFeatureIdx );
+ for( USHORT i = 0; i < nCntFeature; ++i )
+ {
+- const USHORT nFeatureIndex = NEXT_UShort( pLangSys );
++ const USHORT nFeatureIndex = FT_NEXT_USHORT( pLangSys );
+ aFeatureIndexList.push_back( nFeatureIndex );
+ }
+ }
+@@ -1601,11 +1608,11 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ // parse Feature Table
+ const FT_Byte* pFeatureHeader = pGsubBase + nOfsFeatureTable;
+- const USHORT nCntFeature = NEXT_UShort( pFeatureHeader );
++ const USHORT nCntFeature = FT_NEXT_USHORT( pFeatureHeader );
+ for( USHORT nFeatureIndex = 0; nFeatureIndex < nCntFeature; ++nFeatureIndex )
+ {
+- const ULONG nTag = NEXT_Long( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
+- const USHORT nOffset= NEXT_UShort( pFeatureHeader );
++ const ULONG nTag = FT_NEXT_LONG( pFeatureHeader ); // e.g. locl/vert/trad/smpl/liga/fina/...
++ const USHORT nOffset= FT_NEXT_USHORT( pFeatureHeader );
+
+ // feature (required && (requested || available))?
+ if( (aFeatureIndexList[0] != nFeatureIndex)
+@@ -1614,10 +1621,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
+ continue;
+
+ const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset;
+- const USHORT nCntLookups = NEXT_UShort( pFeatureTable );
++ const USHORT nCntLookups = FT_NEXT_USHORT( pFeatureTable );
+ for( USHORT i = 0; i < nCntLookups; ++i )
+ {
+- const USHORT nLookupIndex = NEXT_UShort( pFeatureTable );
++ const USHORT nLookupIndex = FT_NEXT_USHORT( pFeatureTable );
+ aLookupIndexList.push_back( nLookupIndex );
+ }
+ if( nCntLookups == 0 ) //### hack needed by Mincho/Gothic/Mingliu/Simsun/...
+@@ -1626,10 +1633,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ // parse Lookup List
+ const FT_Byte* pLookupHeader = pGsubBase + nOfsLookupList;
+- const USHORT nCntLookupTable = NEXT_UShort( pLookupHeader );
++ const USHORT nCntLookupTable = FT_NEXT_USHORT( pLookupHeader );
+ for( USHORT nLookupIdx = 0; nLookupIdx < nCntLookupTable; ++nLookupIdx )
+ {
+- const USHORT nOffset = NEXT_UShort( pLookupHeader );
++ const USHORT nOffset = FT_NEXT_USHORT( pLookupHeader );
+ if( std::count( aLookupIndexList.begin(), aLookupIndexList.end(), nLookupIdx ) )
+ aLookupOffsetList.push_back( nOffset );
+ }
+@@ -1639,9 +1646,9 @@ bool FreetypeServerFont::ApplyGSUB( cons
+ {
+ const USHORT nOfsLookupTable = *it;
+ const FT_Byte* pLookupTable = pGsubBase + nOfsLookupList + nOfsLookupTable;
+- const USHORT eLookupType = NEXT_UShort( pLookupTable );
+- const USHORT eLookupFlag = NEXT_UShort( pLookupTable );
+- const USHORT nCntLookupSubtable = NEXT_UShort( pLookupTable );
++ const USHORT eLookupType = FT_NEXT_USHORT( pLookupTable );
++ const USHORT eLookupFlag = FT_NEXT_USHORT( pLookupTable );
++ const USHORT nCntLookupSubtable = FT_NEXT_USHORT( pLookupTable );
+
+ // TODO: switch( eLookupType )
+ if( eLookupType != 1 ) // TODO: once we go beyond SingleSubst
+@@ -1649,28 +1656,28 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ for( USHORT nSubTableIdx = 0; nSubTableIdx < nCntLookupSubtable; ++nSubTableIdx )
+ {
+- const USHORT nOfsSubLookupTable = NEXT_UShort( pLookupTable );
++ const USHORT nOfsSubLookupTable = FT_NEXT_USHORT( pLookupTable );
+ const FT_Byte* pSubLookup = pGsubBase + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable;
+
+
+- const USHORT nFmtSubstitution = NEXT_UShort( pSubLookup );
+- const USHORT nOfsCoverage = NEXT_UShort( pSubLookup );
++ const USHORT nFmtSubstitution = FT_NEXT_USHORT( pSubLookup );
++ const USHORT nOfsCoverage = FT_NEXT_USHORT( pSubLookup );
+
+ typedef std::pair<USHORT,USHORT> GlyphSubst;
+ typedef std::vector<GlyphSubst> SubstVector;
+ SubstVector aSubstVector;
+
+ const FT_Byte* pCoverage = pGsubBase + nOfsLookupList + nOfsLookupTable + nOfsSubLookupTable + nOfsCoverage;
+- const USHORT nFmtCoverage = NEXT_UShort( pCoverage );
++ const USHORT nFmtCoverage = FT_NEXT_USHORT( pCoverage );
+ switch( nFmtCoverage )
+ {
+ case 1: // Coverage Format 1
+ {
+- const USHORT nCntGlyph = NEXT_UShort( pCoverage );
++ const USHORT nCntGlyph = FT_NEXT_USHORT( pCoverage );
+ aSubstVector.reserve( nCntGlyph );
+ for( USHORT i = 0; i < nCntGlyph; ++i )
+ {
+- const USHORT nGlyphId = NEXT_UShort( pCoverage );
++ const USHORT nGlyphId = FT_NEXT_USHORT( pCoverage );
+ aSubstVector.push_back( GlyphSubst( nGlyphId, 0 ) );
+ }
+ }
+@@ -1678,12 +1685,12 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ case 2: // Coverage Format 2
+ {
+- const USHORT nCntRange = NEXT_UShort( pCoverage );
++ const USHORT nCntRange = FT_NEXT_USHORT( pCoverage );
+ for( int i = nCntRange; --i >= 0; )
+ {
+- const USHORT nGlyph0 = NEXT_UShort( pCoverage );
+- const USHORT nGlyph1 = NEXT_UShort( pCoverage );
+- const USHORT nCovIdx = NEXT_UShort( pCoverage );
++ const USHORT nGlyph0 = FT_NEXT_USHORT( pCoverage );
++ const USHORT nGlyph1 = FT_NEXT_USHORT( pCoverage );
++ const USHORT nCovIdx = FT_NEXT_USHORT( pCoverage );
+ for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
+ aSubstVector.push_back( GlyphSubst( j + nCovIdx, 0 ) );
+ }
+@@ -1697,7 +1704,7 @@ bool FreetypeServerFont::ApplyGSUB( cons
+ {
+ case 1: // Single Substitution Format 1
+ {
+- const USHORT nDeltaGlyphId = NEXT_UShort( pSubLookup );
++ const USHORT nDeltaGlyphId = FT_NEXT_USHORT( pSubLookup );
+ for(; it != aSubstVector.end(); ++it )
+ (*it).second = (*it).first + nDeltaGlyphId;
+ }
+@@ -1705,10 +1712,10 @@ bool FreetypeServerFont::ApplyGSUB( cons
+
+ case 2: // Single Substitution Format 2
+ {
+- const USHORT nCntGlyph = NEXT_UShort( pSubLookup );
++ const USHORT nCntGlyph = FT_NEXT_USHORT( pSubLookup );
+ for( int i = nCntGlyph; (it != aSubstVector.end()) && (--i>=0); ++it )
+ {
+- const USHORT nGlyphId = NEXT_UShort( pSubLookup );
++ const USHORT nGlyphId = FT_NEXT_USHORT( pSubLookup );
+ (*it).second = nGlyphId;
+ }
+ }
+--- oo_1.0.1_src/freetype/makefile.mk.orig Sun Sep 22 10:37:16 2002
++++ oo_1.0.1_src/freetype/makefile.mk Sun Sep 22 10:37:42 2002
+@@ -71,9 +71,9 @@
+
+ # --- Files --------------------------------------------------------
+
+-TARFILE_NAME=freetype-2.0.5
++TARFILE_NAME=freetype-2.1.3
+
+-PATCH_FILE_NAME=freetype-2.0.5.patch
++PATCH_FILE_NAME=freetype-2.1.3.patch
+
+ CONFIGURE_DIR=
+ #relative to CONFIGURE_DIR
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch
new file mode 100644
index 000000000000..49b54789fed7
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.1-xinteraction-fix.patch
@@ -0,0 +1,22 @@
+--- oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk~ 2000-09-18 17:28:26.000000000 +0200
++++ oo_1.0.1_src/unoil/com/sun/star/document/makefile.mk 2002-09-15 23:13:13.000000000 +0200
+@@ -64,6 +64,7 @@
+ PRJ = ..$/..$/..$/..
+ TARGET = unoil_document
+ PACKAGE = com$/sun$/star$/document
++GENJAVAFILES += $(GENJAVADIR)$/com/sun/star/task/XInteractionContinuation.java
+
+ # --- Settings -----------------------------------------------------
+
+--- oo_1.0.1_src/unoil/makefile.pmk~ 2001-08-31 18:04:43.000000000 +0200
++++ oo_1.0.1_src/unoil/makefile.pmk 2002-09-15 23:21:53.000000000 +0200
+@@ -74,7 +74,7 @@
+ JAVAFILESLIST := $(shell +cd $(GENJAVADIR)$/$(PACKAGE) $(COMMANDSEPARATOR) ls *.java)
+ .ENDIF # "$(L10N_framework)"==""
+
+-GENJAVAFILES := $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
++GENJAVAFILES += $(foreach,i,$(JAVAFILESLIST) $(GENJAVADIR)$/$(PACKAGE)$/$i)
+ GENCLASSFILES := $(foreach,i,$(JAVAFILESLIST:b) $(GENCLASSDIR)$/$(PACKAGE)$/$i.class)
+
+ # --- Targets ------------------------------------------------------
+
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.2-default-fonts.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.2-default-fonts.patch
new file mode 100644
index 000000000000..78435f6e54a7
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.2-default-fonts.patch
@@ -0,0 +1,174 @@
+--- oo_1.0.2_src/vcl/source/gdi/outdev3.cxx.default-fonts 2002-10-31 21:27:17.000000000 +0100
++++ oo_1.0.2_src/vcl/source/gdi/outdev3.cxx 2003-03-08 16:53:25.000000000 +0100
+@@ -1041,10 +1041,10 @@ static void ImplGetMapName( const String
+
+ // =======================================================================
+
+-static char const aImplSubsSansUnicode[] = "andalesansui;arialunicodems;lucidaunicode";
+-static char const aImplSubsSans[] = "albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans";
+-static char const aImplSubsSerif[] = "thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;nimbusromanno9l;bookman;itcbookman;garamond;garamondmt;palatino";
+-static char const aImplSubsFixed[] = "cumberland;couriernew;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol";
++static char const aImplSubsSansUnicode[] = "andalesansui;luxisans;arialunicodems;lucidaunicode";
++static char const aImplSubsSans[] = "luxisans;albany;arial;helvetica;lucidasans;lucida;geneva;helmet;sansserif;nimbussansl;nimbussans";
++static char const aImplSubsSerif[] = "nimbusromanno9l;luxiserif;thorndale;timesnewroman;times;timesroman;newyork;timmons;serif;lucidaserif;lucidabright;roman;nimbusromanno9;bookman;itcbookman;garamond;garamondmt;palatino";
++static char const aImplSubsFixed[] = "luximono;cumberland;couriernew;courier;lucidatypewriter;lucidasanstypewriter;monaco;monospaced;nimbusmono;nimbusmonol";
+ static char const aImplSubsStarSymbol[] = "starsymbol;opensymbol;starbats;wingdings;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;lucidadingbats;lucidasansdingbats;webdings;symbol;standardsymbols;standardsymbolsl";
+ static char const aImplSubsDingBats[] = "starsymbol;zapfdingbats;itczapfdingbats;monotypesorts;dingbats;opensymbol";
+ static char const aImplSubsSymbol[] = "starsymbol;symbol;standardsymbols;standardsymbolsl;mtsymbol;opensymbol";
+@@ -1123,7 +1123,7 @@ struct ImplFontNameAttr
+ static ImplFontNameAttr const aImplFontNameList[] =
+ {
+ { "albany", aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, aImplMSSubsArial, aImplPSSubsHelvetica, aImplHTMLSubsSansSerif,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF | IMPL_FONT_ATTR_STANDARD },
+ { "algerian", aImplSubsShadow, aImplSubsImprintShadow, aImplSubsOutline, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_OUTLINE | IMPL_FONT_ATTR_SHADOW | IMPL_FONT_ATTR_DECORATIVE | IMPL_FONT_ATTR_SPECIAL | IMPL_FONT_ATTR_TITLING },
+ { "almanac", aImplSubsStarSymbol, aImplSubsSansUnicode, NULL, NULL, NULL, NULL, NULL,
+@@ -1215,7 +1215,7 @@ static ImplFontNameAttr const aImplFontN
+ { "couriernew", aImplSubsFixed, NULL, NULL, NULL, NULL, aImplPSSubsCourier, aImplHTMLSubsMonospace,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_TYPEWRITER | IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_STANDARD },
+ { "cumberland", aImplSubsFixed, NULL, NULL, NULL, aImplMSSubsCourierNew, aImplPSSubsCourier, aImplHTMLSubsMonospace,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_TYPEWRITER | IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_TYPEWRITER | IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_STANDARD },
+ { "curlz", aImplSubsComic, aImplSubsZapfChancery, aImplSubsPalaceScript, NULL, NULL, NULL, aImplHTMLSubsCursive,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_SCRIPT | IMPL_FONT_ATTR_ITALIC | IMPL_FONT_ATTR_SPECIAL },
+ { "cursive", aImplSubsComic, aImplSubsZapfChancery, aImplSubsPalaceScript, NULL, NULL, NULL, aImplHTMLSubsCursive,
+@@ -1364,6 +1364,12 @@ static ImplFontNameAttr const aImplFontN
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF },
+ { "lucidatypewriter", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsMonospace,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_TYPEWRITER | IMPL_FONT_ATTR_FIXED },
++{ "luximono", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsMonospace,
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_TYPEWRITER | IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
++{ "luxisans", aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, NULL, NULL, aImplHTMLSubsSansSerif,
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
++{ "luxiserif", aImplSubsSerif, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsSerif,
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF | IMPL_FONT_ATTR_STANDARD },
+ { "marlett", aImplSubsStarSymbol, aImplSubsSansUnicode, NULL, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_SPECIAL | IMPL_FONT_ATTR_SYMBOL },
+ { "mhei", aImplSubsSCHei, aImplSubsSCSun, aImplSubsSansUnicode, NULL, NULL, NULL, NULL,
+@@ -1389,7 +1395,7 @@ static ImplFontNameAttr const aImplFontN
+ { "mono", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_FIXED },
+ { "monol", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, NULL,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_FIXED },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_FIXED | IMPL_FONT_ATTR_STANDARD },
+ { "monospace", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_FIXED },
+ { "monospaced", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsMonospace,
+@@ -1467,7 +1473,7 @@ static ImplFontNameAttr const aImplFontN
+ { "romanno9", aImplSubsSerif, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsSerif,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF },
+ { "romanno9l", aImplSubsSerif, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsSerif,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
+ { "romanps", aImplSubsFixed, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsMonospace,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_FIXED },
+ { "roundgothic", aImplSubsKRGulim, aImplSubsKRBatang, aImplSubsSansUnicode, NULL, NULL, NULL, NULL,
+@@ -1477,7 +1483,7 @@ static ImplFontNameAttr const aImplFontN
+ { "sanscondensed", aImplSubsSansNarrow, aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_CONDENSED, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF },
+ { "sansl", aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, NULL, NULL, NULL,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF | IMPL_FONT_ATTR_STANDARD },
+ { "sanslcondensed", aImplSubsSansNarrow, aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_CONDENSED, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF },
+ { "sansserif", aImplSubsSans, aImplSubsSansUnicode, NULL, NULL, NULL, NULL, NULL,
+@@ -1535,7 +1541,7 @@ static ImplFontNameAttr const aImplFontN
+ { "tahoma", aImplSubsSansUnicode, aImplSubsSans, NULL, NULL, NULL, NULL, NULL,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SANSSERIF },
+ { "thorndale", aImplSubsSerif, NULL, NULL, NULL, aImplMSSubsTimesNewRoman, aImplPSSubsTimes, aImplHTMLSubsSerif,
+- WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF | IMPL_FONT_ATTR_STANDARD | IMPL_FONT_ATTR_DEFAULT },
++ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF | IMPL_FONT_ATTR_STANDARD },
+ { "times", aImplSubsSerif, NULL, NULL, NULL, NULL, NULL, aImplHTMLSubsSerif,
+ WEIGHT_NORMAL, WIDTH_NORMAL, IMPL_FONT_ATTR_NORMAL | IMPL_FONT_ATTR_SERIF | IMPL_FONT_ATTR_STANDARD },
+ { "timesnewroman", aImplSubsSerif, NULL, NULL, NULL, NULL, aImplPSSubsTimes, aImplHTMLSubsSerif,
+@@ -1812,23 +1818,26 @@ static BOOL ImplFontSubstitute( XubStrin
+
+ // =======================================================================
+
+-static char const aImplDefSansUnicode[] = "Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma";
+-static char const aImplDefSansUI[] = "Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif";
+-static char const aImplDefSans[] = "Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif";
+-static char const aImplDefSerif[] = "Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif";
+-static char const aImplDefFixed[] = "Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced";
++static char const aImplDefSansUnicode[] = "Andale Sans UI;Luxi Sans;Arial Unicode MS;Lucida Sans Unicode;Tahoma";
++static char const aImplDefSansUI[] = "Interface User;Luxi Sans;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif";
++static char const aImplDefSans[] = "Luxi Sans;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif";
++static char const aImplDefSerif[] = "Nimbus Roman No9 L;Luxi Serif;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif";
++static char const aImplDefSerif_Greek[] = "Kerkis;Nimbus Roman No9 L;Luxi Serif;Thorndale;Times New Roman;Times;Lucida Serif;Lucida Bright;Timmons;New York;Serif";
++static char const aImplDefFixed[] = "Luxi Mono;Cumberland;Courier New;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced";
+ static char const aImplDefSymbol[] = "StarSymbol;OpenSymbol;Andale Sans UI;Arial Unicode MS;StarBats;Zapf Dingbats;WingDings;Symbol";
+-static char const aImplDef_CJK_JP_Mincho[] = "HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho";
+-static char const aImplDef_CJK_JP_Gothic[] = "HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic";
+-static char const aImplDef_CJK_JP_UIGothic[] = "Andale Sans UI;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic";
+-static char const aImplDef_CJK_SC[] = "MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun";
+-static char const aImplDef_CJK_TC[] = "MSung Light TC;MingLiU;Ming;PMingLiU";
+-static char const aImplDef_CJK_KR_Batang[] = "HY MyeongJo Light K;Batang;Myeongjo";
+-static char const aImplDef_CJK_KR_Gulim[] = "Andale Sans UI;Gulim;Roundgothic";
+-static char const aImplDef_CJK_JP_Fixed[] = "HG Mincho Light J";
+-static char const aImplDef_CJK_SC_Fixed[] = "MSung Light SC";
+-static char const aImplDef_CJK_TC_Fixed[] = "MSung Light TC";
++static char const aImplDef_CJK_JP_Mincho[] = "Kochi Mincho;HG Mincho Light J;MS Mincho;HG Mincho J;HG Mincho L;HG Mincho;Mincho;MS PMincho";
++static char const aImplDef_CJK_JP_Gothic[] = "Kochi Gothic;HG Mincho Light J;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic";
++static char const aImplDef_CJK_JP_UIGothic[] = "Andale Sans UI;Kochi Gothic;MS Gothic;HG Gothic J;HG Gothic B;HG Gothic;Gothic;MS PGothic";
++static char const aImplDef_CJK_SC[] = "AR PL SungtiL GB;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun";
++static char const aImplDef_CJK_TC[] = "AR PL Mingti2L Big5;MSung Light TC;MingLiU;Ming;PMingLiU";
++static char const aImplDef_CJK_KR_Batang[] = "Baekmuk Batang;HY MyeongJo Light K;Batang;Myeongjo";
++static char const aImplDef_CJK_KR_Gulim[] = "Andale Sans UI;Baekmuk Gulim;Gulim;Roundgothic";
++static char const aImplDef_CJK_JP_Fixed[] = "Kochi Gothic;HG Mincho Light J";
++static char const aImplDef_CJK_SC_Fixed[] = "AR PL SungtiL GB;MSung Light SC";
++static char const aImplDef_CJK_TC_Fixed[] = "AR PL Mingti2L Big5;MSung Light TC";
+ static char const aImplDef_CJK_KR_Fixed[] = "HY MyeongJo Light K";
++static char const aImplDef_CTL_AR[] = "KacstBook;Arial Unicode MS";
++static char const aImplDef_CTL_TH[] = "Norasi;Arial Unicode MS";
+
+ // -----------------------------------------------------------------------
+
+@@ -1956,7 +1965,10 @@ Font OutputDevice::GetDefaultFont( USHOR
+ case DEFAULTFONT_SERIF:
+ case DEFAULTFONT_LATIN_TEXT:
+ case DEFAULTFONT_LATIN_PRESENTATION:
+- pSearch1 = aImplDefSerif;
++ if ( eLang == LANGUAGE_GREEK )
++ pSearch1 = aImplDefSerif_Greek;
++ else
++ pSearch1 = aImplDefSerif;
+ aFont.SetFamily( FAMILY_ROMAN );
+ break;
+
+@@ -2041,7 +2053,34 @@ Font OutputDevice::GetDefaultFont( USHOR
+ case DEFAULTFONT_CTL_SPREADSHEET:
+ case DEFAULTFONT_CTL_HEADING:
+ case DEFAULTFONT_CTL_DISPLAY:
+- pSearch1 = "Arial Unicode MS";
++ switch ( eLang )
++ {
++ case LANGUAGE_ARABIC:
++ case LANGUAGE_ARABIC_SAUDI_ARABIA:
++ case LANGUAGE_ARABIC_IRAQ:
++ case LANGUAGE_ARABIC_EGYPT:
++ case LANGUAGE_ARABIC_LIBYA:
++ case LANGUAGE_ARABIC_ALGERIA:
++ case LANGUAGE_ARABIC_MOROCCO:
++ case LANGUAGE_ARABIC_TUNISIA:
++ case LANGUAGE_ARABIC_OMAN:
++ case LANGUAGE_ARABIC_YEMEN:
++ case LANGUAGE_ARABIC_SYRIA:
++ case LANGUAGE_ARABIC_JORDAN:
++ case LANGUAGE_ARABIC_LEBANON:
++ case LANGUAGE_ARABIC_KUWAIT:
++ case LANGUAGE_ARABIC_UAE:
++ case LANGUAGE_ARABIC_BAHRAIN:
++ case LANGUAGE_ARABIC_QATAR:
++ pSearch1 = aImplDef_CTL_AR;
++ break;
++ case LANGUAGE_THAI:
++ pSearch1 = aImplDef_CTL_TH;
++ break;
++ default:
++ pSearch1 = "Arial Unicode MS";
++ break;
++ }
+ break;
+ }
+
diff --git a/app-office/openoffice/files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch b/app-office/openoffice/files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch
new file mode 100644
index 000000000000..3db5827acf08
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-1.0.2-ft-antialias-advice.patch
@@ -0,0 +1,14 @@
+--- oo_1.0.2_src/vcl/source/glyphs/gcach_ftyp.cxx.ft-antialias-advice 2003-03-08 15:24:01.000000000 +0100
++++ oo_1.0.2_src/vcl/source/glyphs/gcach_ftyp.cxx 2003-03-08 16:17:23.000000000 +0100
+@@ -900,10 +900,7 @@ bool FreetypeServerFont::GetAntialiasAdv
+ if( GetFontSelData().mbNonAntialiased )
+ return false;
+ // TODO: also use GASP & EBDT tables
+- bool bAdviseAA = (mnLoadFlags & FT_LOAD_NO_HINTING) != 0;
+- int nHeight = GetFontSelData().mnHeight;
+- bAdviseAA |= (nHeight > 12);
+- bAdviseAA |= (nHeight < 8);
++ bool bAdviseAA = true;
+ return bAdviseAA;
+ }
+
diff --git a/app-office/openoffice/files/1.0.3/openoffice-errno.patch b/app-office/openoffice/files/1.0.3/openoffice-errno.patch
new file mode 100644
index 000000000000..7466197d828d
--- /dev/null
+++ b/app-office/openoffice/files/1.0.3/openoffice-errno.patch
@@ -0,0 +1,10 @@
+--- dmake/extern.h.orig 2003-03-14 22:30:34.000000000 -0500
++++ dmake/extern.h 2003-03-14 22:31:00.000000000 -0500
+@@ -27,6 +27,7 @@
+ #ifndef EXTERN_h
+ #define EXTERN_h
+
++#include <errno.h>
+ #include "config.h"
+
+ /* Define this for the RS/6000 if it breaks something then we have to put a
diff --git a/app-office/openoffice/files/digest-openoffice-1.0.3 b/app-office/openoffice/files/digest-openoffice-1.0.3
new file mode 100644
index 000000000000..7f0048be65da
--- /dev/null
+++ b/app-office/openoffice/files/digest-openoffice-1.0.3
@@ -0,0 +1,4 @@
+MD5 984146931906a7d53300b29f58f6a899 OOo_1.0.3_source.tar.bz2 165475319
+MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
+MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
+MD5 09775a4111e066f782866d8a57d8481b freetype-2.1.3.tar.bz2 790213
diff --git a/app-office/openoffice/files/digest-openoffice-1.1_beta b/app-office/openoffice/files/digest-openoffice-1.1_beta
index 2031239d895b..c56ff802e0ef 100644
--- a/app-office/openoffice/files/digest-openoffice-1.1_beta
+++ b/app-office/openoffice/files/digest-openoffice-1.1_beta
@@ -1,4 +1,3 @@
MD5 947e1a6d537ee37d8177a307a0e4b482 OOo_1.1beta_source.tar.bz2 187999457
-MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
MD5 09775a4111e066f782866d8a57d8481b freetype-2.1.3.tar.bz2 790213
diff --git a/app-office/openoffice/openoffice-1.0.3.ebuild b/app-office/openoffice/openoffice-1.0.3.ebuild
new file mode 100644
index 000000000000..f2118a77624f
--- /dev/null
+++ b/app-office/openoffice/openoffice-1.0.3.ebuild
@@ -0,0 +1,589 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3.ebuild,v 1.1 2003/04/10 20:44:12 sethbc 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
+# Compile problems with these ...
+filter-flags "-funroll-loops"
+filter-flags "-fomit-frame-pointer"
+replace-flags "-O3" "-O2"
+
+# Enable Bytecode Interpreter for freetype ...
+append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
+
+inherit gcc
+# We want gcc3 if possible!!!!
+export WANT_GCC_3="yes"
+
+inherit virtualx
+
+# 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"
+FT_VER="2.1.3"
+STLP_VER="4.5.3"
+
+INSTDIR="${LOC}/OpenOffice.org${PV}"
+S="${WORKDIR}/oo_${PV}_src"
+DESCRIPTION="OpenOffice.org, a full office productivity suite."
+SRC_URI="http://ny1.mirror.openoffice.org/stable/${PV}/OOo_${PV}_source.tar.bz2
+ http://sf1.mirror.openoffice.org/stable/${PV}/OOo_${PV}_source.tar.bz2
+ http://www.stlport.org/archive/STLport-${STLP_VER}.tar.gz
+ ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
+ mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2"
+HOMEPAGE="http://www.openoffice.org/"
+
+LICENSE="LGPL-2 | SISSL-1.1"
+SLOT="0"
+KEYWORDS="-x86 -ppc"
+IUSE="gnome kde"
+
+RDEPEND=">=sys-libs/glibc-2.1
+ >=dev-lang/perl-5.0
+ virtual/x11
+ app-arch/zip
+ app-arch/unzip
+ dev-libs/expat
+ >=virtual/jdk-1.3.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"
+
+# fix a bug with tcsh and dircolors
+#
+# Azarah -- 10 April 2002
+export LS_COLORS=""
+
+
+pkg_setup() {
+
+ if [ "$(gcc-version)" != "3.2" ]
+ then
+ eerror
+ eerror "This build needs gcc-3.2 or later, 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-3.2. Thus if there is already a gcc-3.2.1-r2 out, use this"
+ eerror "rather than 3.2.1, etc."
+ eerror
+ eerror "As of writing, gcc-3.2.1 seemed to create the most stable builds."
+ eerror "Also, because OO is such a complex build, ONLY gcc-3.2.1 will be"
+ eerror "supported!"
+ eerror
+ eerror "This process is not highly recomended, as upgrading your compiler"
+ eerror "without upgrading your distribution can be detrimental to your "
+ eerror "installation of gentoo, unless you know what you're getting into"
+ eerror
+ die
+ fi
+
+ if [ -z "$(echo ${JDK_HOME} | grep "blackdown")" ] && [ "${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 "****************************************************************"
+}
+
+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" ]
+ 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 later!"
+ 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}_source.tar.bz2 gpc231.tar.Z
+
+ # Install gpc
+ cd ${WORKDIR}/gpc231
+ cp gpc.* ${S}/external/gpc
+
+ cd ${S}
+
+ # This resolves missing symbols (Debian)
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-compiler-flags.patch
+
+ # Misc Debian patches to fixup build
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-no-mozab.patch
+ echo "moz moz : NULL" > ${S}/moz/prj/build.lst
+
+ # Misc patches from Mandrake
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-fix-asm.patch
+
+ # Get OO to use STLport-4.5.3 (Az)
+ cp ${DISTDIR}/STLport-${STLP_VER}.tar.gz ${S}/stlport/download || die
+ cd ${S}/stlport
+ if [ "${NEW_GCC}" -eq "1" ]
+ then
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-STLport-4.5.3-newgcc.patch
+ else
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-STLport-4.5.3.patch
+ fi
+ cd ${S}
+
+ # Seth -- Dec 1 2002
+ if [ "$(echo ${JAVA_BINARY} | egrep 'j(2s)?dk-1.4')" ]
+ then
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-fix-jdk-1.4.0.patch
+ fi
+
+ # Debian patch to fix an xinteraction handler build error (Seth)
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-xinteraction-fix.patch
+
+ # Get OO to build with freetype-2.1.3
+ einfo "Moving freetype-${FT_VER}.tar.bz2 in place ..."
+ cp ${DISTDIR}/freetype-${FT_VER}.tar.bz2 ${S}/freetype/download || die
+ # We need it as a .tar.gz ...
+ bzip2 -d ${S}/freetype/download/freetype-${FT_VER}.tar.bz2 || die
+ gzip -1 ${S}/freetype/download/freetype-${FT_VER}.tar
+ # OK, copy the new patch in place, and fixup some other things ...
+ cp ${FILESDIR}/${PV}/freetype-${FT_VER}.patch ${S}/freetype || die
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-freetype-${FT_VER}.patch
+
+ # Now for our optimization flags ...
+ perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+ ${S}/solenv/inc/unxlngi3.mk
+ perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
+ ${S}/solenv/inc/unxlngi4.mk
+
+ # Some makefiles are not multiprocess ready (Mandrake)
+ cd ${S}; einfo "Fixing makefiles for multiprocess builds..."
+ for x in io/source/stm dtrans/source/X11 idlc/source nas zlib toolkit/util \
+ comphelper/util padmin/source svtools/util bridges/source/prot_uno \
+ ucb/source/ucp/ftpproxy framework/util framework/source/unotypes
+ do
+ perl -pi -e "s/^(PRJNAME)/MAXPROCESS=1\n\1/" ${x}/makefile.mk
+ done
+
+ epatch ${FILESDIR}/${PV}/${PN}-errno.patch
+ einfo "Lets patch to get AA fonts..."
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.2-default-fonts.patch
+ epatch ${FILESDIR}/${PV}/${PN}-1.0.2-ft-antialias-advice.patch
+
+}
+
+get_EnvSet() {
+
+ # Determine what Env file we should be using (Az)
+ export LinuxEnvSet="LinuxIntelEnv.Set"
+ use sparc && export LinuxEnvSet="LinuxSparcEnv.Set"
+ use sparc64 && export LinuxEnvSet="LinuxSparcEnv.Set"
+ use ppc && export LinuxEnvSet="LinuxPPCEnv.Set"
+ use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set"
+
+ # Get build specific stuff (Az)
+ export SOLVER="$(awk '/^setenv UPD / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
+ export SOLPATH="$(awk '/^setenv INPATH / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
+}
+
+src_compile() {
+
+ local buildcmd=""
+
+ oo_setup
+
+ # Setup default compilers (We overide gcc2 if that is default here)
+ export CC="$(gcc-getCC)"
+ export CXX="$(gcc-getCXX)"
+
+ # Enable ccache for this build (Az)
+ if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
+ "${FEATURES/ccache/}" != "${FEATURES}" -a \
+ -d /usr/bin/ccache -a -x /usr/bin/ccache/ccache ]
+ then
+ # Build uses its own env with $PATH, etc, so
+ # we take the easy way out. (Az)
+ export CC="/usr/bin/ccache/ccache ${CC}"
+ export CXX="/usr/bin/ccache/ccache ${CXX}"
+ fi
+
+ # Enable distcc for this build (Az)
+ if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
+ "${FEATURES/distcc/}" != "${FEATURES}" -a \
+ -x /usr/bin/distcc ]
+ then
+ # Do not bump ECPUS if the user did not touch it, as currently
+ # it -PP do not work properly (segfaulting). (Az)
+ [ "$(echo ${DISTCC_HOSTS} | wc -w)" -gt 1 -a "${ECPUS}" -qt 1 ] && \
+ export ECPUS="$(echo ${DISTCC_HOSTS} | wc -w)"
+
+ export CC="distcc ${CC}"
+ export CXX="distcc ${CXX}"
+ fi
+
+ # 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..."
+ cd ${S}/config_office
+ rm -f config.cache
+ ./configure --enable-gcc3 \
+ --with-jdk-home=${JAVA_HOME} \
+ --with-lang=ALL\
+ --with-x || die
+
+ cd ${S}
+ get_EnvSet
+
+ # Do not include /usr/include in header search path, and
+ # same thing for internal gcc include dir, as gcc3 handles
+ # it correctly by default! (Az)
+ perl -pi -e "s| -I/usr/include||g" ${LinuxEnvSet}
+# perl -pi -e "s| -I$(gcc-libpath)/include||g" ${LinuxEnvSet}
+
+ if [ "${NEW_GCC}" -eq "1" ]
+ then
+ local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})"
+
+ # Setup path for new gcc layout in $LinuxEnvSet, else the build
+ # environment will not find gcc ... (Az)
+ perl -pi -e "s|PATH \.:\$SOLARVER|PATH \.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
+ # New builds start quoting stuff ...
+ perl -pi -e "s|PATH \"\.:\$SOLARVER|PATH \"\.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
+ fi
+
+ # 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 -PP${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
+ echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
+ echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
+ fi
+
+ if [ "$(gcc-major-version)" -eq 3 ]
+ then
+ mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/{lib,inc}
+
+ einfo "Installing GCC related libs..."
+ # Workaround for missing libs with GCC3 (thanks to Debian) (Az)
+ cd ${S}/solver/${SOLVER}/${SOLPATH}/lib
+ cp $(gcc-libpath)/libstdc++.so.$(gcc-libstdcxx-major-version)* . || \
+ die "Could not copy gcc-libs!"
+ cp $(gcc-libpath)/libgcc_s.so* . || die "Could not copy gcc-libs!"
+ cd ${S}
+ fi
+
+ einfo "Bootstrapping OpenOffice.org..."
+ # Get things ready for bootstrap (Az)
+ chmod 0755 ${S}/solenv/bin/*.pl
+ mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/inc
+ touch ${S}/solver/${SOLVER}/${SOLPATH}/inc/minormkchanged.flg
+ # Bootstrap ...
+ ./bootstrap
+
+ if [ "$(gcc-major-version)" -eq 3 ]
+ then
+ local LIBFILE="$(readlink `gcc-libpath`/libstdc++.so.`gcc-libstdcxx-major-version`)"
+ local LIBVERSION="$(echo ${LIBFILE} | sed -e 's|libstdc++\.so\.||g')"
+ # Get this beast to use the right version of libstdc++ ... (Az)
+ echo "LIBSTDCPP3:=${LIBVERSION}" >> \
+ ${S}/solver/${SOLVER}/${SOLPATH}/inc/comp_ver.mk
+ cd ${S}
+ fi
+
+ einfo "Building OpenOffice.org..."
+ # Setup virtualmake
+ export maketype="tcsh"
+ echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.tcsh
+ # Build needs X to compile! (Az)
+ virtualmake build.tcsh || 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"
+ # This allows us to change languages without editing the ebuild.
+ #
+ # languages1="ENUS,FREN,GERM,SPAN,ITAL,DTCH,PORT,SWED,POL,RUSS"
+ # languages2="DAN,GREEK,TURK,CHINSIM,CHINTRAD,JAPN,KOREAN,CZECH,CAT"
+ #
+ # Supported languages for localized help files
+ #
+ # helplangs="ENUS,FREN,GERM,SPAN,ITAL,SWED"
+ #
+ [ -z "${LANGUAGE}" ] && LANGUAGE=01
+
+ get_EnvSet
+
+ # The install part should now be relatively OK compared to
+ # what it was. Basically we use autoresponse files to install
+ # unattended, running under a Xvfb if needed. 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 isntallation
+ 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}/${LANGUAGE}/normal
+ # Setup virtualmake
+ export maketype="./setup"
+ # We need X to install...
+ virtualmake "-v -r:${T}/autoresponse"
+
+ echo
+ einfo "Removing build root from registy..."
+ # 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.conf
+ doins ${T}/autoresponse.conf
+
+ # Install wrapper script
+ exeinto /usr/bin
+ sed -e "s|<pv>|${PV}|g" \
+ ${FILESDIR}/${PV}/ooffice-wrapper-1.2 > ${T}/ooffice
+ doexe ${T}/ooffice
+ # Component symlinks
+ dosym ooffice /usr/bin/oocalc
+ dosym ooffice /usr/bin/oodraw
+ dosym ooffice /usr/bin/ooimpress
+ dosym ooffice /usr/bin/oomath
+ dosym ooffice /usr/bin/oowriter
+ dosym ooffice /usr/bin/oosetup
+ dosym ooffice /usr/bin/oopadmin
+
+ 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
+
+ for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+ do
+ # We have to handle setup differently
+ perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup: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/applnk/OpenOffice.org${PV}"
+
+ # Portage do not work with the space ..
+ mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV} ${kdeloc}
+
+ insinto /usr/share/applnk/OpenOffice.org
+ # Install the files needed for the catagory
+ doins ${kdeloc}/.directory
+ doins ${kdeloc}/.order
+ dodir /usr/share
+ # Install the icons and mime info
+ cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
+
+ for x in ${kdeloc}/*.desktop
+ do
+ # We have to handle setup differently
+ perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+ # Now fix the rest
+ perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+ doins ${x}
+ done
+ fi
+
+ # Unneeded, as they get installed into /usr/share...
+ rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+
+ for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
+ echo 'Categories=Application;Office;' >> ${f}
+ done
+
+ # Make sure these do not get nuked.
+ keepdir ${INSTDIR}/user/config/registry/instance/org/openoffice/{Office,ucb}
+ keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
+ keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+}
+
+pkg_preinst() {
+
+ # The one with OO-1.0.0 was not valid
+ if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
+ then
+ rm -f ${ROOT}/etc/openoffice/autoresponse.conf
+ fi
+}
+
+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 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 "******************************************************************"
+}
+