Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
authorBrad Laue <brad@gentoo.org>2003-07-24 01:37:46 +0000
committerBrad Laue <brad@gentoo.org>2003-07-24 01:37:46 +0000
commit31c20db48ed903cefd46e713664c7abf9df78f91 (patch)
treef9775d1f03bd5d660289ef56ccc86353f708c5e2 /app-office
parentremoving old ebuilds (diff)
downloadhistorical-31c20db48ed903cefd46e713664c7abf9df78f91.tar.gz
historical-31c20db48ed903cefd46e713664c7abf9df78f91.tar.bz2
historical-31c20db48ed903cefd46e713664c7abf9df78f91.zip
Remove old patchfiles
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/files/1.0.2/freetype-2.1.3.patch33
-rw-r--r--app-office/openoffice/files/1.0.2/ooffice-wrapper202
-rw-r--r--app-office/openoffice/files/1.0.2/ooffice-wrapper-1.2238
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-compiler-flags.patch24
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-dont-unset-home.patch21
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-asm.patch86
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-jdk-1.4.0.patch57
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-no-mozab.patch68
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch285
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3.patch285
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-freetype-2.1.3.patch319
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch22
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.2-default-fonts.patch174
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch14
-rw-r--r--app-office/openoffice/files/1.0.2/openoffice-errno.patch10
15 files changed, 0 insertions, 1838 deletions
diff --git a/app-office/openoffice/files/1.0.2/freetype-2.1.3.patch b/app-office/openoffice/files/1.0.2/freetype-2.1.3.patch
deleted file mode 100644
index 4aaad505a30d..000000000000
--- a/app-office/openoffice/files/1.0.2/freetype-2.1.3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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.2/ooffice-wrapper b/app-office/openoffice/files/1.0.2/ooffice-wrapper
deleted file mode 100644
index 0fb6909c8e6b..000000000000
--- a/app-office/openoffice/files/1.0.2/ooffice-wrapper
+++ /dev/null
@@ -1,202 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-# Modifications by Chris Halls
-
-# 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
-
-##
-## where does OO live for this user ?
-##
-OOHOME=""
-if [ -e ~/.sversionrc ] && grep -q "$OOVERSION" ~/.sversionrc ; then
- # already installed for this user (warning, .sversionrc is DOS encoded)
- OOHOME=`grep "^$OOVERSION=" ~/.sversionrc| \
- sed "s|^$OOVERSION=file://||" | \
- xargs echo`
- if [ ! -e $OOHOME ] ; then
- 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
-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`"
- if [ "$SESMGR" = "/usr/bin/gnome-session" ]; then
- echo "Gnome session manager detected - session management disabled"
- unset SESSION_MANAGER
- fi
-fi
-
-##
-## 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
- 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
- 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;;
- esac
-fi
-
-##
-##
-## Change the config files to conform to current locale used
-##
-
-# Fix some variable to make the paths shorter in the rest
-LINGFILE="$OOHOME/user/config/registry/instance/org/openoffice/Office/Linguistic.xml"
-SETUPFILE="$OOHOME/user/config/registry/instance/org/openoffice/Setup.xml"
-
-
-# Search the right locale
-OLDLOCALE=""
-if [ -e $LINGFILE ] ; then
- OLDLOCALE=`grep 'DefaultLocale cfg' $LINGFILE|sed 's/<[^>]*>//g'|sed 's/[[:blank:]]//g'`
-fi
-if [ -z $OLDLOCALE ]; then OLDLOCALE="en-US"; fi
-if [ "x$OLDLOCALE" = "xC" ]; then OLDLOCALE="en-US"; fi
-
-LOCALE=$LC_ALL
-if [ -z $LOCALE ] ; then LOCALE="$LC_MESSAGES"; fi
-if [ -z $LOCALE ] ; then LOCALE="$LANG"; fi
-if [ -z $LOCALE ] ; then LOCALE="en-US"; fi
-if [ "x$LOCALE" = "xC" ] ; then LOCALE="en-US"; fi
-
-if [ $LOCALE != $OLDLOCALE ] ; then
-
- # Change instdb.ins
- cp $OOHOME/instdb.ins $OOHOME/instdb.ins.$OLDLOCALE
- sed "s/>$OLDLOCALE</>$LOCALE</" $OOHOME/instdb.ins.$OLDLOCALE > $OOHOME/instdb.ins
-
- # Create Linguistic.xml if don't exists
- if [ ! -e $LINGFILE.$OLDLOCALE ] ; then
- # get a default one, and change en-US to OLDLOCALE inside. I guess this is a noop, but I'm not sure
- sed "s/>en-US</>$OLDLOCALE</" \
- < /opt/OpenOffice.org<pv>/share/config/registry/instance/org/openoffice/Office/Linguistic.xml \
- > $LINGFILE.$OLDLOCALE
- fi
-
- # change Linguistic.xml
- sed "s/>$OLDLOCALE</>$LOCALE</" $LINGFILE.$OLDLOCALE > $LINGFILE
-
- # Change Setup.xml
- if grep -q '<ooLocale cfg:type' $SETUPFILE ; then
- cp $SETUPFILE $SETUPFILE.$OLDLOCALE
- sed "s/>$OLDLOCALE</>$LOCALE</" $SETUPFILE.$OLDLOCALE > $SETUPFILE
- else # ooLocale entry does not exists in Setup.xml
- cp $SETUPFILE $SETUPFILE.tmp
-
- cat $SETUPFILE.tmp | \
- perl -e "while (<>) { /<Office>/ && print \"<L10N>\n<ooLocale cfg:type=\\\"string\\\">$LOCALE</ooLocale>\n</L10N>\n\";print \$_;}" > \
- $SETUPFILE
- # this perl command is to add a <L10N> section if it does not exists.
- # On my machine, it produce the following patch:
-
- # <Setup state="modified" cfg:package="org.openoffice" xmlns="http://openoffice.org/2000/registry/components/Setup" xmlns:cfg="http://openoffice.org/2000/registry/instance" xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance">
- #+ <L10N>
- #+ <ooLocale cfg:type="string">fr_FR@euro</ooLocale>
- #+ </L10N>
- # <Office>
-
- rm $SETUPFILE.tmp
- fi # change Setup.xml
-
-fi # LOCALE != OLDLOCALE
-
-## 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"
-
-##
-## That's it. Launch the beast (with the given args)
-##
-export LD_PRELOAD=/usr/lib/libfreetype.so
-case `basename $0` in
- oosetup) exec "$OOHOME/setup" ;;
- oopadmin) exec "$OOHOME/spadmin" ;;
- *) exec "$OOHOME/soffice" "$@" ;;
-esac
-
-## Changelog
-# 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.2/ooffice-wrapper-1.2 b/app-office/openoffice/files/1.0.2/ooffice-wrapper-1.2
deleted file mode 100644
index 5f92769b809c..000000000000
--- a/app-office/openoffice/files/1.0.2/ooffice-wrapper-1.2
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/sh
-#
-# Wrapper script for openoffice
-#
-# (C) Peter 'Nidd' Novodvorsky, 2001,2002
-# (C) Martin 'empty' Quinson, 2002.
-# Modifications by Chris Halls
-# Modifications by Lucien Saviot
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# this string should be exactly as in ~/.sversionrc
-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.2/openoffice-1.0.1-compiler-flags.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-compiler-flags.patch
deleted file mode 100644
index a7084201a5b7..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-compiler-flags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.2/openoffice-1.0.1-dont-unset-home.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-dont-unset-home.patch
deleted file mode 100644
index 454b1d2a7de1..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-dont-unset-home.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: oo_cvs/config_office/set_soenv.1
-===================================================================
-RCS file: /cvs/oo/tools/config_office/set_soenv.1,v
-retrieving revision 1.61.2.7
-diff -u -3 -p -r1.61.2.7 set_soenv.1
---- oo_cvs/config_office/set_soenv.1 2002/06/25 15:41:17 1.61.2.7
-+++ oo_cvs/config_office/set_soenv.1 2002/06/28 11:03:55
-@@ -1551,12 +1551,12 @@ if (( $platform eq "$Winnt" ) and ( $USE
- $tempstring="perl ".WinFormat(${SOLARENV}.${BIN}.${ds}."zipdep.pl");
- if ( $perl_os =~ /cygwin/ ) { $tempstring =~ s#\\#\\\\#g; }
- ToFile( "set ZIPDEP=$tempstring", $empty, "x" );
-+ ToFile( "HOME", $WIN_HOME, "e" );
- } else {
- ToFile( "DELIVER", "deliver.pl", "e" );
- ToFile( "MKOUT", "mkout.pl", "e" );
- ToFile( "ZIPDEP", "zipdep.pl", "e" );
- }
--ToFile( "HOME", $WIN_HOME, "e" );
- ToFile( "USE_SHELL", $USE_SHELL, "e" );
- #
- # Writing the aliases to file.
diff --git a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-asm.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-asm.patch
deleted file mode 100644
index 476cd704bfec..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-asm.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- 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.2/openoffice-1.0.1-fix-jdk-1.4.0.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-jdk-1.4.0.patch
deleted file mode 100644
index ff9fe8b5dd7a..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-fix-jdk-1.4.0.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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.2/openoffice-1.0.1-no-mozab.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-no-mozab.patch
deleted file mode 100644
index 542253fb1b86..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-no-mozab.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
deleted file mode 100644
index 6e96f366c4e2..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3-newgcc.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-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.2/openoffice-1.0.1-use-STLport-4.5.3.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3.patch
deleted file mode 100644
index 0517cd7fcc09..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-STLport-4.5.3.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-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.2/openoffice-1.0.1-use-freetype-2.1.3.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-freetype-2.1.3.patch
deleted file mode 100644
index 0d079c32864f..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-use-freetype-2.1.3.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-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.2/openoffice-1.0.1-xinteraction-fix.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch
deleted file mode 100644
index 49b54789fed7..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.1-xinteraction-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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.2/openoffice-1.0.2-default-fonts.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.2-default-fonts.patch
deleted file mode 100644
index 78435f6e54a7..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.2-default-fonts.patch
+++ /dev/null
@@ -1,174 +0,0 @@
---- 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.2/openoffice-1.0.2-ft-antialias-advice.patch b/app-office/openoffice/files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch
deleted file mode 100644
index 3db5827acf08..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-1.0.2-ft-antialias-advice.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.2/openoffice-errno.patch b/app-office/openoffice/files/1.0.2/openoffice-errno.patch
deleted file mode 100644
index 7466197d828d..000000000000
--- a/app-office/openoffice/files/1.0.2/openoffice-errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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