# ChangeLog for app-office/openoffice-ximian
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.87 2005/01/08 11:13:27 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.88 2005/01/12 23:05:13 suka Exp $
+
+*openoffice-ximian-1.3.7 (13 Jan 2005)
+
+ 13 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+ +files/1.1.3/gcc34-sal-link-to-libsupc++.diff,
+ +files/1.1.3/gcc34_2.patch.bz2, +files/1.1.3/gentoo-1.3.7.patch,
+ +files/1.1.3/nojvmfwk-fix.patch, -openoffice-ximian-1.1.55.ebuild,
+ +openoffice-ximian-1.3.7.ebuild:
+ New release, closes bug #73171. This mainly fixes some bugs, most
+ importantly the crasher bug when deleting a line in Calc, closes bug #71600
+
+ For more infos see the entry for 1.3.7 under:
+
+ http://go-oo.org/ooo-build/NEWS
08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
openoffice-ximian-1.3.6.ebuild:
-MD5 61b13ede9aa439c4a48998506293c7f0 openoffice-ximian-1.1.55.ebuild 15004
-MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
-MD5 4cd424f689396bc04019f22488c8548b ChangeLog 21535
-MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
-MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
+MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
+MD5 7dda26d4577d9455b4bc3c1743bb192e openoffice-ximian-1.3.7.ebuild 17017
+MD5 c591588c74359a9a7c6e2b6231d4476e ChangeLog 22081
+MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
-MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215
-MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
+MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
+MD5 0b59100689dae352eeac675e31a4cdec files/digest-openoffice-ximian-1.3.7 502
MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.2/ximian-openoffice.applications 980
-MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.2/ximian-openoffice.keys 6298
+MD5 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5-r1.patch 597
+MD5 e3c1dc0a3108091c8acfab788a5c9282 files/1.1.2/xooffice-wrapper-1.3 9336
MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.2/newstlportfix.patch 10362
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.2/gentoo-splash.diff 890
+MD5 f9578015a434c209259917e9df3c0b27 files/1.1.3/gcc34_2.patch.bz2 33535
MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661
-MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
+MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980
-MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
+MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
+MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
+MD5 ac476fa5693b08cd28838931d5a73c3e files/1.1.3/gentoo-1.3.7.patch 443
+MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
+MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
+MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
+MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
-MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597
+MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986
MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638
-MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
-MD5 0b9b6204209b8be145648863dbffaa99 files/1.1.1/openoffice-1.1.0-sparc64-fix.patch 400
-MD5 7499a81bad1959834a0e6f995200e3e8 files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch 603
-MD5 3ddc9b8931d1842fad3c0dd468e70846 files/1.1.1/xooffice-wrapper-1.3 9221
-MD5 6fd623d53d17e17f953232da5b04447f files/1.1.1/fixscale.patch 1035
-MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980
-MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298
-MD5 7978a9c1f590a83622b8040ee83197a4 files/1.1.1/nptl.patch 1285
-MD5 ec45b66d175ad9662716a06e7c678cef files/1.1.1/newstlportfix.patch 10362
+++ /dev/null
---- bin/scale-icons 2004-05-06 11:01:08.980710904 +0200
-+++ bin/scale-icons 2004-05-06 11:01:08.981710752 +0200
-@@ -171,22 +171,11 @@
-
- print "Binning dupped icons\n";
- -f "$OOO_PATH/extras/source/symbols/makefile.mk" || die "No dupped icon directory";
--
--my $SymbolsDir;
--my $symbols_dir = "$OOO_PATH/extras/source/symbols";
--my $symbols_backup = "$backupdir/extras/source/symbols";
--
--system ("mkdir -p $symbols_backup");
--
--opendir ($SymbolsDir, $symbols_dir) || die "No symbols: $!";
--while (my $fname = readdir ($SymbolsDir)) {
-- $fname =~ m/\.bmp$/ || next;
-- if ($backupdir) {
-- system ("cp -a $symbols_dir/$fname $symbols_backup");
-- }
-- unlink "$symbols_dir/$fname" || die "Can't delete $symbols_dir/$fname: $!";
-+if ($backupdir) {
-+ system ("mkdir -p $backupdir/extras/source/symbols");
-+ system ("cp -a $OOO_PATH/extras/source/symbols/*.bmp $backupdir/extras/source/symbols");
- }
--closedir($SymbolsDir);
-+system ("rm -f $OOO_PATH/extras/source/symbols/*.bmp");
-
- print "Completed cleanly.\n";
- exit (0);
+++ /dev/null
---- stlport/STLport-4.5.3.patch Thu Jan 1 02:00:00 1970
-+++ stlport/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 :
---- stlport/makefile.mk Tue Sep 10 22:38:00 2002
-+++ stlport/makefile.mk Tue Sep 10 22:39:11 2002
-@@ -72,11 +72,11 @@
- # --- Files --------------------------------------------------------
- .EXPORT : CC CXX
- .IF "$(COMID)"=="gcc3"
-- TARFILE_NAME=STLport-4.5
-+ TARFILE_NAME=STLport-4.5.3
- .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103"
- PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch
- .ELSE
-- PATCH_FILE_NAME=STLport-4.5.patch
-+ PATCH_FILE_NAME=STLport-4.5.3.patch
- .ENDIF
- .ELSE # "$(COMID)"=="gcc3"
- .IF "$(OS)"=="MACOSX"
-@@ -93,8 +93,8 @@
- TARFILE_NAME=STLport-4.0
- PATCH_FILE_NAME=STLport-4.0.patch
- .ELSE # "$(CCNUMVER)"<="001300000000"
--TARFILE_NAME=STLport-4.5-0119
--PATCH_FILE_NAME=STLport-4.5-0119.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=STLport-4.5.3.patch
- .ENDIF # "$(CCNUMVER)"<="001300000000"
- .ENDIF
-
-@@ -157,8 +157,8 @@
- .ENDIF
-
- .IF "$(OS)"=="IRIX"
--TARFILE_NAME=STLport-4.5
--PATCH_FILE_NAME=STLport-4.5.patch
-+TARFILE_NAME=STLport-4.5.3
-+PATCH_FILE_NAME=STLport-4.5.3.patch
- BUILD_ACTION=gmake
- BUILD_FLAGS=-f gcc-3.0.mak
- BUILD_FLAGS+= -j$(MAXPROCESS)
+++ /dev/null
---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100
-+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100
-@@ -79,7 +79,7 @@
- /* osl_createSemaphore */
- /*****************************************************************************/
-
--#ifdef LINUX
-+#if 0
- /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */
-
- typedef struct {
-@@ -100,7 +100,7 @@
- * larger of both
- * XXX
- */
--#ifdef LINUX
-+#if 0
- if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) )
- Semaphore= malloc(sizeof(glibc_21_sem_t));
- else
---- oo_1.1rc3_src/tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100
-+++ oo_1.1rc3_src/tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100
-@@ -577,7 +577,7 @@
-
- {
- char* p = NULL;
-- InfoMemoryAccess( p );
-+ /*InfoMemoryAccess( p );*/
- p = (char*)&p;
- InfoMemoryAccess( p );
- InfoMemoryTypeAccess( t_short );
---- oo_1.1_src/neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100
-+++ oo_1.1_src/neon/neon.patch 2003-10-04 10:32:49.123426384 +0100
-@@ -19,7 +19,7 @@
- !
- ! /* Define as __inline if that's what the C compiler calls it. */
- ! #ifdef UNX
--! #define inline
-+! #define inline inline
- ! #endif
- !
- ! /* Define if you need to in order for stat and other things to work. */
+++ /dev/null
-Submitted By: Mark Hymers <markh AT linuxfromscratch DOT org>
-Date: 2003-10-05
-Initial Package Version: 1.1.0
-Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-September/003771.html
-Description: Fixes critical segmentation fault on linux-2.6.0 based systems
---- oo_1.1_src/tools/source/solar/solar.c 2003-04-15 12:55:43.000000000 -0500
-+++ oo_1.1_src/tools/source/solar/solar.c.new 2003-10-05 12:31:58.000000000 -0500
-@@ -76,7 +76,7 @@
- #include <varargs.h>
- #endif
-
--#define NO_USE_FORK_TO_CHECK
-+#define USE_FORK_TO_CHECK
- #ifdef USE_FORK_TO_CHECK
- #include <sys/wait.h>
- #else
+++ /dev/null
---- oo_1.1_src/solenv/bin/checkdll.sh.org 2003-11-13 10:54:00.000000000 -0600
-+++ oo_1.1_src/solenv/bin/checkdll.sh 2003-11-13 10:54:15.000000000 -0600
-@@ -52,8 +52,8 @@
- export LD_LIBRARY_PATH;;
- esac
-
-- $checkdll "$*"
-- if [ $? -ne 0 ]; then exit 1 ; fi
-+# $checkdll "$*"
-+# if [ $? -ne 0 ]; then exit 1 ; fi
-
- for parameter in $*; do
- library=$parameter;
+++ /dev/null
-ximian-openoffice
- command=xooffice
- name=Ximian OpenOffice.org
- can_open_multiple_files=true
- expects_uris=true
- uses_gnomevfs=true
- requires_terminal=false
- mime_types=application/vnd.lotus-1-2-3,application/vnd.ms-excel,application/rtf,application/msword,application/vnd.ms-powerpoint,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/vnd.stardivision.draw,application/vnd.stardivision.impress,application/vnd.stardivision.mail,application/vnd.stardivision.math,application/vnd.stardivision.writer,application/vnd.sun.xml.calc,application/vnd.sun.xml.calc.template,application/vnd.sun.xml.draw,application/vnd.sun.xml.draw.template,application/vnd.sun.xml.impress,application/vnd.sun.xml.impress.template,application/vnd.sun.xml.math,application/vnd.sun.xml.writer,application/vnd.sun.xml.writer.global,application/vnd.sun.xml.writer.template,image/x-emf,image/x-pcx,image/x-photo-cd,image/x-pict
+++ /dev/null
-application/vnd.lotus-1-2-3
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.ms-excel
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/rtf
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/msword
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.ms-powerpoint
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.calc
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.chart
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.draw
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.impress
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.mail
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.math
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.stardivision.writer
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.calc
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.calc.template
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.draw
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.draw.template
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.impress
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.impress.template
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.math
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer.global
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-application/vnd.sun.xml.writer.template
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-emf
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-pcx
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-photo-cd
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
-
-image/x-pict
- short_list_application_ids_for_novice_user_level=ximian-openoffice
- short_list_application_ids_for_intermediate_user_level=ximian-openoffice
- short_list_application_ids_for_advanced_user_level=ximian-openoffice
+++ /dev/null
-#!/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 ~/.xversionrc
-PV=<pv>
-OOVERSION="OpenOffice.org ${PV}"
-
-##
-## Source system configuration file
-##
-[ -r /etc/openoffice/openoffice.conf ] && . /etc/openoffice/openoffice.conf
-
-if [ ! -x "$HOME/.xopenoffice/1.1.1" ] ; then
- echo "You are starting this version of Ximian OpenOffice.org for the first time"
- echo "As the user install has changed again you will have to redo your settings"
-fi
-
-###
-### Get user settings directory from ~/.xversionrc and echo directory name to stdout
-### get_settings_dir <Version>
-### return: 0 - directory found,
-### 1 - ~/.xversionrc non existent
-### 2 - entry exists in ~/.xversionrc but directory not found
-### 3 - ~/.xversionrc exists but no entry found
-get_settings_dir()
-{
- [ -r ${HOME}/.xversionrc ] || exit 1
- # warning, .xversionrc is DOS encoded so strip ^M
- settings_dir="`tr -d '\r' < ~/.xversionrc | 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
- # .xversionrc contains a version yet the directory does not exist
- echo "I'm confused because I can't find OpenOffice's user files."
- echo "Your ~/.xversionrc file tells they should be under $OOHOME,"
- echo "but they are not. Please fix the situation manually."
- echo "You may want to edit ~/.xversionrc 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/ximian-openoffice/autoresponse-<pv>.conf ] && \
- grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf ; then
-
-# Do not take old settings as migration results in broken behaviour
-#
-# UPDATEFLAG=""
-# if oldhome="`get_settings_dir "OpenOffice.org 1.0.3"`" ; then
-# OOHOME="$oldhome"
-# echo "Using settings from 1.0.3: /${oldhome}"
-# /bin/echo -e "OpenOffice.org <pv>=file://$oldhome\r" >> ~/.xversionrc
-# UPDATEFLAG="-update:/$oldhome"
-# fi
-
- # first install
- OOHOME=`grep DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf | \
- sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"`
-
- if [ -d "$OOHOME" ]; then
- echo "openoffice.org: You have no entry for $OOVERSION in ~/.xversionrc, "
- echo "yet the directory $OOHOME exists."
- echo "Please remove $OOHOME and try again."
- exit 1
- fi
-
- echo "running openoffice.org setup..."
- if ! /opt/Ximian-OpenOffice/program/setup ${UPDATEFLAG} -R:/etc/ximian-openoffice/autoresponse-<pv>.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/ximian-openoffice/autoresponse-<pv>.conf file manually ?"
- echo "This file should contain DESTINATIONPATH"
- exit 1
- fi
-fi
-
-##
-## If no file is specified on the command line, which application to start?
-## The wrapper can be called from several links in /usr/bin
-##
-if [ $# = 0 ]; then
- case `basename $0` in
- xoocalc) set -- private:factory/scalc;;
- xoodraw) set -- private:factory/sdraw;;
- xooimpress) set -- private:factory/simpress;;
- xoomath) set -- private:factory/smath;;
- xoowriter) set -- private:factory/swriter;;
- xoohtml) set -- private:factory/swriter/web;;
- xoomaster) set -- private:factory/swriter/Global;;
- esac
-fi
-
-## Previous dead installation?
-[ -d $HOME/.xopenoffice/user ] && echo "Warning: you have a user settings directory from 1.0.0 in ~/.xopenoffice/user - this is no longer used"
-
-# There is no locale import file
-## Change the ooLocale key in SETUPFILE acording to LOCALE
-#TMPFILE=`mktemp -t oooLocale.XXXXXXXXXX` && {
-# cat >${TMPFILE} <<EOF
-#<?xml version="1.0" encoding="UTF-8"?>
-#<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Setup" oor:package="org.openoffice">
-# <node oor:name="L10N">
-# <prop oor:name="ooLocale" oor:type="xs:string">
-# <value>$LOCALEOO</value>
-# </prop>
-# </node>
-#</oor:node>
-#EOF
-# ooconfigimport $TMPFILE >/dev/null
-# rm -f ${TMPFILE}
-#}
-
-# Check whether the programs actually link to anything, or are from an old
-# version.
-
-if [ ! -s $OOHOME/setup ]; then
- echo "${OOHOME}/setup links to nothing, resetting link"
- ln -sf /opt/Ximian-OpenOffice/program/setup ${OOHOME}/setup
-fi
-if [ ! -s $OOHOME/soffice ]; then
- echo "${OOHOME}/soffice links to nothing, resetting link"
- ln -sf /opt/Ximian-OpenOffice/program/soffice ${OOHOME}/soffice
-fi
-if [ ! -s $OOHOME/spadmin ]; then
- echo "${OOHOME}/spadmin links to nothing, resetting link"
- ln -sf /opt/Ximian-OpenOffice/program/soffice ${OOHOME}/spadmin
-fi
-
-
-##
-## That's it. Launch the beast (with the given args)
-##
-LANG=$LOCALE
-export LANG
-case `basename $0` in
- xoosetup) exec "$OOHOME/setup"
- ;;
- xoopadmin) exec "$OOHOME/spadmin"
- ;;
- *) exec "$OOHOME/soffice" "$@"
- ;;
-esac
-## Changelog
-# 2003/04/01 halls
-# * Version 1.1beta
-# 2003/02/03 halls
-# * Check for nonexistent ooLocale every run
-# 2003/01/09 halls
-# * Version 1.0.2
-# 12/15 saviot
-# * Change ooLocale at startup in Setup.xml
-# <ooLocale cfg:type="string"/> doesn't work for help.
-# 12/03 challs
-# * Add Debian font paths to user font path
-# 11/14 saviot
-# * correct handling of UI language
-# * don't change Linguistic.xml after first startup(#168780)
-# * TODO: provide better defaults on first startup
-# 10/03 challs
-# * Fix use with LC_ALL
-# 07/10 challs
-# * use 1.0.1 directory and improve error checking
-# 07/02 challs
-# * use readlink in /proc/PID/exe to get
-# real session manager name
-# 06/12 challs
-# * merge into main package
-# * change $@ to "$@"
-# * source configuration file:
-# /etc/openoffice/openoffice.conf
-# 06/12 mquinson
-# * strace only when DEBUG is set to yes
-# * readd the $@ to pass the args to soffice
-# 06/06 mquinson
-# * Make sure the OLDLOCALE is never empty
-# * handle the case where the locale is C
--- /dev/null
+--- sal/util/makefile.mk.foo 2004-12-21 14:38:37.314521336 -0500
++++ sal/util/makefile.mk 2004-12-21 14:46:52.495159848 -0500
+@@ -146,6 +146,10 @@
+ SHL1STDLIBS+=-init InitLibrary -term ExitLibrary
+ .ENDIF # MAC
+
++.IF "$(OS)"=="LINUX"
++SHL1STDLIBS+= -Wl,-Bstatic -lsupc++ -Wl,-Bdynamic -lgcc_s
++.ENDIF
++
+ .IF "$(GUI)"=="UNX"
+ .IF "$(OS)"=="SOLARIS"
+ # libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
--- /dev/null
+--- patches/OOO_1_1_3/apply.orig 2004-12-02 00:07:00.659646960 +0100
++++ patches/OOO_1_1_3/apply 2004-12-02 00:07:18.119992584 +0100
+@@ -1121,14 +1121,6 @@
+
+ ########################################################
+
+-[ GentooOnly ]
+-gcc34-gnome.diff
+-gcc34-main.diff
+-gcc34-nojava-fix.diff
+-gcc34-nptl-fix.diff
+-
+-########################################################
+-
+ [ TestLayout ]
+ # the beginnings of layout
+ gui-window-layout.diff
--- /dev/null
+--- patches/vclplug/psprint-nojvmfwk.diff 2004/12/03 12:47:25 1.1
++++ patches/vclplug/psprint-nojvmfwk.diff 2004/12/03 13:11:12 1.1.2.3
+@@ -0,0 +1,146 @@
++Index: psprint/source/helper/helper.cxx
++===================================================================
++--- psprint/source/helper/helper.cxx.orig 2004-12-03 12:51:50.722009016 +0000
+++++ psprint/source/helper/helper.cxx 2004-12-03 12:52:00.583509840 +0000
++@@ -73,7 +73,7 @@
++ #include <rtl/bootstrap.hxx>
++ #include <sal/config.h>
++ #ifdef SOLAR_JAVA
++-#include <jvmfwk/framework.h>
+++#include "jvmaccess/javainfo.hxx"
++ #endif // SOLAR_JAVA
++
++ #ifdef MACOSX
++@@ -247,36 +247,87 @@ const OUString& psp::getFontPath()
++
++ // append jre/jdk fonts if possible
++ OString aJREpath;
++-
++-#ifdef SOLAR_JAVA
++- JavaInfo * pInfo = NULL;
++- javaFrameworkError jerr = jfw_getSelectedJRE( & pInfo);
++- if (jerr == JFW_E_NONE && pInfo != NULL)
++- {
++- OUString aSys;
++- if( osl_getSystemPathFromFileURL( pInfo->sLocation, &aSys.pData ) == osl_File_E_None )
++- aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() );
++- }
++- jfw_freeJavaInfo(pInfo);
++-#endif
++-
++- if( aJREpath.getLength() > 0 )
+++ if( aUserPath.getLength() )
++ {
++- OString aTestPath( aJREpath );
++- aTestPath += "/jre/lib/fonts";
++- if( access( aTestPath.getStr(), R_OK ) )
+++ OUString aJavaRc( aUserPath );
+++ aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/user/config/" SAL_CONFIGFILE( "java" ) ) );
+++ Config aConfig( aJavaRc );
+++ aConfig.SetGroup( "Java" );
+++ aJREpath = aConfig.ReadKey( "Home" );
+++ if( ! aJREpath.getLength() )
+++ {
+++ aJavaRc = aNetPath;
+++ aJavaRc += OUString( RTL_CONSTASCII_USTRINGPARAM( "/share/config/" SAL_CONFIGFILE("java") ) );
+++ Config aShareConfig( aJavaRc );
+++ aShareConfig.SetGroup( "Java" );
+++ aJREpath = aShareConfig.ReadKey( "Home" );
+++ }
+++
+++ if( aJREpath.compareTo( "file:", 5 ) == 0 )
++ {
++- aTestPath = aJREpath;
++- aTestPath += "/lib/fonts";
+++ OUString aURL( OStringToOUString( aJREpath, osl_getThreadTextEncoding() ) );
+++ OUString aSys;
+++ if( osl_getSystemPathFromFileURL( aURL.pData, &aSys.pData ) == osl_File_E_None )
+++ aJREpath = OUStringToOString( aSys, osl_getThreadTextEncoding() );
+++ }
+++
+++ if( aJREpath.getLength() > 0 )
+++ {
+++ OString aTestPath( aJREpath );
+++ aTestPath += "/jre/lib/fonts";
++ if( access( aTestPath.getStr(), R_OK ) )
++- aJREpath = OString();
+++ {
+++ aTestPath = aJREpath;
+++ aTestPath += "/lib/fonts";
+++ if( access( aTestPath.getStr(), R_OK ) )
+++ aJREpath = OString();
+++ else
+++ aJREpath = aTestPath;
+++ }
++ else
++ aJREpath = aTestPath;
++ }
++- else
++- aJREpath = aTestPath;
++ }
++
+++#ifdef SOLAR_JAVA
+++ // if no javarc (e.g. in setup) exists or it failed try the UDK method
+++ if( ! aJREpath.getLength() )
+++ {
+++ OString aJavaLib;
+++ try
+++ {
+++ OUString aLib;
+++ if (osl::FileBase::getSystemPathFromFileURL(
+++ jvmaccess::JavaInfo::createBestInfo(true).
+++ getRuntimeLibLocation(),
+++ aLib)
+++ == osl::FileBase::E_None)
+++ aLib.convertToString(
+++ &aJavaLib, osl_getThreadTextEncoding(),
+++ RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+++ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR);
+++ }
+++ catch (jvmaccess::JavaInfo::InitException &)
+++ {}
+++
+++ if (aJavaLib.getLength() != 0)
+++ {
+++ sal_Int32 nIndex;
+++ while( ( nIndex = aJavaLib.lastIndexOf( '/' ) ) != -1 )
+++ {
+++ aJavaLib = aJavaLib.copy( 0, nIndex );
+++ OString aTmpPath = aJavaLib;
+++ aTmpPath += "/lib/fonts";
+++ if( access( aTmpPath.getStr(), R_OK ) == 0 )
+++ {
+++ aJREpath = aTmpPath;
+++ break;
+++ }
+++ }
+++ }
+++ }
+++#endif // SOLAR_JAVA
+++
++ if( aJREpath.getLength() )
++ {
++ aPath += OUString( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
++Index: psprint/prj/build.lst
++===================================================================
++--- psprint/prj/build.lst.orig 2004-12-03 12:40:47.820785320 +0000
+++++ psprint/prj/build.lst 2004-12-03 12:52:14.974322104 +0000
++@@ -1,4 +1,4 @@
++-pp psprint : tools unotools cpputools jvmaccess SO:print_header jvmfwk NULL
+++pp psprint : tools unotools cpputools jvmaccess SO:print_header NULL
++ pp psprint usr1 - all pp_mkout NULL
++ pp psprint\source\fontsubset nmake - all pp_fontsset NULL
++ pp psprint\source\printer nmake - u pp_printer NULL
++Index: psprint/util/makefile.mk
++===================================================================
++--- psprint/util/makefile.mk.orig 2004-12-03 12:40:47.863778784 +0000
+++++ psprint/util/makefile.mk 2004-12-03 13:10:17.206797760 +0000
++@@ -105,7 +105,7 @@ SHL1STDLIBS=$(UNOTOOLSLIB) \
++ $(SALLIB) \
++ -lX11
++ .IF "$(SOLAR_JAVA)"!=""
++-SHL1STDLIBS+=$(JVMFWKLIB)
+++SHL1STDLIBS+=$(JVMACCESSLIB)
++ .ENDIF
++
++ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+--- patches/OOO_1_1_3/apply 2004/12/02 20:17:41 1.83.2.35
++++ patches/OOO_1_1_3/apply 2004/12/03 12:47:25 1.83.2.36
+@@ -45,12 +45,6 @@
+ #
+ [ VCLPlug ]
+ psprint-m46-backport.diff
+-# Newer psprint (fixes various CUPS bugs)
+-psprint-m46-to-m62.diff
+-# default encoding ADOBE_STANDARD is new so revert to MS_1252
+-psprint-defaultencoding.diff
+-# revert FONTCONFIG_FONTS change to ENABLE_FONTCONFIG
+-psprint-fontconfigvar.diff
+ vcl-inc.diff
+ vcl-prj.diff
+ vcl-source-app.diff
+@@ -90,6 +84,14 @@
+ sj2-win-handle.diff
+ dbaccess-win-handle.diff
+
++# Newer psprint (fixes various CUPS bugs)
++psprint-m46-to-m62.diff
++# default encoding ADOBE_STANDARD is new so revert to MS_1252
++psprint-defaultencoding.diff
++# revert FONTCONFIG_FONTS change to ENABLE_FONTCONFIG
++psprint-fontconfigvar.diff
++# revert back to old JDK path detection method
++psprint-nojvmfwk.diff
+ # Use the right colors for menus/menuitems #?????
+ vcl-unx-gtk-menu-style.diff
+++ /dev/null
-MD5 3cc04c46514cd4b663cab3ca5637d501 OOo_1.1.1p1_source.tar.bz2 192388698
-MD5 79e885131d99a0a507eb3ffb7ecf19af ooo-build-1.1.55.tar.gz 1996476
-MD5 32a0e62f89ef36a91437fc705fbe6440 ooo-icons-OOO_1_1-9.tar.gz 1561812
--- /dev/null
+MD5 9df288bb534964d4b96efdf7bf029456 OOo_1.1.3-1_source.tar.gz 215360913
+MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958
+MD5 0a6dec3329bd1a2662990162b23a87e3 ooo-build-1.3.7.tar.gz 2939935
+MD5 c3d8c9f5ae2abbe1b7091817265b9ef3 libwpd-snap-20040823.tar.gz 447710
+MD5 07af8dbf461df3e01a30124009f3e1ec OOo-gentoo-splash-1.1.tar.bz2 57631
+MD5 be79d3cb5f64d2c0ac8a75e65a59cb09 ooo-icons-OOO_1_1-10.tar.gz 1563326
+MD5 05ff784fff01c54cd3dd7b975b46bae2 ooo-KDE_icons-OOO_1_1-0.3.tar.gz 1017540
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild,v 1.22 2005/01/01 15:39:20 eradicator Exp $
-
-# IMPORTANT: This is extremely alpha!!!
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.1 2005/01/12 23:05:13 suka Exp $
# Notes:
#
inherit flag-o-matic eutils toolchain-funcs
-IUSE="gnome kde"
+IUSE="gnome kde java curl zlib nptl"
-OO_VER=1.1.1
-PATCHLEVEL=OOO_1_1_1
-ICON_VER=OOO_1_1-9
+OO_VER=1.1.3
+PATCHLEVEL=OOO_1_1_3
+ICON_VER=OOO_1_1-10
+KDE_ICON_VER=OOO_1_1-0.3
+KDE_ICON_PATH=documents/159/1975
INSTDIR="/opt/Ximian-OpenOffice"
PATCHDIR=${WORKDIR}/ooo-build-${PV}
-ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
-S="${WORKDIR}/oo_${OO_VER}_src"
+S="${WORKDIR}/OOo_${OO_VER}_src"
DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite."
-SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}p1_source.tar.bz2
+SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}-1_source.tar.gz
+ http://www.stlport.org/archive/STLport-4.6.2.tar.gz
http://ooo.ximian.com/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz
- http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz"
+ http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz
+ mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2
+ gnome? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )
+ !kde? ( http://ooo.ximian.com/packages/ooo-icons-${ICON_VER}.tar.gz )
+ kde? ( http://kde.openoffice.org/files/${KDE_ICON_PATH}/ooo-KDE_icons-${KDE_ICON_VER}.tar.gz )"
HOMEPAGE="http://ooo.ximian.com"
LICENSE="|| ( LGPL-2 SISSL-1.1 )"
SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
-RDEPEND="virtual/libc
+RDEPEND="!app-office/openoffice-ximian-bin
+ virtual/x11
+ virtual/libc
+ virtual/lpr
!=sys-libs/glibc-2.3.1*
>=dev-lang/perl-5.0
- >=x11-libs/gtk+-2.0
- >=gnome-base/libgnome-2.2
- >=gnome-base/gnome-vfs-2.0
- >=net-print/libgnomecups-0.1.4
- >=net-print/gnome-cups-manager-0.16
- >=dev-libs/libxml2-2.0
+ gnome? ( >=x11-libs/gtk+-2.0
+ >=gnome-base/gnome-vfs-2.0
+ >=dev-libs/libxml2-2.0 )
+ kde? ( kde-base/kdelibs )
>=media-libs/libart_lgpl-2.3.13
>=x11-libs/startup-notification-0.5
- media-fonts/ttf-bitstream-vera
+ >=media-libs/freetype-2.1.4
media-libs/fontconfig
media-gfx/imagemagick
media-libs/libpng
sys-devel/flex
sys-devel/bison
- virtual/x11
app-arch/zip
app-arch/unzip
dev-libs/expat
- virtual/lpr
- !app-office/openoffice-ximian-bin
+ java? ( >=virtual/jdk-1.4.1 )
ppc? ( >=sys-libs/glibc-2.2.5-r7
- >=sys-devel/gcc-3.2.1 )
- >=media-libs/freetype-2.1.4"
+ >=sys-devel/gcc-3.2.1 )"
DEPEND="${RDEPEND}
- app-shells/tcsh
>=sys-apps/findutils-4.1.20-r1
- dev-libs/libxslt
- net-misc/curl
+ app-shells/tcsh
+ dev-util/pkgconfig
+ dev-util/intltool
+ curl? ( net-misc/curl )
+ zlib? ( sys-libs/zlib )
sys-libs/pam
!dev-util/dmake
- dev-util/intltool"
+ !java? ( dev-libs/libxslt )"
pkg_setup() {
+ if use java
+ then
+ if [ -z "${JDK_HOME}" ] || [ ! -d "${JDK_HOME}" ]
+ then
+ eerror "In order to compile java sources you have to set the"
+ eerror "\$JDK_HOME environment properly."
+ eerror ""
+ eerror "You can achieve this by using the java-config tool:"
+ eerror " emerge java-config"
+ die "Couldn't find a valid JDK home"
+ fi
+ fi
+
+ ewarn " This version should now also compile fine with gcc 3.4.x "
+ ewarn " If you encounter problems in relation to this, please report "
+ ewarn " them to http://bugs.gentoo.org "
+ 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 "
# Do we have a gcc that use the new layout and gcc-config ?
if /usr/sbin/gcc-config --get-current-profile &> /dev/null
then
- export NEW_GCC="1"
export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
# Just recheck gcc version ...
- if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
+ if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ] && [ "$(gcc-version)" != "3.4" ]
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
export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}"
export GCC_PROFILE="${CHOST}-3.2.1"
else
- eerror "This build needs gcc-3.2 or gcc-3.3!"
+ eerror "This build needs gcc-3.2, gcc-3.3 or gcc-3.4!"
eerror
eerror "Use gcc-config to change your gcc profile:"
eerror
cd ${WORKDIR}
unpack ${A}
- #Fix Sandbox problems with scale-icons script
+ #Beginnings of our own patchset
cd ${PATCHDIR}
- epatch ${FILESDIR}/${OO_VER}/fixscale.patch
+ epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch
+
+ #Fix java problems in 1.3.7
+ epatch ${FILESDIR}/${OO_VER}/nojvmfwk-fix.patch
#Still needed: The STLport patch
cd ${S}
- rm stlport/STLport-4.5.3.patch
+ cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die
epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch
- #Fix nptl compile issues
- epatch ${FILESDIR}/${OO_VER}/nptl.patch
+ if use ppc; then
+ epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch
+ fi
+
+ #Add our own splash screen
+ epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff
- #Additional patch for Kernel 2.6
- epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-linux-2.6-fix.patch
+ #Detect which look and patchset we are using
+ export DISTRO="Gentoo"
+ export MYCONF=""
+ export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER}
- if [ ${ARCH} = "sparc" ]; then
- epatch ${FILESDIR}/${OO_VER}/openoffice-1.1.0-sparc64-fix.patch
+ if use gnome; then
+ export DISTRO="GentooGNOME"
+ export MYCONF="--enable-gtk"
fi
- einfo "Applying Ximian OO.org Patches"
- ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=Ximian || die "Ximian patches failed"
+ if use kde; then
+ export MYCONF="${MYCONF} --enable-kde"
+ if use !gnome; then
+ export DISTRO="GentooKDE"
+ export MYCONF="--enable-kde"
+ export ICONDIR=${WORKDIR}/ooo-KDE_icons-${KDE_ICON_VER}
+ fi
+ fi
- einfo "Installing / Scaling Icons"
- ${PATCHDIR}/bin/scale-icons ${S}
- cp -avf ${ICONDIR}/* ${S}
+ #Finally apply the patches
+ einfo "Applying Ximian OO.org Patches"
+ ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed"
- einfo "Munging font mappings ..."
- ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu
- echo "done munging fonts."
+ # GCC 3.4.x fixes
+ if [ "$(gcc-version)" = "3.4" ]
+ then
+ epatch ${FILESDIR}/${OO_VER}/gcc34_2.patch.bz2
+ epatch ${FILESDIR}/${OO_VER}/gcc34-sal-link-to-libsupc++.diff
+ use !java && epatch ${FILESDIR}/${OO_VER}/gcc34-nojava-fix.patch
+ use nptl && epatch ${FILESDIR}/${OO_VER}/gcc34-nptl-fix.patch
+ use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch
+ fi
- # Compile problems with these ...
- filter-flags "-funroll-loops"
- filter-flags "-fomit-frame-pointer"
- filter-flags "-fprefetch-loop-arrays"
- filter-flags "-fno-default-inline"
- filter-flags "-fstack-protector"
- filter-flags "-ftracer"
- append-flags "-fno-strict-aliasing"
- replace-flags "-O3" "-O2"
- replace-flags "-Os" "-O2"
+ einfo "Installing / Scaling Icons"
+ ${PATCHDIR}/bin/scale-icons ${S} || die
+ cp -af ${ICONDIR}/* ${S} || die
- if [ "$(gcc-version)" == "3.2" ]; then
- einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
- replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
- fi
+ einfo "Copying splash screens in place"
+ cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
- # Now for our optimization flags ...
- export CXXFLAGS="${CXXFLAGS} -fno-for-scope -fpermissive -fno-rtti"
- perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
- ${S}/solenv/inc/unxlngi4.mk
- perl -pi -e "s|^CFLAGSCXX=.*|CFLAGSCXX=${CXXFLAGS}|g" \
- ${S}/solenv/inc/unxlngi4.mk
+ einfo "Copying libpwd tarball in build dir"
+ mkdir -p ${S}/libwpd/download/ || die
+ cp -af ${DISTDIR}/libwpd-snap-20040823.tar.gz ${S}/libwpd/download/ || die
- #Do our own branding by setting gentoo linux as the vendor
- sed -i -e "s,\(//\)\(.*\)\(my company\),\2Gentoo Linux," ${S}/offmgr/source/offapp/intro/ooo.src
+ einfo "Munging font mappings ..."
+ ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die
+ echo "done munging fonts."
}
get_EnvSet() {
cd ${S}/dmake
autoconf || die
+ #Check if we use java
+ if use java
+ then
+ MYCONF="${MYCONF} --with-jdk-home=${JAVA_HOME}"
+ else
+ MYCONF="${MYCONF} --disable-java"
+ fi
+
+ #See if we use system-curl
+ if use curl
+ then
+ MYCONF="${MYCONF} --with-system-curl"
+ fi
+
+ #See if we use system-zlib
+ if use zlib
+ then
+ MYCONF="${MYCONF} --with-system-zlib"
+ 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 with language support for ${LFULLNAME}..."
cd ${S}/config_office
- rm -f config.cache
- autoconf
- ./configure \
- --enable-libart \
+ rm -f config.cache || die
+ autoconf || die
+ MYCONF="${MYCONF} --enable-libart \
--enable-libsn \
--enable-crashdump=no \
--with-lang=ENUS,${LANGNAME} \
--without-fonts \
--disable-rpath \
--enable-fontconfig \
- --with-system-zlib \
--with-system-freetype \
- --with-system-curl \
- --disable-java || die
+ --with-system-xrender \
+ --disable-mozilla"
+
+ ./configure ${MYCONF} || die
cd ${S}
get_EnvSet
# Build as minimal as possible
export BUILD_MINIMAL="${LANGNO}"
- # 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"
+ #Get info for parallel build
+ export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
- # Should the build use multiprocessing?
- if [ "${ECPUS}" -gt 1 ]
+ if [ "${JOBS}" -gt 10 ]
then
- buildcmd="${S}/solenv/bin/build.pl --all -P${ECPUS} product=full strip=true --dlv_switch link"
- else
- buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
+ export JOBS="10"
+ einfo "dmake fails with too much parallel jobs, so limiting to 10"
fi
+ export buildcmd="${S}/solenv/bin/build.pl --all product=full strip=true --dlv_switch link"
+
+ # Should the build use multiprocessing? Not enabled by default, as it tends to break
+ if [ "${WANT_DISTCC}" == "true" ]
+ then
+ if [ "${JOBS}" -gt 1 ]
+ then
+ export buildcmd="${buildcmd} -P${JOBS}"
+ einfo "Using distcc, Good Luck"
+ fi
+ fi
+
+ # Compile problems with these ...
+ filter-flags "-funroll-loops"
+ filter-flags "-fomit-frame-pointer"
+ filter-flags "-fprefetch-loop-arrays"
+ filter-flags "-fno-default-inline"
+ filter-flags "-fstack-protector"
+ filter-flags "-ftracer"
+ append-flags "-fno-strict-aliasing"
+ replace-flags "-O3" "-O2"
+ replace-flags "-Os" "-O2"
+
+ if [ "$(gcc-version)" == "3.2" ]; then
+ einfo "You use a buggy gcc, so replacing -march=pentium4 with -march=pentium3"
+ replace-flags "-march=pentium4" "-march=pentium3 -mcpu=pentium4"
+ fi
+
+ # Now for our optimization flags ...
+ export ARCH_FLAGS="${CFLAGS}"
+
if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
then
# Set CCCOMP and CXXCOMP. This is still needed for STLport
# Get things ready for bootstrap (Az)
chmod 0755 ${S}/solenv/bin/*.pl
# Bootstrap ...
- ./bootstrap
+ ./bootstrap || die
einfo "Building OpenOffice.org..."
- echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.sh
+ echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && LINK=g++ ${buildcmd}" > build.sh
sh build.sh || die "Build failed!"
[ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
# Fixing install location in response file
sed -e "s|<destdir>|${D}${INSTDIR}|" \
- ${T}/rsfile-global > ${T}/autoresponse
+ ${T}/rsfile-global > ${T}/autoresponse || die
einfo "Installing Ximian-OpenOffice.org into build root..."
dodir ${INSTDIR}
./setup -v -noexit -nogui -r:${T}/autoresponse || die "Setup failed"
#Fix for parallel install
- sed -i -e s/sversionrc/xversionrc/g ${D}${INSTDIR}/program/bootstraprc ${D}${INSTDIR}/program/instdb.ins
+ sed -i -e s/sversionrc/xversionrc/g ${D}${INSTDIR}/program/bootstraprc ${D}${INSTDIR}/program/instdb.ins || die
echo
einfo "Removing build root from registry..."
# Remove totally useless stuff.
- rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+ rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh} || die
# Remove build root from registry and co
egrep -rl "${D}" ${D}${INSTDIR}/* | \
xargs -i perl -pi -e "s|${D}||g" {} || :
dosym xooffice /usr/bin/xoo${app}
done
- # Install ximian icons
+ # Install icons and menu shortcuts
cd ${PATCHDIR}/desktop/
insinto /usr/share/pixmaps
doins *.png
+
+ einfo "Installing menu shortcuts"
for menu in drawing presentation spreadsheet textdoc; do
intltool-merge -d ../po ${menu}.desktop.in xoo-${menu}.desktop;
done
sed -i -e s/'=oo'/'=xoo'/g *.desktop
+ insinto /usr/share/applications
+ doins *.desktop
- einfo "Installing Menu shortcuts and mime info (need \"gnome\" or \"kde\" in USE)..."
+ einfo "Installing mime info (need \"gnome\" or \"kde\" in USE)..."
if use gnome
then
- insinto /usr/share/applications
- doins *.desktop
insinto /usr/share/application-registry
doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications
insinto /usr/share/mime-info
if use kde
then
- insinto /usr/share/applnk/Ximian-OpenOffice.org
- doins *.desktop
insinto /usr/share/mimelnk/application
doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/*
fi
doins ${PATCHDIR}/fonts/*.ttf
# Remove unneeded stuff
- rm -rf ${D}${INSTDIR}/share/cde
+ rm -rf ${D}${INSTDIR}/share/cde || die
# Fix instdb.ins, to *not* install local copies of these
for entry in Kdeapplnk Kdemimetext Kdeicons Gnome_Apps Gnome_Icons Gnome2_Apps; do
projects / gentoo.git / commitdiff