From 3f5440a2ff2324116665061cd5bf6198b51e1742 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Sun, 14 Nov 2004 10:32:29 +0000 Subject: [PATCH] New patch version, also this should now compile fine with gcc 3.4.x --- app-office/openoffice-ximian/ChangeLog | 18 +- app-office/openoffice-ximian/Manifest | 14 +- .../files/1.1.3/gcc34-gnome.patch | 24 + .../files/1.1.3/gcc34-nojava-fix.patch | 18 + .../files/1.1.3/gcc34-nptl-fix.patch | 14 + .../files/1.1.3/gcc34.patch.bz2 | Bin 0 -> 33661 bytes .../files/1.1.3/gentoo-1.3.6.patch | 12 + .../files/1.1.3/gentoo-splash.diff | 30 + .../files/1.1.3/newstlportfix.patch | 100 +++ .../1.1.3/ximian-openoffice.applications | 8 + .../files/1.1.3/ximian-openoffice.keys | 129 ++++ .../files/1.1.3/xooffice-wrapper-1.3 | 273 +++++++++ .../files/digest-openoffice-ximian-1.3.6 | 7 + .../openoffice-ximian-1.3.6.ebuild | 578 ++++++++++++++++++ 14 files changed, 1223 insertions(+), 2 deletions(-) create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/gcc34.patch.bz2 create mode 100644 app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff create mode 100644 app-office/openoffice-ximian/files/1.1.3/newstlportfix.patch create mode 100644 app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications create mode 100644 app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys create mode 100644 app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3 create mode 100644 app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6 create mode 100644 app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index d0b0ff02bec0..c79289ee2c4b 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.81 2004/11/11 23:34:06 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.82 2004/11/14 10:32:29 suka Exp $ + +*openoffice-ximian-1.3.6 (14 Nov 2004) + + 14 Nov 2004; suka@gentoo.org +files/1.1.3/gcc34-gnome.patch, + +files/1.1.3/gcc34-nojava-fix.patch, +files/1.1.3/gcc34-nptl-fix.patch, + +files/1.1.3/gcc34.patch.bz2, +files/1.1.3/gentoo-1.3.6.patch, + +files/1.1.3/gentoo-splash.diff, +files/1.1.3/newstlportfix.patch, + +files/1.1.3/ximian-openoffice.applications, + +files/1.1.3/ximian-openoffice.keys, +files/1.1.3/xooffice-wrapper-1.3, + +openoffice-ximian-1.3.6.ebuild: + New release with some major goodies. First and most importantly this should + now compile fine with gcc 3.4.x, the credit for this goes mostly to Hanno + Meyer-Thurow (h.mth@web.de), thanks a lot. Also this is the first version + based on OOo 1.1.3. Added to this we have the usual round of bug fixes and + enhancements of the ximian-patchset, see http://ooo.ximian.com/NEWS for the + full rundown. 12 Nov 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.3.5-r1.ebuild, openoffice-ximian-1.3.5.ebuild: diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index 58c4279eabc9..a26ac29d0824 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,10 +1,12 @@ +MD5 ed54d41393c0e657d7b31c64a08c49f4 openoffice-ximian-1.3.6.ebuild 16881 MD5 2902d83396d34b8256f4e9bf786c446c openoffice-ximian-1.3.5.ebuild 16093 MD5 0e2a85887e013e7ff7db5599649c67bd openoffice-ximian-1.1.55.ebuild 15067 MD5 c6372774b5fd645a5757ac28813cfde3 openoffice-ximian-1.3.5-r1.ebuild 16192 -MD5 e8c011aa3e5d7f5b3893d3df7efd7ab4 ChangeLog 20100 +MD5 eb170506a14105af3d10e4fff4e4793c ChangeLog 20969 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437 MD5 2eda0016f8f36321491d0ac056ce799b files/digest-openoffice-ximian-1.3.5 435 +MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502 MD5 e464f89e2de9200bc7f6c0e43bcb2b8a files/digest-openoffice-ximian-1.1.55 215 MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.1/ximian-openoffice.applications 980 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.1/ximian-openoffice.keys 6298 @@ -21,3 +23,13 @@ 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 5c07103a16bd20651d16bb467e1bdb44 files/1.1.2/gentoo-1.3.5.patch 597 +MD5 04621a43bfeb4fac8077a770a8eba7e3 files/1.1.3/gcc34.patch.bz2 33661 +MD5 a5ef896f6a59b91fa3367c92de077769 files/1.1.3/gentoo-1.3.6.patch 597 +MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications 980 +MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890 +MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298 +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 1c6d92299327504ebf124de33365405d files/1.1.3/gcc34-gnome.patch 604 +MD5 a9233bc0091b925de38145108267b949 files/1.1.3/newstlportfix.patch 3638 diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch new file mode 100644 index 000000000000..b0f22d94b24e --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gcc34-gnome.patch @@ -0,0 +1,24 @@ +--- ucb/source/ucp/gvfs/directory.hxx 2004-11-09 17:19:07.354395360 +0100 ++++ ucb/source/ucp/gvfs/directory.hxx 2004-11-09 17:24:48.330559104 +0100 +@@ -37,7 +37,7 @@ + }; + + +-struct gvfs::DataSupplier_Impl; ++struct DataSupplier_Impl; + class DataSupplier : public ucb::ResultSetDataSupplier + { + private: +--- ucb/source/ucp/gvfs/makefile.mk 2004-11-09 18:36:49.317669216 +01 +00 ++++ ucb/source/ucp/gvfs/makefile.mk 2004-11-09 18:44:41.145940416 +01 +00 +@@ -4,6 +4,8 @@ + ENABLE_EXCEPTIONS=TRUE + NO_BSYMBOLIC=TRUE + ++LINKFLAGSDEFS = # do not fail with missing symbols ++ + # Version + UCPGVFS_MAJOR=1 + diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch new file mode 100644 index 000000000000..16cf1f495870 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gcc34-nojava-fix.patch @@ -0,0 +1,18 @@ +--- sfx2/source/appl/appcfg.cxx 22 Jul 2003 11:08:41 -0000 1.47 ++++ sfx2/source/appl/appcfg.cxx 7 Nov 2004 15:46:47 -0000 +@@ -1129,6 +1129,7 @@ + // AutoSave starten oder anhalten + UpdateAutoSave_Impl(); + ++#ifdef SOLAR_JAVA + // INet Session neu aufsetzen + if ( bResetSession ) + { +@@ -1141,6 +1142,7 @@ + DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" ); + } + } ++#endif + + // geaenderte Daten speichern + aInetOptions.flush(); diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch b/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch new file mode 100644 index 000000000000..3e3360b2f422 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gcc34-nptl-fix.patch @@ -0,0 +1,14 @@ +--- ./sal/osl/unx/process.c.orig 2003-07-02 15:34:17.000000000 +0200 ++++ ./sal/osl/unx/process.c 2004-11-01 15:16:40.976815960 +0100 +@@ -1017,11 +1017,6 @@ + for (i = 0; data.m_pszEnv[i] != NULL; i++) + putenv(data.m_pszEnv[i]); + +-#if defined(LINUX) +- /* mfe: linux likes to have just one thread when the exec family is called */ +- /* this np function has this purpose ... */ +- pthread_kill_other_threads_np(); +-#endif + OSL_TRACE("ChildStatusProc : starting '%s'",data.m_pszArgs[0]); + + /* Connect std IO to pipe ends */ diff --git a/app-office/openoffice-ximian/files/1.1.3/gcc34.patch.bz2 b/app-office/openoffice-ximian/files/1.1.3/gcc34.patch.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..d2c707d9036455a485dcdf7c61ce3a1bf94380f2 GIT binary patch literal 33661 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 OrW(*AZY|Cv0scR0g(`>u literal 0 HcmV?d00001 diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch new file mode 100644 index 000000000000..8ba0713be41a --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gentoo-1.3.6.patch @@ -0,0 +1,12 @@ +--- patches/OOO_1_1_3/apply 2004-08-20 23:49:28.172509416 +0200 ++++ patches/OOO_1_1_3/apply 2004-08-20 23:49:28.174509112 +0200 +@@ -27,6 +27,9 @@ + NLD : NovellBase, NLDOnly + PLD : PLDOnly, LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon + KDE : LinuxCommon, KDEOnly ++Gentoo : LinuxCommon, GlobalDesktopFiles, NonDebianCommon ++GentooGNOME : LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonDebianCommon, NovellOnly ++GentooKDE : LinuxCommon, KDECommon, GlobalDesktopFiles, NonDebianCommon + + # Odd one, very few patches: + Ark : ArkOnly, LinuxCommon, GlobalDesktopFiles, ODKFixes, VBABits diff --git a/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff b/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff new file mode 100644 index 000000000000..164b125b1aad --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/gentoo-splash.diff @@ -0,0 +1,30 @@ +Index: offmgr/source/offapp/intro/ooo.src +=================================================================== +RCS file: /cvs/framework/offmgr/source/offapp/intro/Attic/ooo.src,v +retrieving revision 1.44.16.7 +diff -u -p -u -r1.44.16.7 ooo.src +--- offmgr/source/offapp/intro/ooo.src 19 Feb 2004 15:38:23 -0000 1.44.16.7 ++++ offmgr/source/offapp/intro/ooo.src 15 Mar 2004 23:07:54 -0000 +@@ -76,10 +76,10 @@ + #include "app.hrc" + #include "intro.hrc" + +-#ifdef BUILD_SPECIAL +-#define OOO_VENDOR "Sun Microsystems Inc." ++#if 1 ++#define OOO_VENDOR "Gentoo Foundation" + #define OOO_LICENSE "LGPL" +-#define OOO_INTRO "openintro_sun.bmp" ++#define OOO_INTRO "openintro_gentoo.bmp" + #else + //#define OOO_VENDOR "my company" + #define OOO_LICENSE "LGPL" +@@ -88,7 +88,7 @@ + + Bitmap RID_DEFAULT_ABOUT_BMP_LOGO + { +- File = "openabout.bmp" ; ++ File = "openabout_gentoo.bmp" ; + }; + + Bitmap RID_DEFAULTINTRO diff --git a/app-office/openoffice-ximian/files/1.1.3/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.3/newstlportfix.patch new file mode 100644 index 000000000000..f88927669a7b --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/newstlportfix.patch @@ -0,0 +1,100 @@ +--- stlport/makefile.mk.orig 2004-01-28 11:52:04.000000000 +0100 ++++ stlport/makefile.mk 2004-11-04 15:36:38.158427224 +0100 +@@ -72,11 +72,12 @@ + # --- Files -------------------------------------------------------- + .EXPORT : CC CXX + .IF "$(COMID)"=="gcc3" +- TARFILE_NAME=STLport-4.5 + .IF "$(OS)$(BUILD_OS_MAJOR)$(BUILD_OS_MINOR)"=="MACOSX103" ++ TARFILE_NAME=STLport-4.5 + PATCH_FILE_NAME=STLport-4.5-macxp-panther.patch + .ELSE +- PATCH_FILE_NAME=STLport-4.5.patch ++ TARFILE_NAME=STLport-4.6.2 ++ PATCH_FILE_NAME=STLport-4.6.2.patch + .ENDIF + .ELSE # "$(COMID)"=="gcc3" + .IF "$(OS)"=="MACOSX" +@@ -127,7 +128,7 @@ + .ELIF "$(OS)"=="MACOSX" + BUILD_FLAGS=-f gcc-3.0-macosx.mak + .ELSE +- BUILD_FLAGS=-f gcc-3.0.mak ++ BUILD_FLAGS=-f gcc.mak + .ENDIF + .ELSE # "$(COMID)"=="gcc3" + # MacOS X/Darwin need a special makefile +--- /dev/null 2004-10-28 17:21:08.585283768 +0200 ++++ stlport/STLport-4.6.2.patch 2004-11-04 21:27:55.986110360 +0100 +@@ -0,0 +1,71 @@ ++--- misc/build/STLport-4.6.2/src/num_get_float.cpp 2003-11-02 09:58:50.000000000 +0100 +++++ misc/build/STLport-4.6.2/src/num_get_float.cpp 2004-11-04 15:26:12.605525720 +0100 ++@@ -770,18 +770,18 @@ ++ ++ void _STLP_CALL ++ __string_to_float(const string& v, float& val) { ++- val = _Stl_string_to_double(v.data()); +++ val = _Stl_string_to_double(v.c_str()); ++ } ++ ++ void _STLP_CALL ++ __string_to_float(const string& v, double& val) { ++- val = _Stl_string_to_double(v.data()); +++ val = _Stl_string_to_double(v.c_str()); ++ } ++ ++ #ifndef _STLP_NO_LONG_DOUBLE ++ void _STLP_CALL ++ __string_to_float(const string& v, long double& val) { ++- val = _Stl_string_to_long_double(v.data()); +++ val = _Stl_string_to_long_double(v.c_str()); ++ } ++ #endif ++ ++--- misc/build/STLport-4.6.2/stlport/config/stl_gcc.h 2003-11-02 09:59:11.000000000 +0100 +++++ misc/build/STLport-4.6.2/stlport/config/stl_gcc.h 2004-11-04 15:26:12.342565696 +0100 ++@@ -7,7 +7,9 @@ ++ # define _STLP_USE_GLIBC ++ #endif ++ +++#if (__GNUC__ >= 3) && (__GNUC_MAJOR__ >= 4) ++ # define _STLP_NO_MEMBER_TEMPLATE_KEYWORD +++#endif ++ ++ # if defined(__FreeBSD__) || defined (__hpux) || defined(__amigaos__) || ( defined(__OS2__) && defined(__EMX__) ) ++ # define _STLP_NO_WCHAR_T ++@@ -263,7 +265,7 @@ ++ ++ # if (__GNUC__ >= 3) ++ ++-# if ((__GNUC_MINOR__ == 0) || (__APPLE__)) +++# if 1 || ((__GNUC_MINOR__ == 0) || (__APPLE__)) ++ # define _STLP_NATIVE_INCLUDE_PATH ../g++-v3 ++ # define _STLP_NATIVE_OLD_STREAMS_INCLUDE_PATH ../g++-v3/backward ++ # else ++--- misc/build/STLport-4.6.2/stlport/stdexcept 2003-11-02 09:59:01.000000000 +0100 +++++ misc/build/STLport-4.6.2/stlport/stdexcept 2004-11-04 15:26:12.474545632 +0100 ++@@ -60,6 +60,11 @@ ++ # endif ++ # define _STLP_EXCEPTION_BASE exception ++ +++#if (__GNUC__ >= 3) +++#undef _STLP_NOTHROW_INHERENTLY +++#define _STLP_NOTHROW_INHERENTLY throw() +++#endif +++ ++ class _STLP_CLASS_DECLSPEC __Named_exception : public _STLP_EXCEPTION_BASE { ++ public: ++ __Named_exception(const string& __str) ++--- misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:25:58.322997872 +0100 +++++ misc/build/STLport-4.6.2/src/common_rules.mak 2004-11-04 21:26:15.731351400 +0100 ++@@ -84,7 +84,8 @@ ++ $(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) +++# not needed ? +++# -ln -s $(DEBUG_DYNLIB) $(OUTDIR)/$(DEBUG_NAME).$(DYNEXT) ++ ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) ++ ++ install_unix : diff --git a/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications new file mode 100644 index 000000000000..5e56216d203a --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.applications @@ -0,0 +1,8 @@ +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.3/ximian-openoffice.keys b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys new file mode 100644 index 000000000000..a669749676f2 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/ximian-openoffice.keys @@ -0,0 +1,129 @@ +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.3/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3 new file mode 100644 index 000000000000..78a7a18dd008 --- /dev/null +++ b/app-office/openoffice-ximian/files/1.1.3/xooffice-wrapper-1.3 @@ -0,0 +1,273 @@ +#!/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 + +# Migration to new user install dir +if [ -d "$HOME/.xopenoffice/1.1.2" ] ; then + mv $HOME/.xopenoffice/1.1.2 $HOME/.xopenoffice/1.1.3 + sed -i -e s/1.1.2/1.1.3/g $HOME/.xversionrc + sed -i -e s/1.1.2/1.1.3/g $HOME/.xopenoffice/1.1.3/user/basic/*.xlc + echo "Your user install dir has been moved over to the new version" +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/digest-openoffice-ximian-1.3.6 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6 new file mode 100644 index 000000000000..843f23ef48c1 --- /dev/null +++ b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.6 @@ -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 ccc301fcf65a9991d3ec10c905173c58 ooo-build-1.3.6.tar.gz 3154954 +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.3.6.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild new file mode 100644 index 000000000000..481ae4574034 --- /dev/null +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.6.ebuild @@ -0,0 +1,578 @@ +# Copyright 1999-2004 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.3.6.ebuild,v 1.1 2004/11/14 10:32:29 suka Exp $ + +# Notes: +# +# This will take a HELL of a long time to compile, be warned. +# According to openoffice.org, it takes approximately 12 hours on a +# P3/600 with 256mb ram. And thats where building is its only task. +# +# It takes about 6 hours on my P4 1.8 with 512mb memory, and the +# build only needs about 2.1GB of disk space - Azarah. +# +# You will also need a bucketload of diskspace ... in the order of +# 4-5 gb free to store all the compiled files and installation +# directories. +# +# The information on how to build and what is required comes from: +# http://www.openoffice.org/dev_docs/source/build_linux.html +# http://tools.openoffice.org/ext_comp.html +# +# Todo: +# +# Get support going for installing a custom language pack. Also +# need to be able to install more than one language pack. + +inherit flag-o-matic eutils gcc + +IUSE="gnome kde java curl zlib nptl" + +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} +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}-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/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" + +RDEPEND="!app-office/openoffice-ximian-bin + virtual/x11 + virtual/libc + virtual/lpr + !=sys-libs/glibc-2.3.1* + >=dev-lang/perl-5.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-libs/freetype-2.1.4 + media-libs/fontconfig + media-gfx/imagemagick + media-libs/libpng + sys-devel/flex + sys-devel/bison + app-arch/zip + app-arch/unzip + dev-libs/expat + java? ( >=virtual/jdk-1.4.1 ) + ppc? ( >=sys-libs/glibc-2.2.5-r7 + >=sys-devel/gcc-3.2.1 )" + +DEPEND="${RDEPEND} + >=sys-apps/findutils-4.1.20-r1 + app-shells/tcsh + dev-util/pkgconfig + dev-util/intltool + curl? ( net-misc/curl ) + zlib? ( sys-libs/zlib ) + sys-libs/pam + !dev-util/dmake + !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 " + ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " + ewarn " merge again. " + + set_languages +} + +set_languages () { + + if [ -z "$LANGUAGE" ]; then + LANGUAGE=01 + fi + + case "$LANGUAGE" in + 01 | ENUS ) LANGNO=01; LANGNAME=ENUS; LFULLNAME="US English (default)" + ;; + 03 | PORT ) LANGNO=03; LANGNAME=PORT; LFULLNAME=Portuguese + ;; + 07 | RUSS ) LANGNO=07; LANGNAME=RUSS; LFULLNAME=Russian + ;; + 30 | GREEK ) LANGNO=30; LANGNAME=GREEK; LFULLNAME=Greek + ;; + 31 | DTCH ) LANGNO=31; LANGNAME=DTCH; LFULLNAME=Dutch + ;; + 33 | FREN ) LANGNO=33; LANGNAME=FREN; LFULLNAME=French + ;; + 34 | SPAN ) LANGNO=34; LANGNAME=SPAN; LFULLNAME=Spanish + ;; + 35 | FINN ) LANGNO=35; LANGNAME=FINN; LFULLNAME=Finnish + ;; + 37 | CAT ) LANGNO=37; LANGNAME=CAT; LFULLNAME=Catalan + ;; + 39 | ITAL ) LANGNO=39; LANGNAME=ITAL; LFULLNAME=Italian + ;; + 42 | CZECH ) LANGNO=42; LANGNAME=CZECH; LFULLNAME=Czech + ;; + 43 | SLOVAK ) LANGNO=43; LANGNAME=SLOVAK; LFULLNAME=Slovak + ;; + 45 | DAN ) LANGNO=45; LANGNAME=DAN; LFULLNAME=Danish + ;; + 46 | SWED ) LANGNO=46; LANGNAME=SWED; LFULLNAME=Swedish + ;; + 48 | POL ) LANGNO=48; LANGNAME=POL; LFULLNAME=Polish + ;; + 49 | GER ) LANGNO=49; LANGNAME=GER; LFULLNAME=German + ;; + 55 | PORTBR ) LANGNO=55; LANGNAME=PORTBR; LFULLNAME="Portuguese brazilian" + ;; + 66 | THAI ) LANGNO=66; LANGNAME=THAI; LFULLNAME=Thai + ;; + 77 | ESTONIAN ) LANGNO=77; LANGNAME=ESTONIAN; LFULLNAME=Estonian + ;; + 81 | JAPN ) LANGNO=81; LANGNAME=JAPN; LFULLNAME="Japanese" + ;; + 82 | KOREAN ) LANGNO=82; LANGNAME=KOREAN; LFULLNAME=Korean + ;; + 86 | CHINSIM ) LANGNO=86; LANGNAME=CHINSIM; LFULLNAME="Simplified Chinese (PRC)" + ;; + 88 | CHINTRAD ) LANGNO=88; LANGNAME=CHINTRAD; LFULLNAME="Traditional Chinese (taiwan)" + ;; + 90 | TURK ) LANGNO=90; LANGNAME=TURK; LFULLNAME=Turkish + ;; + 91 | HINDI ) LANGNO=91; LANGNAME=HINDI; LFULLNAME=Hindi + ;; + 96 | ARAB ) LANGNO=96; LANGNAME=ARAB; LFULLNAME=Arabic + ;; + 97 | HEBREW ) LANGNO=97; LANGNAME=HEBREW; LFULLNAME=Hebrew + ;; + * ) + eerror "Unknown LANGUAGE setting!" + eerror + eerror "Known LANGUAGE settings are:" + eerror " ENUS | PORT | RUSS | GREEK | DTCH | FREN | SPAN | FINN | CAT | ITAL |" + eerror " CZECH | SLOVAK | DAN | SWED | POL | GER | PORTBR | THAI | ESTONIAN |" + eerror " JAPN | KOREAN | CHINSIM | CHINTRAD | TURK | HINDI | ARAB | HEBREW" + die + ;; + esac +} + +oo_setup() { + + unset LANGUAGE + unset LANG + unset LC_ALL + + # We want gcc3 if possible!!!! + export WANT_GCC_3="yes" + + export NEW_GCC="0" + + if [ -x /usr/sbin/gcc-config ] + then + # Do we have a gcc that use the new layout and gcc-config ? + if /usr/sbin/gcc-config --get-current-profile &> /dev/null + then + export NEW_GCC="1" + export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)" + + # Just recheck gcc version ... + if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" && [ "$(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 + then + export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}" + export GCC_PROFILE="${CHOST}-3.2.1" + else + eerror "This build needs gcc-3.2, gcc-3.3 or gcc-3.4!" + eerror + eerror "Use gcc-config to change your gcc profile:" + eerror + eerror " # gcc-config $CHOST-3.2.1" + eerror + eerror "or whatever gcc version is relevant." + die + fi + fi + fi + fi +} + +src_unpack() { + + oo_setup + + cd ${WORKDIR} + unpack ${A} + + #Beginnings of our own patchset + cd ${PATCHDIR} + epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.patch + + #Still needed: The STLport patch + cd ${S} + cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die + epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch + + #Add our own splash screen + epatch ${FILESDIR}/${OO_VER}/gentoo-splash.diff + + #Detect which look and patchset we are using + export DISTRO="Gentoo" + export MYCONF="" + export ICONDIR=${WORKDIR}/ooo-icons-${ICON_VER} + + if use gnome; then + export DISTRO="GentooGNOME" + export MYCONF="--enable-gtk" + fi + + 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 + + #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" + + # GCC 3.4.x fixes + if [ "$(gcc-version)" = "3.4" ] + then + epatch ${FILESDIR}/${OO_VER}/gcc34.patch.bz2 + 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 + + einfo "Installing / Scaling Icons" + ${PATCHDIR}/bin/scale-icons ${S} || die + cp -af ${ICONDIR}/* ${S} || die + + einfo "Copying splash screens in place" + cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die + + 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 + + einfo "Munging font mappings ..." + ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die + echo "done munging fonts." +} + +get_EnvSet() { + + # Determine what Env file we should be using (Az) + export LinuxEnvSet="LinuxIntelEnv.Set.sh" + use sparc && export LinuxEnvSet="LinuxSparcEnv.Set.sh" + use ppc && export LinuxEnvSet="LinuxPPCEnv.Set.sh" + use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set.sh" + + # Get build specific stuff (Az) + export SOLVER="$(awk '/^UPD=/ {gsub(/\"/, ""); gsub(/UPD=/, ""); print $0}' ${LinuxEnvSet})" + export SOLPATH="$(awk '/^INPATH=/ {gsub(/\"/, ""); gsub(/INPATH=/, ""); print $0}' ${LinuxEnvSet})" +} + +src_compile() { + + addpredict /bin + addpredict /root/.gconfd + local buildcmd="" + + # dmake security patch + 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 || die + autoconf || die + MYCONF="${MYCONF} --enable-libart \ + --enable-libsn \ + --enable-crashdump=no \ + --with-lang=ENUS,${LANGNAME} \ + --without-fonts \ + --disable-rpath \ + --enable-fontconfig \ + --with-system-freetype \ + --with-system-xrender \ + --disable-mozilla" + + ./configure ${MYCONF} || die + + cd ${S} + get_EnvSet + + # Build as minimal as possible + export BUILD_MINIMAL="${LANGNO}" + + #Get info for parallel build + export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"` + + if [ "${JOBS}" -gt 10 ] + then + 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 + export CCCOMP="$(gcc-getCC)" + export CXXCOMP="$(gcc-getCXX)" + fi + + einfo "Bootstrapping OpenOffice.org..." + # Get things ready for bootstrap (Az) + chmod 0755 ${S}/solenv/bin/*.pl + # Bootstrap ... + ./bootstrap || die + + einfo "Building OpenOffice.org..." + 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!" +} + +src_install() { + + # Sandbox issues; bug #11838 + addpredict "/user" + addpredict "/share" + addpredict "/dev/dri" + addpredict "/usr/bin/soffice" + addpredict "/pspfontcache" + addpredict "/opt/OpenOffice.org/foo.tmp" + addpredict "/opt/OpenOffice.org/delme" + + # The install part should now be relatively OK compared to + # what it was. Basically we use autoresponse files to install + # unattended. Afterwards we + # just cleanout ${D} from the registry, etc. This way we + # do not need pre-generated registry, and also fixes some weird + # bugs related to the old way we did things. + # + # (9 Sep 2002) + + # Autoresponse file for main installation + cat > ${T}/rsfile-global <<-"END_RS" + [ENVIRONMENT] + INSTALLATIONMODE=INSTALL_NETWORK + INSTALLATIONTYPE=STANDARD + DESTINATIONPATH= + OUTERPATH= + LOGFILE= + LANGUAGELIST= + + [JAVA] + JavaSupport=preinstalled_or_none + END_RS + + # Autoresponse file for user installation + cat > ${T}/rsfile-local <<-"END_RS" + [ENVIRONMENT] + INSTALLATIONMODE=INSTALL_WORKSTATION + INSTALLATIONTYPE=WORKSTATION + DESTINATIONPATH=/.xopenoffice/ + + [JAVA] + JavaSupport=none + END_RS + + # Fixing install location in response file + sed -e "s||${D}${INSTDIR}|" \ + ${T}/rsfile-global > ${T}/autoresponse || die + + einfo "Installing Ximian-OpenOffice.org into build root..." + dodir ${INSTDIR} + cd ${S}/instsetoo/${SOLPATH}/${LANGNO}/normal + ./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 || die + + echo + einfo "Removing build root from registry..." + # Remove totally useless stuff. + 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" {} || : + + einfo "Fixing permissions..." + # Fix permissions + find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \; + chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl + + # Fix symlinks + dosym program/setup ${INSTDIR}/setup + + # Install user autoresponse file + insinto /etc/ximian-openoffice + sed -e "s||${OO_VER}|g" ${T}/rsfile-local > ${T}/autoresponse-${OO_VER}.conf + doins ${T}/autoresponse-${OO_VER}.conf + + # Install wrapper script + exeinto /usr/bin + sed -e "s||${OO_VER}|g" \ + ${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice + doexe ${T}/xooffice + + # Component symlinks + for app in calc draw impress html math writer setup; do + dosym xooffice /usr/bin/xoo${app} + done + + # 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 mime info (need \"gnome\" or \"kde\" in USE)..." + if use gnome + then + insinto /usr/share/application-registry + doins ${FILESDIR}/${OO_VER}/ximian-openoffice.applications + insinto /usr/share/mime-info + doins ${FILESDIR}/${OO_VER}/ximian-openoffice.keys + fi + + if use kde + then + insinto /usr/share/mimelnk/application + doins ${S}/sysui/${SOLPATH}/misc/kde/share/mimelnk/application/* + fi + + # Install corrected Symbol Font + insinto /usr/share/fonts/TTF/ + doins ${PATCHDIR}/fonts/*.ttf + + # Remove unneeded stuff + 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 + perl -pi -e "/^File gid_File_Extra_$entry/ .. /^End/ and (\ + s|^\tSize\s+\= .*|\tSize\t\t = 0;\r| or \ + s|^\tArchiveFiles\s+\= .*|\tArchiveFiles\t = 0;\r| or \ + s|^\tArchiveSize\s+\= .*|\tArchiveSize\t = 0;\r| or \ + s|^\tContains\s+\= .*|\tContains\t = ();\r| or \ + s|\t\t\t\t\t\".*|\r|g)" \ + ${D}${INSTDIR}/program/instdb.ins + done + + # Make sure these do not get nuked. + keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb} ${INSTDIR}/user/psprint/{driver,fontmetric} ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template} +} + +pkg_postinst() { + + einfo " To start Ximian-OpenOffice.org, run:" + einfo + einfo " $ xooffice" + einfo + einfo " Also, for individual components, you can use any of:" + einfo + einfo " xoocalc, xoodraw, xooimpress, xoomath, xooweb or xoowriter" +} -- 2.26.2