From 34320c65f542469722f395d958cc698caac857d9 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Wed, 12 Jan 2005 23:05:14 +0000 Subject: [PATCH] new release 1.3.7 closes a bunch of bugs --- app-office/openoffice-ximian/ChangeLog | 16 +- app-office/openoffice-ximian/Manifest | 42 ++- .../files/1.1.1/fixscale.patch | 29 -- .../files/1.1.1/newstlportfix.patch | 288 ------------------ .../openoffice-ximian/files/1.1.1/nptl.patch | 42 --- .../openoffice-1.1.0-linux-2.6-fix.patch | 16 - .../1.1.1/openoffice-1.1.0-sparc64-fix.patch | 13 - .../1.1.1/ximian-openoffice.applications | 8 - .../files/1.1.1/ximian-openoffice.keys | 129 -------- .../files/1.1.1/xooffice-wrapper-1.3 | 270 ---------------- .../1.1.3/gcc34-sal-link-to-libsupc++.diff | 13 + .../files/1.1.3/gcc34_2.patch.bz2 | Bin 0 -> 33535 bytes .../files/1.1.3/gentoo-1.3.7.patch | 17 ++ .../files/1.1.3/nojvmfwk-fix.patch | 178 +++++++++++ .../files/digest-openoffice-ximian-1.1.55 | 3 - .../files/digest-openoffice-ximian-1.3.7 | 7 + ....ebuild => openoffice-ximian-1.3.7.ebuild} | 277 +++++++++++------ 17 files changed, 426 insertions(+), 922 deletions(-) delete mode 100644 app-office/openoffice-ximian/files/1.1.1/fixscale.patch delete mode 100644 app-office/openoffice-ximian/files/1.1.1/newstlportfix.patch delete mode 100644 app-office/openoffice-ximian/files/1.1.1/nptl.patch delete mode 100644 app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch delete mode 100644 app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-sparc64-fix.patch delete mode 100644 app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.applications delete mode 100644 app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.keys delete mode 100644 app-office/openoffice-ximian/files/1.1.1/xooffice-wrapper-1.3 create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 create mode 100644 app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.7.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/nojvmfwk-fix.patch delete mode 100644 app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55 create mode 100644 app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 rename app-office/openoffice-ximian/{openoffice-ximian-1.1.55.ebuild => openoffice-ximian-1.3.7.ebuild} (70%) diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index f1fc829136da..74ab26739729 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,20 @@ # 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 + +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 openoffice-ximian-1.3.6.ebuild: diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 33bbc7640748..46829a300896 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,33 +1,29 @@ -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 diff --git a/app-office/openoffice-ximian/files/1.1.1/fixscale.patch b/app-office/openoffice-ximian/files/1.1.1/fixscale.patch deleted file mode 100644 index ccb9d44176df..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/fixscale.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); diff --git a/app-office/openoffice-ximian/files/1.1.1/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.1/newstlportfix.patch deleted file mode 100644 index f92b6444121b..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/newstlportfix.patch +++ /dev/null @@ -1,288 +0,0 @@ ---- 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) diff --git a/app-office/openoffice-ximian/files/1.1.1/nptl.patch b/app-office/openoffice-ximian/files/1.1.1/nptl.patch deleted file mode 100644 index 212ff05c51b6..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/nptl.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- oo_1.1rc3_src/sal/osl/unx/semaphor.c.jj 2003-08-28 10:24:23.736357952 +0100 -+++ oo_1.1rc3_src/sal/osl/unx/semaphor.c 2003-08-28 10:24:26.260974152 +0100 -@@ -79,7 +79,7 @@ - /* osl_createSemaphore */ - /*****************************************************************************/ - --#ifdef LINUX -+#if 0 - /* sem_t from glibc-2.1 (/usr/include/semaphore.h) */ - - typedef struct { -@@ -100,7 +100,7 @@ - * larger of both - * XXX - */ --#ifdef LINUX -+#if 0 - if ( sizeof(glibc_21_sem_t) > sizeof(sem_t) ) - Semaphore= malloc(sizeof(glibc_21_sem_t)); - else ---- oo_1.1rc3_src/tools/source/solar/solar.c.jj 2003-08-28 11:50:57.589772216 +0100 -+++ oo_1.1rc3_src/tools/source/solar/solar.c 2003-08-28 11:50:05.167741576 +0100 -@@ -577,7 +577,7 @@ - - { - char* p = NULL; -- InfoMemoryAccess( p ); -+ /*InfoMemoryAccess( p );*/ - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); ---- oo_1.1_src/neon/neon.patch.jj 2003-10-04 10:32:18.341106008 +0100 -+++ oo_1.1_src/neon/neon.patch 2003-10-04 10:32:49.123426384 +0100 -@@ -19,7 +19,7 @@ - ! - ! /* Define as __inline if that's what the C compiler calls it. */ - ! #ifdef UNX --! #define inline -+! #define inline inline - ! #endif - ! - ! /* Define if you need to in order for stat and other things to work. */ diff --git a/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch b/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch deleted file mode 100644 index 15c90b2e456c..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Submitted By: Mark Hymers -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 - #endif - --#define NO_USE_FORK_TO_CHECK -+#define USE_FORK_TO_CHECK - #ifdef USE_FORK_TO_CHECK - #include - #else diff --git a/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-sparc64-fix.patch b/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-sparc64-fix.patch deleted file mode 100644 index 2455c273a05a..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/openoffice-1.1.0-sparc64-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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; diff --git a/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.applications b/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.applications deleted file mode 100644 index 5e56216d203a..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.applications +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.keys b/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.keys deleted file mode 100644 index a669749676f2..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/ximian-openoffice.keys +++ /dev/null @@ -1,129 +0,0 @@ -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 diff --git a/app-office/openoffice-ximian/files/1.1.1/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.1/xooffice-wrapper-1.3 deleted file mode 100644 index 144c4e7aa281..000000000000 --- a/app-office/openoffice-ximian/files/1.1.1/xooffice-wrapper-1.3 +++ /dev/null @@ -1,270 +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 ~/.xversionrc -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 -### 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-.conf ] && \ - grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-.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 =file://$oldhome\r" >> ~/.xversionrc -# UPDATEFLAG="-update:/$oldhome" -# fi - - # first install - OOHOME=`grep DESTINATIONPATH /etc/ximian-openoffice/autoresponse-.conf | \ - sed -e 's/DESTINATIONPATH=//' -e "s||$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-.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-.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} < -# -# -# -# $LOCALEOO -# -# -# -#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 -# 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-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff b/app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff new file mode 100644 index 000000000000..dd823ee024c3 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gcc34-sal-link-to-libsupc++.diff @@ -0,0 +1,13 @@ +--- 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) diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 b/app-office/openoffice-ximian/files/1.1.3/gcc34_2.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..4a9aaf3dfd3a2561dcffb93af8eca583f80e89c7 GIT binary patch literal 33535 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 R`SZ ++ #include ++ #ifdef SOLAR_JAVA ++-#include +++#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 diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55 deleted file mode 100644 index 1ce7f0b5fbdd..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.1.55 +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 new file mode 100644 index 000000000000..e5f7c9f80c4e --- /dev/null +++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.7 @@ -0,0 +1,7 @@ +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 diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild similarity index 70% rename from app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild rename to app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild index cea7500191a0..890d19c8e41e 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.1.55.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild @@ -1,8 +1,6 @@ # 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: # @@ -28,64 +26,87 @@ 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 " @@ -179,11 +200,10 @@ oo_setup() { # 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 @@ -191,7 +211,7 @@ oo_setup() { 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 @@ -212,61 +232,72 @@ src_unpack() { 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() { @@ -292,25 +323,45 @@ src_compile() { 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 @@ -318,20 +369,46 @@ src_compile() { # 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 @@ -343,10 +420,10 @@ src_compile() { # 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!" @@ -399,7 +476,7 @@ src_install() { # Fixing install location in response file sed -e "s||${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse + ${T}/rsfile-global > ${T}/autoresponse || die einfo "Installing Ximian-OpenOffice.org into build root..." dodir ${INSTDIR} @@ -407,12 +484,12 @@ src_install() { ./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" {} || : @@ -441,20 +518,22 @@ src_install() { 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 @@ -463,8 +542,6 @@ src_install() { 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 @@ -474,7 +551,7 @@ src_install() { 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 -- 2.26.2