diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2006-01-28 19:25:57 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2006-01-28 19:25:57 +0000 |
| commit | e9f41c8a6226b48bf6a323870c2177183a76285d (patch) | |
| tree | 00bcda7befc8ddf6fef845dcbaaa472baa8453c6 /app-office | |
| parent | Stable on ppc64; bug #120490 (diff) | |
| download | historical-e9f41c8a6226b48bf6a323870c2177183a76285d.tar.gz historical-e9f41c8a6226b48bf6a323870c2177183a76285d.tar.bz2 historical-e9f41c8a6226b48bf6a323870c2177183a76285d.zip | |
remove openoffice-ximian from the tree, which has been superseded by openoffice-2.0
Diffstat (limited to 'app-office')
37 files changed, 12 insertions, 3275 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog deleted file mode 100644 index 66070bc5dc93..000000000000 --- a/app-office/openoffice-ximian/ChangeLog +++ /dev/null @@ -1,881 +0,0 @@ -# ChangeLog for app-office/openoffice-ximian -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.149 2006/01/21 19:08:28 josejx Exp $ - - 21 Jan 2006; Joseph Jezak <josejx@gentoo.org> - openoffice-ximian-1.9.199.ebuild: - Marked ppc stable. - - 21 Jan 2006; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.16.ebuild: - Remove blocker on openoffice-ximian-bin as this is dead now - - 21 Jan 2006; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.16.ebuild: - Modular X dependencies - - 17 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.9.199.ebuild: - Stable on sparc wrt OO 2.0.0 going stable - - 29 Nov 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.9.199.ebuild: - Mark the dummy ebuild stable on x86 to get people moving over to - openoffice-2.0.0 - - 20 Nov 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/build-new-xslt.diff, openoffice-ximian-1.3.9-r1.ebuild: - Also provide the build fix for the new libxslt to 1.3.9-r1 - - 07 Nov 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.9.199.ebuild: - Marked ~sparc to get users over to openoffice-2.0 - -*openoffice-ximian-1.9.199 (20 Oct 2005) - - 20 Oct 2005; Andreas Proschofsky <suka@gentoo.org> - +openoffice-ximian-1.9.199.ebuild: - Add dummy ebuild to get people moving over to app-office/openoffice - - 24 Sep 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.16.ebuild: - Getting rid of the old mimetype stuff which causes broken behaviour for kde, - see bug #92767 - - 24 Sep 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.5/build-new-xslt.diff, openoffice-ximian-1.3.16.ebuild: - Fix building without java and libxslt >=1.1.5, closes bug #106174 - - 17 Sep 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.5/gentoo-1.3.16.patch: - Fix our patch to actually work... - -*openoffice-ximian-1.3.16 (17 Sep 2005) - - 17 Sep 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.5/javafix.patch, +files/1.1.5/gentoo-1.3.16.patch, - -files/1.1.4/regcompfix.patch, +files/1.1.5/STLport-vector.patch, - +files/1.1.5/gcc-instlib.patch, +files/1.1.5/gentoo-splash.diff, - +files/1.1.5/getcompver.awk.patch, +files/1.1.5/hardened-link.patch, - +files/1.1.5/newstlportfix.patch, +files/1.1.5/nptl.patch, - +files/1.1.5/pthreadlink-fix.patch, +files/1.1.5/pyunolink-fix.patch, - +files/1.1.5/xooffice-wrapper-1.3, +openoffice-ximian-1.3.16.ebuild: - New patch revision, first to be based on OpenOffice.org 1.1.5. Other than - that mostly bug fixes, see - - http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.12&only_with_tag=ooo- - build-1-3&view=markup - - for more information - - 23 Aug 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.14.ebuild: - Correct cp -a to cp -pPR for bug #103487 - - 16 Jul 2005; Joseph Jezak <josejx@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild: - Marked ppc stable for bug #98980. - - 29 Jun 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/vcl-unx-gtk-frame-m110.diff, openoffice-ximian-1.3.14.ebuild: - Fix for non-working dead keys, this closes bug #88868 - - 24 Jun 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/vcl-gtk-mainloop-m79.diff, openoffice-ximian-1.3.14.ebuild: - Fix for broken oslCondition reset / signalling in vcl / gtk. This silently - lifts the version to 1.3.15, just not doing a revision bump for a sole - patch. - -*openoffice-ximian-1.3.14 (17 Jun 2005) - - 17 Jun 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/gentoo-1.3.14.patch, +openoffice-ximian-1.3.14.ebuild: - New patch revision, no new features, just some more bug fixes - - 31 May 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/sd-slide-naming.diff, openoffice-ximian-1.3.11.ebuild: - Another bug fix for slide naming, in sync with upstream ooo-build 1.3.13 - - 19 May 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/fpicker-kde-filter-name.diff, - openoffice-ximian-1.3.11.ebuild: - Adding another kde-file-picker fix. No revision bump as this is a minor - fix, and would mean an unnecessary recompile for a lot of people. With - this patch this actually is no the same as the upstream ooo-build-1.3.12 - -*openoffice-ximian-1.3.11 (09 May 2005) - - 09 May 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/gentoo-1.3.11.patch, +openoffice-ximian-1.3.11.ebuild: - New patch release, fixes nasty crasher in calc - - 03 May 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.6-r1.ebuild, openoffice-ximian-1.3.9-r1.ebuild, - openoffice-ximian-1.3.10.ebuild: - LIBC set in the environment breaks the build, so we manually unset it now, - see bug #91179 - -*openoffice-ximian-1.3.10 (23 Apr 2005) - - 23 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - +openoffice-ximian-1.3.10.ebuild: - New patch release, for details see: - - http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.6&only_with_tag=ooo-b - uild-1-3&view=markup - - 21 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild: - Add missing cups dependency - - 15 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild: - Stable on sparc wrt #88863 - - 13 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9-r1.ebuild: - Marking stable on x86 for bug #88863 - - 12 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> - openoffice-ximian-1.3.6-r1.ebuild: - Stable on ppc. - -*openoffice-ximian-1.3.9-r1 (12 Apr 2005) -*openoffice-ximian-1.3.7-r1 (12 Apr 2005) -*openoffice-ximian-1.3.6-r1 (12 Apr 2005) - - 12 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - +openoffice-ximian-1.3.6-r1.ebuild, +openoffice-ximian-1.3.7-r1.ebuild, - +openoffice-ximian-1.3.9-r1.ebuild: - Multiple revision bumps for security fix, see bug #88863 - - 11 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9.ebuild: - Add ooo-build version info to the About-Dialog - - 10 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9.ebuild: - Remove system-python support for now, it tends to break the build, see bug - #82143 - - 09 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9.ebuild: - Add another addpredict, closes bug #83406 - - 09 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9.ebuild: - Pushing 1.3.9 to stable on x86 as this fixes a bunch of crasher bugs - - 09 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.9.ebuild: - Add note about localized helpcontent, closes bug #87199 - -*openoffice-ximian-1.3.9 (05 Apr 2005) - - 05 Apr 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/gentoo-1.3.9.patch, +openoffice-ximian-1.3.9.ebuild: - New release of the patchset, which contains lots of fixes, for more details - see here: - - http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.5&only_with_tag=ooo-b - uild-1-3&view=markup - - 31 Mar 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/gcc34-nptl-fix.patch: - Re-adding a patch which is necessary for oox-1.3.6 - - 28 Mar 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/getcompver.awk.patch, openoffice-ximian-1.3.6.ebuild, - openoffice-ximian-1.3.7.ebuild: - Fix bug #82385 also in older versions - - 06 Mar 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.4/gentoo-1.3.8.patch, +files/1.1.4/getcompver.awk.patch, - openoffice-ximian-1.3.8.ebuild: - Fix some build problem related to gcc-naming, closes bug #82385, also back - out evolution-data-server-support for the time being - - 04 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - Stable on sparc and went into hiding - - 17 Feb 2005; Jason Wever <weeve@gentoo.org> - openoffice-ximian-1.3.8.ebuild: - Added ~sparc keyword and ran like hell. - - 04 Feb 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.4/gentoo-1.3.8.patch, - +files/1.1.4/gtk-printer-update-on-focus-change.diff, - openoffice-ximian-1.3.8.ebuild: - Bunch of fixes / news: - - *) Fix for cups printing problems, taken from upstream, closes bug #78289. - If this still doesn't work for you after rebuilding, please delete your - user-install (~/.xopenoffice and ~/.xversionrc), should work afterwards - - *) If USE="gnome" is set, support for Evolution data server is now also - built, this adds another dependency - - *) We are now using system-python and -nas if present, especially the first - one should reduce build time quite a bit - - *) Dependency fixes - - 03 Feb 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - GCC 3.4 patches also work fine with GCC 3.3.x so they are applied by default - now. This also fixes some further problems on hardened gccs, closes bug - #79815 - - 31 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild, openoffice-ximian-1.3.8.ebuild: - Add another addpredict to work around Sandbox problems, closes bug #79084 - - 29 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.8.ebuild: - *) Fix kde path detection, closes bug #79827. - *) Provide virtual/ooo - *) further ebuild cleanups - - 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.4/gentoo-1.3.8.patch, openoffice-ximian-1.3.8.ebuild: - The GCC 3.4 patches also work with gcc 3.3.x, so we don't have to check for - gcc-version before applying them. That's fine cause now we can let the - ooo-patchset do the work, which cleans up the ebuild a bit. - - 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.8.ebuild: - Use CXXFLAGS instead of CFLAGS, closes bug #79828 - - 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.4/gentoo-1.3.8.patch: - Fix the -gnome -kde bug, again. Closes bug #79831 - -*openoffice-ximian-1.3.8 (28 Jan 2005) - - 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.4/STLport-vector.patch, +files/1.1.4/config-db-checkfix.patch, - +files/1.1.4/gcc-instlib.patch, +files/1.1.4/gentoo-1.3.8.patch, - +files/1.1.4/gentoo-splash.diff, +files/1.1.4/hardened-link.patch, - +files/1.1.4/javafix.patch, +files/1.1.4/newstlportfix.patch, - +files/1.1.4/nptl.patch, +files/1.1.4/pthreadlink-fix.patch, - +files/1.1.4/pyunolink-fix.patch, +files/1.1.4/regcompfix.patch, - +files/1.1.4/xooffice-wrapper-1.3, +openoffice-ximian-1.3.8.ebuild: - New patch version release, the first one based on OOo 1.1.4. Also includes a - patch for a new build problem introduced in 1.3.8. A list of other changes - and improvements can be found here: - - http://cvs.gnome.org/viewcvs/ooo-build/NEWS?rev=1.49.4.4&only_with_tag=ooo-b - uild-1-3&view=auto - - 24 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.3/xooffice-wrapper-1.3: - Add check for mounted /proc to wrapper, OOo will fail without it - - 24 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.3/xooffice-wrapper-1.3: - Remove unused UPDATEFLAG from wrapper - - 23 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.3/xooffice-wrapper-1.3: - clean up the wrapper file - - 22 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - The ebuild now uses the LINGUAS environment variable to determine for which - language to build, the first one in your LINGUAS-settings that is supported - is used for this. Please note, that the old LANGUAGE=ENUS|PORT... way does - NOT work anymore. While doing this added some more languages to the - supported list, see the ebuild for more infos. Also added some dependencies - for japanese and chinese builds. - - This closes a number of bugs: #40896, #44209. #51331, #70302, #71216 and - #77128 - - 21 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.3/gentoo-1.3.7.patch: - Remove on patch from the buildset, which creates problems in oocalc, closes - bug #74595 - - 20 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - Marking stable on x86 - - 18 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - -files/1.1.3/gcc34-nptl-fix.patch, +files/1.1.3/nptl.patch, - +files/1.1.3/pyunolink-fix.patch, openoffice-ximian-1.3.7.ebuild: - Fixes for nptl and pyuno build breakage, should close quite some bugs, if - this works out - - 17 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/gcc-instlib.patch, openoffice-ximian-1.3.7.ebuild: - Mostly ebuild cleanup and sync with vanilla OOo, remove some useless stuff - and add another patch for gccinstlib - - 17 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - Add support for localized helpcontent. For it to work you will have to - download the correct helpcontent file from one of the OOo-mirrors (it's in - the contrib/helpcontent/ directory, for instance: - http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in - you distfiles-directory. Closes bug #30668 - - 17 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - As everyone is now on Gnome 2.8: remove old mime stuff, add fdo-mime refresh - - 16 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/hardened-link.patch, +files/1.1.3/pthreadlink-fix.patch, - openoffice-ximian-1.3.7.ebuild: - Try to fix build problems with hardened-gccs, patches provided by - Kevin F. Quinn <co@kevquinn.com> in bug #52642 - - 16 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - Fix einfo message, symlink is called xoohtml not xooweb, closes bug #74594 - - 14 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.3.7.ebuild: - Keyworded ~sparc - - 14 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/javafix.patch, openoffice-ximian-1.3.7.ebuild: - Another fix for java build problems, closes bug #77866 - - 14 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - files/1.1.3/gentoo-1.3.7.patch: - Fix for building with -gnome and -kde, closes bug#77911 - -*openoffice-ximian-1.3.7 (13 Jan 2005) - - 13 Jan 2005; Andreas Proschofsky <suka@gentoo.org> - +files/1.1.3/gcc34-sal-link-to-libsupc++.diff, - +files/1.1.3/gcc34_2.patch.bz2, +files/1.1.3/gentoo-1.3.7.patch, - +files/1.1.3/nojvmfwk-fix.patch, -openoffice-ximian-1.1.55.ebuild, - +openoffice-ximian-1.3.7.ebuild: - New release, closes bug #73171. This mainly fixes some bugs, most - importantly the crasher bug when deleting a line in Calc, closes bug #71600 - - For more infos see the entry for 1.3.7 under: - - http://go-oo.org/ooo-build/NEWS - - 08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> - openoffice-ximian-1.3.6.ebuild: - Stable on ppc. - - 08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> - +files/1.1.3/STLport-vector.patch, openoffice-ximian-1.3.6.ebuild: - Added patch from bug 65883. - - 18 Nov 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.3.6.ebuild: - Added to ~ppc. - - 15 Nov 2004; Andreas Proschofsky <suka@gentoo.org> - openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.3.5-r1.ebuild, - openoffice-ximian-1.3.6.ebuild: - Use toolchain-funcs.eclass instead of gcc.eclass - -*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: - Fix ewarn messages, closes bug #70852 - - 23 Oct 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.3.5-r1.ebuild, openoffice-ximian-1.3.5.ebuild: - Filter another CFLAG which breaks the build - - 18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.3.5-r1.ebuild: - Stable on sparc wrt #63556 - - 15 Oct 2004; suka@gentoo.org openoffice-ximian-1.3.5-r1.ebuild: - Mark stable on x86 for bug #63556, also conditionalize curl dependency - -*openoffice-ximian-1.3.5-r1 (12 Oct 2004) - - 12 Oct 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.5-r1.patch, - +openoffice-ximian-1.3.5-r1.ebuild: - New patch release (1.3.5.5) mainly bugfixes, a lot of them for the kde - integration, hope to push this into stable soon - - 29 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.1.61.ebuild: - Stable on sparc - -*openoffice-ximian-1.3.5 (19 Sep 2004) - - 19 Sep 2004; suka@gentoo.org -files/1.1.2/gentoo-1.3.3-r1.patch, - -files/1.1.2/gentoo-1.3.3.patch, +files/1.1.2/gentoo-1.3.5.patch, - -openoffice-ximian-1.3.3-r1.ebuild, -openoffice-ximian-1.3.3.ebuild, - +openoffice-ximian-1.3.5.ebuild: - new patch release, mainly bug fixes. - -*openoffice-ximian-1.3.4 (09 Sep 2004) - - 09 Sep 2004; suka@gentoo.org -files/1.1.2/gentoo-1.3.2.patch, - +files/1.1.2/gentoo-1.3.4.patch, -openoffice-ximian-1.3.2.ebuild, - +openoffice-ximian-1.3.4.ebuild: - New patch version, this now also integrates all the changes from 1.3.3-r1 so - pleas be sure to read the old Changelog entry about ooo-kde being deprecated - -*openoffice-ximian-1.3.3-r1 (06 Sep 2004) - - 06 Sep 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.3-r1.patch, - +openoffice-ximian-1.3.3-r1.ebuild: - New revision, hard masked for testing as it has some significant changes. - - 1) Java is back: If you have java installed, java functionality will be - available in OOo. If you don't have java installed the build will work too- - - 2) Better optimization: The build should now be more optimized, your CFLAGS - are used in more places - - 3) Removal of ooo-kde local use flag: It's simply not necessary anymore, gnome - and kde functionality is enabled through the corresponding use flags. If you - have provide both, both native styles will be built, according to your desktop - environment, the right one will be shown, you can force the other look by - using OOO_FORCE_DESKTOP=KDE|gnome xoowriter. This funcitionality has only one - drawback: If you want to have KDE icons, be sure to have -gnome +kde in your - USE-flags, icons are not yet parallel installable. - - and a lot of restructuring in the ebuild - -*openoffice-ximian-1.3.3 (04 Sep 2004) - - 04 Sep 2004; suka@gentoo.org -files/1.1.2/fpickerkdefix.diff, - -files/1.1.2/gentoo-1.3.0.patch, +files/1.1.2/gentoo-1.3.3.patch, - -openoffice-ximian-1.3.0.ebuild, +openoffice-ximian-1.3.3.ebuild: - New version of the ooo-build patchset, fixing a few problems, most notably bug - #62611 (does not print). - - Also remove the quite broken 1.3.0 version - - 04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.1.61.ebuild: - Forgot little sparc fix - - 04 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.1.61.ebuild: - Keyworded ~sparc - - 02 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> - openoffice-ximian-1.3.2.ebuild: - Keyworded ~sparc - but don't dream on stable since we're affected by bug #62611 - - 29 Aug 2004; suka@gentoo.org openoffice-ximian-1.3.2.ebuild: - backing out parallel build stuff, seems to break the build for some :( - - 28 Aug 2004; suka@gentoo.org openoffice-ximian-1.3.2.ebuild: - At last enable parallel build! Should work fine now, although number of - parallel processes is limited to 10, otherwise dmake will fail - -*openoffice-ximian-1.3.2 (28 Aug 2004) - - 28 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.2.patch, - +openoffice-ximian-1.3.2.ebuild: - New patch version, this solves a lot of the troubles people seemed to have - with 1.3.0, for instance the kde file selector crash should be gone (closes - bug #61588), also OOO_FORCE_DESKTOP=KDE|Gnome should be working fine now, - which is especially handy for non-kde/gnome users. On the feature side, this - adds suport for Wordperfect documents. - - For a full list of changes, see like always: - - http://ooo.ximian.com/ooo-build/NEWS - - 23 Aug 2004; suka@gentoo.org files/1.1.2/gentoo-1.3.0.patch, - openoffice-ximian-1.3.0.ebuild: - Fixed a build problem with ooo-kde (introduced by myself in the last commit :( - ) . In return KDE users get some added bonus features (which gnome users - already had), like startup notfication, Lotus Document support and the removal - of the annoying double install of menu entries, the last one should also solve - bug #53752 - - 22 Aug 2004; suka@gentoo.org files/1.1.2/gentoo-1.3.0.patch, - +files/1.1.2/gentoo-splash.diff, openoffice-ximian-1.3.0.ebuild: - Do some branding action, or as I'd like to call it: We've now got our own - shiny splash screen! This has been done by myself, so blame me and not - seemant if you don't like it. (although he requested it!) ;-) - - 21 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.61.ebuild, openoffice-ximian-1.3.0.ebuild: - Add pam to dependencies, closes bug #57195 - - 21 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.61.ebuild: - push 1.1.61 to stable on x86 - - 21 Aug 2004; suka@gentoo.org +files/1.1.2/fpickerkdefix.diff, - openoffice-ximian-1.3.0.ebuild: - Fixes for the KDE stuff, so moving out of package.mask :-) - - 21 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.3.0.patch, - openoffice-ximian-1.3.0.ebuild: - remove Evolution 2 stuff, as this requires evolution-data-server which is - still in package mask, closes bug #61054 - - 20 Aug 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.61.ebuild, openoffice-ximian-1.3.0.ebuild: - fix some sandbox issues and fix gcc-statement (this package only works with - gcc 3.2 or gcc 3.3 atm) - -*openoffice-ximian-1.3.0 (20 Aug 2004) - - 20 Aug 2004; suka@gentoo.org -files/1.1.2/gentoo-1.1.60.patch, - -files/1.1.2/nativefix.diff, -files/1.1.2/print-fontconfig.diff, - -openoffice-ximian-1.1.60.ebuild, +openoffice-ximian-1.3.0.ebuild: - Great new release of the Ximian patchset, which brings lots of goodies: - Native fileselectors for GNOME and KDE are just the highlight. Take a look at - - http://ooo.ximian.com/NEWS - - for more infos. - - Unfortunately the ooo-kde-build is broken for the moment, so this version is - in package.mask for now, if you don't use that use-flag you should happily be - able to unmask it. - -*openoffice-ximian-1.1.61 (01 Aug 2004) - - 01 Aug 2004; suka@gentoo.org +files/1.1.2/gentoo-1.1.61.patch, - +files/1.1.2/rm-nonexistant.diff, +openoffice-ximian-1.1.61.ebuild: - A - late - update to 1.1.61, next version seems to take some time so providing - this in the mean time - - 01 Aug 2004; suka@gentoo.org +files/1.1.2/curlfix.patch, - openoffice-ximian-1.1.60.ebuild: - Fix compile with curl-7.12.0, this closes bug #58983 - - 17 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild: - fix stupid sandbox troubles - - 15 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild: - Do not install unneeded old gnome and kde menu items in the user dir, thanks - to brad[] for pointing out - - 13 Jul 2004; suka@gentoo.org +files/1.1.2/nativefix.diff, - -files/1.1.2/nativewidgets-vcl.diff, openoffice-ximian-1.1.60.ebuild: - waste less space on the mirrors - - 02 Jul 2004; suka@gentoo.org openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.59.ebuild, openoffice-ximian-1.1.60.ebuild: - filter another use flag creating runtime problems: -fstack-protector - -*openoffice-ximian-1.1.60 (30 Jun 2004) - - 30 Jun 2004; suka@gentoo.org +files/1.1.2/fixscale.patch, - +files/1.1.2/gentoo-1.1.60.patch, +files/1.1.2/nativewidgets-vcl.diff, - +files/1.1.2/newstlportfix.patch, +files/1.1.2/print-fontconfig.diff, - +files/1.1.2/ximian-openoffice.applications, - +files/1.1.2/ximian-openoffice.keys, +files/1.1.2/xooffice-wrapper-1.3, - +openoffice-ximian-1.1.60.ebuild: - New patch version. The first one based on OOo 1.1.2 ! Had to do some - workarounds as two patches are faulty, but everything should be fine now - - 29 Jun 2004; Aron Griffis <agriffis@gentoo.org> - openoffice-ximian-1.1.51-r1.ebuild, openoffice-ximian-1.1.55.ebuild, - openoffice-ximian-1.1.57.ebuild, openoffice-ximian-1.1.59.ebuild: - kill sparc64 use flag - - 08 Jun 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.59.ebuild: - Added to ~ppc. - - 07 Jun 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.57.ebuild: - Added to ~ppc. - -*openoffice-ximian-1.1.59 (06 Jun 2004) - - 06 Jun 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.59.patch, - openoffice-ximian-1.1.55.ebuild, +openoffice-ximian-1.1.59.ebuild: - Mark 1.1.55 stable for x86. Also new version for unstable, mainly bugfixes - - 01 Jun 2004; Aron Griffis <agriffis@gentoo.org> - openoffice-ximian-1.1.51-r1.ebuild, openoffice-ximian-1.1.53.ebuild, - openoffice-ximian-1.1.54.ebuild, openoffice-ximian-1.1.55-r1.ebuild, - openoffice-ximian-1.1.55.ebuild, openoffice-ximian-1.1.57.ebuild: - Fix use invocation - -*openoffice-ximian-1.1.57 (28 May 2004) - - 28 May 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.57.patch, - +openoffice-ximian-1.1.57.ebuild: - Version bump, this is also the first unmasked version with the native widget - stuff - - 19 May 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.55.ebuild: - Readded to ~ppc (-r1 is package-masked). - - 19 May 2004; David Holm <dholm@gentoo.org> - openoffice-ximian-1.1.55-r1.ebuild: - Readded to ~ppc. - - 12 May 2004; suka@gentoo.org +files/1.1.1/gentoo-1.1.55.patch, - openoffice-ximian-1.1.55-r1.ebuild: - Enable Native Widget stuff also for the gtk build, also some further cleanups - -*openoffice-ximian-1.1.55-r1 (07 May 2004) - - 07 May 2004; suka@gentoo.org -files/1.1.1/distro_kde.patch, - openoffice-ximian-1.1.53.ebuild, openoffice-ximian-1.1.54.ebuild, - +openoffice-ximian-1.1.55-r1.ebuild, openoffice-ximian-1.1.55.ebuild: - Back out KDE integration stuff of 1.1.54 and 1.1.55, if you want to try it - out, use 1.1.55-r1 which is hard-masked, as there are still some known - problems - -*openoffice-ximian-1.1.55 (06 May 2004) - - 06 May 2004; suka@gentoo.org -files/1.1.1/neon.patch, - +openoffice-ximian-1.1.55.ebuild: - New version of the Ximian patchset, see: - - http://ooo.ximian.com/NEWS - - for a list of changes - - 05 May 2004; suka@gentoo.org : - First shot at KDE integration work. If you want to use the NWF and icon stuff - for kde instead of the default Ximian look put ooo-kde in your use flags or - emerge the ebuild with USE="ooo-kde" emerge openoffice-ximian - - This is based mainly on the work of sayap@sayap.net in bug #49042. Thanks! - - 05 May 2004; suka@gentoo.org openoffice-ximian-1.1.51-r1.ebuild, - openoffice-ximian-1.1.53.ebuild, openoffice-ximian-1.1.54.ebuild: - Filter another evil CFLAG - -*openoffice-ximian-1.1.54 (30 Apr 2004) - - 30 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.54.ebuild: - New version of the Ximian patchset, see: - - http://ooo.ximian.com/openoffice/NEWS - - for further details - -*openoffice-ximian-1.1.51-r1 (25 Apr 2004) - - 25 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.51-r1.ebuild, - -openoffice-ximian-1.1.51.ebuild, -openoffice-ximian-1.1.52.ebuild: - revision bump for security fix - - 24 Apr 2004; suka@gentoo.org +files/1.1.0/neon.patch, - +files/1.1.1/neon.patch, openoffice-ximian-1.1.51.ebuild, - openoffice-ximian-1.1.52.ebuild: - Security fix, see: - http://secunia.com/advisories/11364/ - - 20 Apr 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.53.ebuild: - Added to ~ppc. - -*openoffice-ximian-1.1.53 (17 Apr 2004) - - 17 Apr 2004; suka@gentoo.org +openoffice-ximian-1.1.53.ebuild: - New patch-version, also some small bug fixes - - 11 Apr 2004; suka@gentoo.org openoffice-ximian-1.1.52.ebuild, - files/1.1.1/build.patch: - Add temporary patch provided by scout@scoutheeten.com on bug #46945 to work - around build breakage caused by recent sandbox problems in portage. - Also use newer source tarball. - - 04 Apr 2004; Lars Weiler <pylon@gentoo.org> openoffice-ximian-1.1.51.ebuild, - openoffice-ximian-1.1.52.ebuild: - 1.1.51 stable on ppc, 1.1.52 masked testing on ppc - -*openoffice-ximian-1.1.52 (01 Apr 2004) - - 01 Apr 2004; suka@gentoo.org openoffice-ximian-1.1.52.ebuild, - files/1.1.1/newstlportfix.patch, files/1.1.1/nptl.patch, - files/1.1.1/openoffice-1.1.0-linux-2.6-fix.patch, - files/1.1.1/openoffice-1.1.0-sparc64-fix.patch, - files/1.1.1/ximian-openoffice.applications, - files/1.1.1/ximian-openoffice.keys, files/1.1.1/xooffice-wrapper-1.3: - New version of Ximian patchset, this is the first version that is based on - OpenOffice.org 1.1.1! Please be aware that you will have to redo your user - settings as some user install things have changed and so we can't migrate your - old settigns to the new version - - 07 Mar 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.51.ebuild: - Added to ~ppc. - -*openoffice-ximian-1.1.51 (06 Mar 2004) - - 06 Mar 2004; <suka@gentoo.org> openoffice-ximian-1.1.51.ebuild: - New version of the Ximian patchset, provides some font rendering speedups, - lots of bug fixes and other goodies - - 22 Feb 2004; <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild: - Now uses newest icon package, .desktop file installation simplified - - 15 Feb 2004; David Holm <dholm@gentoo.org> openoffice-ximian-1.1.50.ebuild: - Added to ~ppc, closing bug #40801. - - 05 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild: - Now stripping the binaries during install, this reduces the size of the - installation by some nice 30 MB, also should speedup startup. Additionaly - conditionalized mime-type installation on gnome and kde use-flags - - 04 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild, - files/1.1.0/ximian-openoffice.keys: - GNOME mime type installation was incomplete, openoffice-ximian now registers - itself again as default application - - 03 Feb 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild: - This update further simplifies the ebuild and aims to fix the distcc - problems. Even better parallel build COULD now work for you, at least it does - for me, as it is not tested enough you will have to explicitely force the - ebuild to build in parallel / use more cpus. If you dare to try out emerge the - ebuild like: - - 'ECPUS="n" emerge openoffice-ximian' - - where n has to be exchanged with the number of processes / CPUs you want to - use. No guarantee whatsoever that it will work for you :-) - - 28 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.46.ebuild, - openoffice-ximian-1.1.47.3.ebuild, openoffice-ximian-1.1.49.2-r1.ebuild, - openoffice-ximian-1.1.49.2.ebuild, openoffice-ximian-1.1.50.ebuild: - Install Ximians OpenSymbol-Font to resolve bullets (and other) problems, - closes bug #39637 - -*openoffice-ximian-1.1.50 (25 Jan 2004) - - 25 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.50.ebuild: - New Version, removes the need for some workarounds - - 23 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.49.2-r1.ebuild, - openoffice-ximian-1.1.49.2.ebuild, files/1.1.0/norecent.patch: - Removing borked recent-files-patch, this should close bug #39050 - -*openoffice-ximian-1.1.49.2-r1 (21 Jan 2004) - - 21 Jan 2004; suka <suka@gentoo.org> openoffice-ximian-1.1.49.2-r1.ebuild, - files/1.1.0/ximian-openoffice.applications, files/1.1.0/xoo-drawing.desktop, - files/1.1.0/xoo-presentation.desktop, files/1.1.0/xoo-spreadsheet.desktop, - files/1.1.0/xoo-textdoc.desktop, files/1.1.0/xooffice-wrapper-1.3: - Two major changes to the ebuild: openoffice-ximian now keeps its own settings - dir in ~/.xopenoffice, old installs are transfered over automatically. This - means that it no longer blocks on vanilla openoffice, both can easily be - installed alongside each other. - - Also the CXXFLAGS settings are now actually applied to the build, until now we - built with generic settings, so more chance for optimizations or breakage ;-) - - Hard masked this for now - - 19 Jan 2004; Luca Barbato <lu_zero@gentoo.org> - openoffice-ximian-1.1.49.2.ebuild: - Marked ~ppc - - 17 Jan 2004; <suka@gentoo.org> openoffice-ximian-1.1.46.ebuild, - openoffice-ximian-1.1.47.3.ebuild, openoffice-ximian-1.1.49.2.ebuild, - files/1.1.0/fixed-gcc.patch, files/1.1.0/norecent.patch, - files/1.1.0/oo_1.1-nptl.patch, - files/1.1.0/openoffice-1.1.0-sparc64-fix.patch, - files/1.1.0/recent-files.diff: - Part 2 of the big clean up work: - - *) Fixed some dependencies - *) Filter another flag to combat compile breakage - *) Correct pentium4 replacement - *) Further cleanups - - openoffice-ximian-1.1.49.2 got some additional love: - - *) Major cleanup of build process - *) Remove need for virtualmake - *) Fix for PPC compile breakage. Closes bug #38411 - - 17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> - openoffice-ximian-1.1.46.ebuild: - set ppc in keywords - - 14 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> - openoffice-ximian-1.1.49.2.ebuild: - cleaned up ebuild. Not revision dumping as the time between commits is very - short - -*openoffice-ximian-1.1.49.2 (14 Jan 2004) - - 14 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> - openoffice-ximian-1.1.49.2.ebuild: - For suka <suka@t0.or.at>: - *) Updated Ximian patchset - *) Removed work-arounds which are not necessary anymore - *) Some dependency cleanup - - 12 Jan 2004; Seemant Kulleen <seemant@gentoo.org> - openoffice-ximian-1.1.48.ebuild: - 1.13.92-r3 fixes the tar problem, so removed that explicit dependency - -*openoffice-ximian-1.1.48 (11 Jan 2004) - - 11 Jan 2004; Paul de Vrieze <pauldv@gentoo.org> openoffice-ximian-1.1.48.ebuild: - Committing for suka@t0.or.at: - *) The desktop files are now provided in the Files-Dir, as Ximian - creates them now in their own build process (which we dont use) - *) There are two new patches, which I had to add, because one of the Ximian-patches breaks the build. - *) KDE menu entries are now created - *) The ebuild is now depending on <app-arch/tar-1.13.92 to bypass the - tar-problems - *) Installed Freetype is now used - *) ATM I have not optionalized to use the system-db, as it seemed to - break things for me - -*openoffice-ximian-1.1.47.3 (25 Dec 2003) - - 25 Dec 2003; Seemant Kulleen <seemant@gentoo.org> - openoffice-ximian-1.1.47.3.ebuild: - version bump thanks to suka <suka@t0.or.at> in bug #35464 - - 14 Dec 2003; Luca Barbato <lu_zero@gentoo.org> - openoffice-ximian-1.1.46.ebuild: - Marked ~ppc - -*openoffice-ximian-1.1.46 (12 Nov 2003) - - 12 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> - openoffice-ximian-1.1.46.ebuild: - New ximian version, and change the name to use ximian's version, not - openoffices - - 12 Nov 2003; Luca Barbato <lu_zero@gentoo.org> - openoffice-ximian-1.1.0-r1.ebuild: - Marked ~ppc - - 05 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> - files/1.1.0/ooffice-wrapper-1.3: - Fix the wrapper script for the openoffice location - -*openoffice-ximian-1.1.0-r1 (04 Nov 2003) - - 04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> - openoffice-ximian-1.1.0-r1.ebuild: - Add a revised version with newer ximian patches and without a need for java. - Again mostly based on <suka@t0.or.at> in bug #25241 - - 04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> - openoffice-ximian-1.1.0.ebuild: - Fix a small bug indicated by suka@t0.or.at - -*openoffice-ximian-1.1.0 (04 Nov 2003) - - 04 Nov 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-ximian-1.1.0.ebuild : - Initial commit based on the good work from <suka@t0.or.at> diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest deleted file mode 100644 index 5d09efae6294..000000000000 --- a/app-office/openoffice-ximian/Manifest +++ /dev/null @@ -1,45 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 37cf40c1524d4a960a1594b80cb06ee9 ChangeLog 35847 -MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 -MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650 -MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 -MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393 -MD5 6938dc2e28e840cebf4fdbde9d6e2d4b files/1.1.4/gentoo-1.3.9.patch 859 -MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.4/gentoo-splash.diff 890 -MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418 -MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576 -MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382 -MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638 -MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.4/nptl.patch 243 -MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.4/pthreadlink-fix.patch 1163 -MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475 -MD5 964398ef88829e5a2935d0c0f8389c9d files/1.1.4/xooffice-wrapper-1.3 6091 -MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472 -MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650 -MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393 -MD5 09e70c259e5c6767251d0e22f6775a8d files/1.1.5/gentoo-1.3.16.patch 1120 -MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.5/gentoo-splash.diff 890 -MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418 -MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576 -MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382 -MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638 -MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.5/nptl.patch 243 -MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.5/pthreadlink-fix.patch 1163 -MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 -MD5 ba6affa60977e5d658fe5a2125abb691 files/1.1.5/xooffice-wrapper-1.3 6091 -MD5 53867a5ca81d65d0139b4334ef63bd72 files/digest-openoffice-ximian-1.3.16 490 -MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openoffice-ximian-1.9.199 0 -MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 -MD5 5934b6f040e3627c964a67e52459df5f openoffice-ximian-1.3.16.ebuild 18043 -MD5 88523baa9951f87b4df5a84da2f790ac openoffice-ximian-1.3.9-r1.ebuild 18186 -MD5 05bb2ad41de9cc6ca128df1de5171adb openoffice-ximian-1.9.199.ebuild 1361 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFD0oa5csIHjyDViGQRAmcnAKDojX26NYQVCcBGu32aWirEOXCLIwCfXhaK -wiDRuwMagXB73eTQv0YaN4c= -=Xr0P ------END PGP SIGNATURE----- diff --git a/app-office/openoffice-ximian/files/1.1.4/STLport-vector.patch b/app-office/openoffice-ximian/files/1.1.4/STLport-vector.patch deleted file mode 100644 index 1892f1cabeed..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/STLport-vector.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- stlport/STLport-4.6.2.patch 2005-01-06 12:26:48.770546592 +1100 -+++ stlport/STLport-4.6.2.patch 2005-01-06 12:26:01.125789696 +1100 -@@ -69,3 +69,29 @@ - ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) - - install_unix : -+--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 -++++ misc/build/STLport-4.6.2/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 -+@@ -46,8 +46,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC -+ -+ include common_percent_rules.mak -+ include common_rules.mak -+--- misc/build/STLport-4.6.2/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 -++++ misc/build/STLport-4.6.2/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 -+@@ -44,8 +44,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -+ -+ include common_percent_rules.mak -+ include common_rules.mak diff --git a/app-office/openoffice-ximian/files/1.1.4/build-new-xslt.diff b/app-office/openoffice-ximian/files/1.1.4/build-new-xslt.diff deleted file mode 100644 index 972ac902af21..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/build-new-xslt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- officecfg/util/resource.xsl.orig 2005-09-23 14:00:56.000000000 +0200 -+++ officecfg/util/resource.xsl 2005-09-23 14:02:14.000000000 +0200 -@@ -84,7 +84,8 @@ - </xsl:template> - - <!-- match all elements that could possibly contain info elements --> -- <xsl:template match="info/desc[@xml:lang=$locale]|info/label[@xml:lang=$locale]"> -+ <xsl:template match="info/desc|info/label"> -+ <xsl:if test="@xml:lang=$locale"> - - <!-- print TPF's path to current node --> - <xsl:for-each select="ancestor-or-self::*"> -@@ -108,6 +109,7 @@ - - <xsl:apply-templates/> - -+ </xsl:if> - </xsl:template> - - </xsl:transform> diff --git a/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff b/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff deleted file mode 100644 index 4ad65421c1a2..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/cws-heapbug_CAN-2005-0941.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: source/sdstor/stgole.cxx -=================================================================== -RCS file: /cvs/util/sot/source/sdstor/stgole.cxx,v -retrieving revision 1.4 -retrieving revision 1.4.206.1 -diff -u -u -r1.4 -r1.4.206.1 ---- sot/source/sdstor/stgole.cxx 22 Jul 2002 12:28:43 -0000 1.4 -+++ sot/source/sdstor/stgole.cxx 11 Apr 2005 16:22:26 -0000 1.4.206.1 -@@ -156,6 +156,8 @@ - *this >> aClsId; - INT32 nLen1 = 0; - *this >> nLen1; -+ // the higher bits are ignored -+ nLen1 &= 0xFFFF; - sal_Char* p = new sal_Char[ (USHORT) nLen1 ]; - if( Read( p, nLen1 ) == (ULONG) nLen1 ) - { diff --git a/app-office/openoffice-ximian/files/1.1.4/gcc-instlib.patch b/app-office/openoffice-ximian/files/1.1.4/gcc-instlib.patch deleted file mode 100644 index 99e424abed01..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/gcc-instlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl ---- solenv/bin/gccinstlib.pl 2004-03-16 11:15:42.000000000 +0100 -+++ solenv/bin/gccinstlib.pl 2004-09-27 10:36:02.338394960 +0200 -@@ -63,7 +63,7 @@ - # - #************************************************************************* - --$ENV{'LC_MESSAGES'} = 'C'; -+$ENV{'LC_ALL'} = 'C'; - - %SearchDirs = GetGccSearchDirs (); - diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.9.patch b/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.9.patch deleted file mode 100644 index 37eed77e51b5..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/gentoo-1.3.9.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- patches/OOO_1_1_4/apply.orig 2004-12-02 00:07:00.659646960 +0100 -+++ patches/OOO_1_1_4/apply 2004-12-02 00:07:18.119992584 +0100 -@@ -33,9 +33,10 @@ - PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath - KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath - Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec --Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath --GentooGNOME : Gentoo, GnomeVFS, NovellOnly --GentooKDE : Gentoo, KDECommon -+GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath -+Gentoo : GentooBase -+GentooGNOME : GentooBase, GnomeVFS, NovellOnly, GentooOnly -+GentooKDE : GentooBase, KDECommon - - # somewhat odder: - Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath diff --git a/app-office/openoffice-ximian/files/1.1.4/gentoo-splash.diff b/app-office/openoffice-ximian/files/1.1.4/gentoo-splash.diff deleted file mode 100644 index 164b125b1aad..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/gentoo-splash.diff +++ /dev/null @@ -1,30 +0,0 @@ -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.4/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch deleted file mode 100644 index 0fbeb07ee3d6..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/getcompver.awk.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- solenv/bin/getcompver.awk.orig 2005-02-22 00:24:46.976743123 +0100 -+++ solenv/bin/getcompver.awk 2005-02-22 00:34:16.624045985 +0100 -@@ -98,6 +98,11 @@ - CCversion = $0 - } - } -+/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ { -+ if ( compiler_matched == 0 ) { -+ CCversion = substr($0, 0, index($0, "-") - 1) -+ } -+} - END { - if ( num == "true" ) { - tokencount = split (CCversion,vertoken,".") diff --git a/app-office/openoffice-ximian/files/1.1.4/hardened-link.patch b/app-office/openoffice-ximian/files/1.1.4/hardened-link.patch deleted file mode 100644 index 83c707dc106d..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/hardened-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:09:29.344518376 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:09:43.084429592 +0200 -@@ -156,8 +156,8 @@ - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared diff --git a/app-office/openoffice-ximian/files/1.1.4/javafix.patch b/app-office/openoffice-ximian/files/1.1.4/javafix.patch deleted file mode 100644 index e2d9ccf723b1..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/javafix.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -@@ -184,7 +184,12 @@ - { - jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); - if(id) -- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); -+ return copyArrayAndDelete( -+ t.pEnv, -+ (jobjectArray)t.pEnv->GetObjectField( object, id), -+ static_cast< const ::rtl::OUString* >( NULL ), -+ static_cast< const java_lang_String* >( NULL ) -+ ); - } //t.pEnv - return Sequence< ::rtl::OUString>(); - } ---- connectivity/source/inc/java/tools.hxx -+++ connectivity/source/inc/java/tools.hxx -@@ -101,7 +101,7 @@ - - java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - -- template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) -+ template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) - { - ::com::sun::star::uno::Sequence< T > xOut; - if(_Array) diff --git a/app-office/openoffice-ximian/files/1.1.4/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.4/newstlportfix.patch deleted file mode 100644 index f88927669a7b..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/newstlportfix.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- 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.4/nptl.patch b/app-office/openoffice-ximian/files/1.1.4/nptl.patch deleted file mode 100644 index 09407412b706..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/nptl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/source/solar/solar.c.orig -+++ tools/source/solar/solar.c -@@ -577,7 +577,7 @@ - - { - char* p = NULL; -- InfoMemoryAccess( p ); -+ /*InfoMemoryAccess( p );*/ - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); diff --git a/app-office/openoffice-ximian/files/1.1.4/pthreadlink-fix.patch b/app-office/openoffice-ximian/files/1.1.4/pthreadlink-fix.patch deleted file mode 100644 index 381221095037..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/pthreadlink-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:07:59.714144264 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:08:36.190599000 +0200 -@@ -151,13 +151,13 @@ - LINK*=$(CC) - - # default linker flags --LINKFLAGSDEFS*=-z defs -+LINKFLAGSDEFS*=-Wl,-z,defs - LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' --LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) -+LINKFLAGS=-Wl,-O2 -Bsymbolic,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -+LINKFLAGSAPPCUI= -Wl,-export-dynamic - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -198,8 +198,8 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC) - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - diff --git a/app-office/openoffice-ximian/files/1.1.4/pyunolink-fix.patch b/app-office/openoffice-ximian/files/1.1.4/pyunolink-fix.patch deleted file mode 100644 index 6d8ce6323868..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/pyunolink-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pyuno.orig/source/module/makefile.mk 2005-01-18 11:59:23.462336464 +0100 -+++ pyuno/source/module/makefile.mk 2005-01-18 11:59:42.289474304 +0100 -@@ -82,9 +82,9 @@ - # so this library cannot be checked - SHL1NOCHECK=yes - PYUNORC=pyunorc --.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" -+#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" - PYTHONLIB=-lpython --.ENDIF -+#.ENDIF - .ELSE - # on windows, the python executable also uses the shared library, - # so we link pyuno directly to it diff --git a/app-office/openoffice-ximian/files/1.1.4/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.4/xooffice-wrapper-1.3 deleted file mode 100644 index dcdd4024add8..000000000000 --- a/app-office/openoffice-ximian/files/1.1.4/xooffice-wrapper-1.3 +++ /dev/null @@ -1,175 +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=<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.3" ] ; then - mv $HOME/.xopenoffice/1.1.3 $HOME/.xopenoffice/1.1.4 - sed -i -e s/1.1.3/1.1.4/g $HOME/.xversionrc - sed -i -e s/1.1.3/1.1.4/g $HOME/.xopenoffice/1.1.4/user/basic/*.xlc - echo "Your user install dir has been moved over to the new version" -fi - -if [ ! -f "/proc/version" ] ; then - echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---" -fi - -### -### Get user settings directory from ~/.xversionrc and echo directory name to stdout -### get_settings_dir <Version> -### return: 0 - directory found, -### 1 - ~/.xversionrc non existent -### 2 - entry exists in ~/.xversionrc but directory not found -### 3 - ~/.xversionrc exists but no entry found -get_settings_dir() -{ - [ -r ${HOME}/.xversionrc ] || exit 1 - # warning, .xversionrc is DOS encoded so strip ^M - settings_dir="`tr -d '\r' < ~/.xversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`" - echo "$settings_dir" - [ -n "$settings_dir" ] || exit 3 - [ -d "$settings_dir" ] || exit 2 -} - -## -## where does OO live for this user ? -## -OOHOME="`get_settings_dir "$OOVERSION"`" -if [ $? -eq 2 ] ; then - # .xversionrc contains a version yet the directory does not exist - echo "I'm confused because I can't find OpenOffice's user files." - echo "Your ~/.xversionrc file tells they should be under $OOHOME," - echo "but they are not. Please fix the situation manually." - echo "You may want to edit ~/.xversionrc to indicate where is OO" - echo "installed, or remove it if you did remove your installation" - echo "directory manually (you bad one)." - exit 1 -fi - -## search LOCALE -if [ -n "$LC_ALL" ]; then - LOCALE="$LC_ALL" - # OOo doesn't understand LC_ALL, so set LANG - LANG="$LC_ALL" -elif [ -n "$LANG" ]; then - LOCALE="$LANG" -elif [ -n "$LC_MESSAGES" ]; then - LOCALE="$LC_MESSAGES" - LANG="$LC_MESSAGES" -else - LOCALE="en_US" -fi - -# Set locale to en_US if locale is C -if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi - -LOCALEOO=`echo $LOCALE | sed 's/_/-/'` - -## -## install OO for this user if needed -## -if [ -z "$OOHOME" ] ; then - if [ -e /etc/ximian-openoffice/autoresponse-<pv>.conf ] && \ - grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf ; then - - # first install - OOHOME=`grep DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf | \ - sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"` - - if [ -d "$OOHOME" ]; then - echo "openoffice.org: You have no entry for $OOVERSION in ~/.xversionrc, " - echo "yet the directory $OOHOME exists." - echo "Please remove $OOHOME and try again." - exit 1 - fi - - echo "running openoffice.org setup..." - if ! /opt/Ximian-OpenOffice/program/setup -R:/etc/ximian-openoffice/autoresponse-<pv>.conf >& /dev/null; then - echo "setup failed.. abort" - exit 1 - fi - - echo "Setup complete. Running openoffice.org..." - -else - echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break" - echo "the /etc/ximian-openoffice/autoresponse-<pv>.conf file manually ?" - echo "This file should contain DESTINATIONPATH" - exit 1 - fi -fi - -## -## If no file is specified on the command line, which application to start? -## The wrapper can be called from several links in /usr/bin -## -if [ $# = 0 ]; then - case `basename $0` in - xoocalc) set -- private:factory/scalc;; - xoodraw) set -- private:factory/sdraw;; - xooimpress) set -- private:factory/simpress;; - xoomath) set -- private:factory/smath;; - xooweb) set -- private:factory/swriter/web;; - xoowriter) set -- private:factory/swriter;; - 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" - -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 diff --git a/app-office/openoffice-ximian/files/1.1.5/STLport-vector.patch b/app-office/openoffice-ximian/files/1.1.5/STLport-vector.patch deleted file mode 100644 index 1892f1cabeed..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/STLport-vector.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- stlport/STLport-4.6.2.patch 2005-01-06 12:26:48.770546592 +1100 -+++ stlport/STLport-4.6.2.patch 2005-01-06 12:26:01.125789696 +1100 -@@ -69,3 +69,29 @@ - ln -s $(STLDEBUG_DYNLIB) $(OUTDIR)/$(STLDEBUG_NAME).$(DYNEXT) - - install_unix : -+--- misc/build/STLport-4.6.2/src/gcc-linux.mak.old 2005-01-06 12:22:54.127217800 +1100 -++++ misc/build/STLport-4.6.2/src/gcc-linux.mak 2005-01-06 12:24:28.192917640 +1100 -+@@ -46,8 +46,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -fPIC -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -fPIC -+ -+ include common_percent_rules.mak -+ include common_rules.mak -+--- misc/build/STLport-4.6.2/src/gcc.mak.old 2005-01-06 15:20:18.840975336 +1100 -++++ misc/build/STLport-4.6.2/src/gcc.mak 2005-01-06 15:21:00.373661408 +1100 -+@@ -44,8 +44,8 @@ -+ CXXFLAGS_DEBUG_static = $(CXXFLAGS_COMMON) -O -g -+ CXXFLAGS_DEBUG_dynamic = $(CXXFLAGS_COMMON) -O -g -fPIC -+ -+-CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -D_STLP_DEBUG -+-CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -D_STLP_DEBUG -++CXXFLAGS_STLDEBUG_static = $(CXXFLAGS_DEBUG_static) -++CXXFLAGS_STLDEBUG_dynamic = $(CXXFLAGS_DEBUG_dynamic) -+ -+ include common_percent_rules.mak -+ include common_rules.mak diff --git a/app-office/openoffice-ximian/files/1.1.5/build-new-xslt.diff b/app-office/openoffice-ximian/files/1.1.5/build-new-xslt.diff deleted file mode 100644 index 972ac902af21..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/build-new-xslt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- officecfg/util/resource.xsl.orig 2005-09-23 14:00:56.000000000 +0200 -+++ officecfg/util/resource.xsl 2005-09-23 14:02:14.000000000 +0200 -@@ -84,7 +84,8 @@ - </xsl:template> - - <!-- match all elements that could possibly contain info elements --> -- <xsl:template match="info/desc[@xml:lang=$locale]|info/label[@xml:lang=$locale]"> -+ <xsl:template match="info/desc|info/label"> -+ <xsl:if test="@xml:lang=$locale"> - - <!-- print TPF's path to current node --> - <xsl:for-each select="ancestor-or-self::*"> -@@ -108,6 +109,7 @@ - - <xsl:apply-templates/> - -+ </xsl:if> - </xsl:template> - - </xsl:transform> diff --git a/app-office/openoffice-ximian/files/1.1.5/gcc-instlib.patch b/app-office/openoffice-ximian/files/1.1.5/gcc-instlib.patch deleted file mode 100644 index 99e424abed01..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/gcc-instlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN solenv/bin/gccinstlib.pl oo_1.1.2_src/solenv/bin/gccinstlib.pl ---- solenv/bin/gccinstlib.pl 2004-03-16 11:15:42.000000000 +0100 -+++ solenv/bin/gccinstlib.pl 2004-09-27 10:36:02.338394960 +0200 -@@ -63,7 +63,7 @@ - # - #************************************************************************* - --$ENV{'LC_MESSAGES'} = 'C'; -+$ENV{'LC_ALL'} = 'C'; - - %SearchDirs = GetGccSearchDirs (); - diff --git a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch b/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch deleted file mode 100644 index b4179079b6a7..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/gentoo-1.3.16.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- patches/OOO_1_1_5/apply.orig 2004-12-02 00:07:00.659646960 +0100 -+++ patches/OOO_1_1_5/apply 2004-12-02 00:07:18.119992584 +0100 -@@ -33,9 +33,10 @@ - PLD : PLDOnly, LinuxCommon, FilePickers, KDECommon, GlobalDesktopFiles, NonArkCommon, NoRpath - KDE : LinuxCommon, FilePickers, KDEOnly, NoRpath - Ark : ArkOnly, LinuxCommon, FilePickers, GlobalDesktopFiles, Gcc34, NoRpath, IndicFixes, MSCodec --Gentoo : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, GentooOnly, NoRpath --GentooGNOME : Gentoo, GnomeVFS, NovellOnly --GentooKDE : Gentoo, KDECommon -+GentooBase : LinuxCommon, FilePickers, GlobalDesktopFiles, NonArkCommon, Gcc34, NoRpath -+Gentoo : GentooBase -+GentooGNOME : GentooBase, GnomeVFS, NovellOnly, GentooOnly -+GentooKDE : GentooBase, KDECommon - - # somewhat odder: - Win32 : VCLPlug, Common, ODKFixes, VBABits, Win32Only, NoRpath -@@ -1306,11 +1306,6 @@ - - ######################################################## - --[ GentooOnly, RedHatOnly ] --gcc34-gnome.diff -- --######################################################## -- - [ TestLayout ] - # the beginnings of layout - gui-window-layout.diff diff --git a/app-office/openoffice-ximian/files/1.1.5/gentoo-splash.diff b/app-office/openoffice-ximian/files/1.1.5/gentoo-splash.diff deleted file mode 100644 index 164b125b1aad..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/gentoo-splash.diff +++ /dev/null @@ -1,30 +0,0 @@ -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.5/getcompver.awk.patch b/app-office/openoffice-ximian/files/1.1.5/getcompver.awk.patch deleted file mode 100644 index 0fbeb07ee3d6..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/getcompver.awk.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- solenv/bin/getcompver.awk.orig 2005-02-22 00:24:46.976743123 +0100 -+++ solenv/bin/getcompver.awk 2005-02-22 00:34:16.624045985 +0100 -@@ -98,6 +98,11 @@ - CCversion = $0 - } - } -+/^[0-9]*[.][0-9]*[.][0-9]*-[0-9]*$/ { -+ if ( compiler_matched == 0 ) { -+ CCversion = substr($0, 0, index($0, "-") - 1) -+ } -+} - END { - if ( num == "true" ) { - tokencount = split (CCversion,vertoken,".") diff --git a/app-office/openoffice-ximian/files/1.1.5/hardened-link.patch b/app-office/openoffice-ximian/files/1.1.5/hardened-link.patch deleted file mode 100644 index 83c707dc106d..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/hardened-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:09:29.344518376 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:09:43.084429592 +0200 -@@ -156,8 +156,8 @@ - LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic --LINKFLAGSAPPCUI= -Wl,-export-dynamic -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap -+LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared diff --git a/app-office/openoffice-ximian/files/1.1.5/javafix.patch b/app-office/openoffice-ximian/files/1.1.5/javafix.patch deleted file mode 100644 index e2d9ccf723b1..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/javafix.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -+++ connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx -@@ -184,7 +184,12 @@ - { - jfieldID id = t.pEnv->GetFieldID(java_sql_DriverPropertyInfo::getMyClass(),"choices","[Ljava/lang/String;"); - if(id) -- return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), ::rtl::OUString(),java_lang_String(NULL,NULL)); -+ return copyArrayAndDelete( -+ t.pEnv, -+ (jobjectArray)t.pEnv->GetObjectField( object, id), -+ static_cast< const ::rtl::OUString* >( NULL ), -+ static_cast< const java_lang_String* >( NULL ) -+ ); - } //t.pEnv - return Sequence< ::rtl::OUString>(); - } ---- connectivity/source/inc/java/tools.hxx -+++ connectivity/source/inc/java/tools.hxx -@@ -101,7 +101,7 @@ - - java_util_Properties* createStringPropertyArray(JNIEnv *pEnv,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - -- template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array,const T& _rD1,const JT& _rD2) -+ template<class T,class JT> ::com::sun::star::uno::Sequence< T > copyArrayAndDelete(JNIEnv *pEnv,jobjectArray _Array, const T*, const JT* ) - { - ::com::sun::star::uno::Sequence< T > xOut; - if(_Array) diff --git a/app-office/openoffice-ximian/files/1.1.5/newstlportfix.patch b/app-office/openoffice-ximian/files/1.1.5/newstlportfix.patch deleted file mode 100644 index f88927669a7b..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/newstlportfix.patch +++ /dev/null @@ -1,100 +0,0 @@ ---- 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.5/nptl.patch b/app-office/openoffice-ximian/files/1.1.5/nptl.patch deleted file mode 100644 index 09407412b706..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/nptl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/source/solar/solar.c.orig -+++ tools/source/solar/solar.c -@@ -577,7 +577,7 @@ - - { - char* p = NULL; -- InfoMemoryAccess( p ); -+ /*InfoMemoryAccess( p );*/ - p = (char*)&p; - InfoMemoryAccess( p ); - InfoMemoryTypeAccess( t_short ); diff --git a/app-office/openoffice-ximian/files/1.1.5/pthreadlink-fix.patch b/app-office/openoffice-ximian/files/1.1.5/pthreadlink-fix.patch deleted file mode 100644 index 381221095037..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/pthreadlink-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk ---- solenv.orig/inc/unxlngi4.mk 2004-10-23 20:07:59.714144264 +0200 -+++ solenv/inc/unxlngi4.mk 2004-10-23 20:08:36.190599000 +0200 -@@ -151,13 +151,13 @@ - LINK*=$(CC) - - # default linker flags --LINKFLAGSDEFS*=-z defs -+LINKFLAGSDEFS*=-Wl,-z,defs - LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' --LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) -+LINKFLAGS=-Wl,-O2 -Bsymbolic,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) - - # linker flags for linking applications --LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec --LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec -+LINKFLAGSAPPGUI= -Wl,-export-dynamic -+LINKFLAGSAPPCUI= -Wl,-export-dynamic - - # linker flags for linking shared libraries - LINKFLAGSSHLGUI= -shared -@@ -198,8 +198,8 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC) - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - diff --git a/app-office/openoffice-ximian/files/1.1.5/pyunolink-fix.patch b/app-office/openoffice-ximian/files/1.1.5/pyunolink-fix.patch deleted file mode 100644 index 6d8ce6323868..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/pyunolink-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pyuno.orig/source/module/makefile.mk 2005-01-18 11:59:23.462336464 +0100 -+++ pyuno/source/module/makefile.mk 2005-01-18 11:59:42.289474304 +0100 -@@ -82,9 +82,9 @@ - # so this library cannot be checked - SHL1NOCHECK=yes - PYUNORC=pyunorc --.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" -+#.IF "$(OS)"=="SOLARIS" || "$(OS)"=="MACOSX" - PYTHONLIB=-lpython --.ENDIF -+#.ENDIF - .ELSE - # on windows, the python executable also uses the shared library, - # so we link pyuno directly to it diff --git a/app-office/openoffice-ximian/files/1.1.5/xooffice-wrapper-1.3 b/app-office/openoffice-ximian/files/1.1.5/xooffice-wrapper-1.3 deleted file mode 100644 index ed7b8a2f8c85..000000000000 --- a/app-office/openoffice-ximian/files/1.1.5/xooffice-wrapper-1.3 +++ /dev/null @@ -1,175 +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=<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.4" ] ; then - mv $HOME/.xopenoffice/1.1.4 $HOME/.xopenoffice/1.1.5 - sed -i -e s/1.1.4/1.1.5/g $HOME/.xversionrc - sed -i -e s/1.1.4/1.1.5/g $HOME/.xopenoffice/1.1.5/user/basic/*.xlc - echo "Your user install dir has been moved over to the new version" -fi - -if [ ! -f "/proc/version" ] ; then - echo "--- Warning - OO.o will not work without a mounted /proc filesystem ---" -fi - -### -### Get user settings directory from ~/.xversionrc and echo directory name to stdout -### get_settings_dir <Version> -### return: 0 - directory found, -### 1 - ~/.xversionrc non existent -### 2 - entry exists in ~/.xversionrc but directory not found -### 3 - ~/.xversionrc exists but no entry found -get_settings_dir() -{ - [ -r ${HOME}/.xversionrc ] || exit 1 - # warning, .xversionrc is DOS encoded so strip ^M - settings_dir="`tr -d '\r' < ~/.xversionrc | sed -n "/^$1=/s%^$1=file://\(.*\)$%\1%p"`" - echo "$settings_dir" - [ -n "$settings_dir" ] || exit 3 - [ -d "$settings_dir" ] || exit 2 -} - -## -## where does OO live for this user ? -## -OOHOME="`get_settings_dir "$OOVERSION"`" -if [ $? -eq 2 ] ; then - # .xversionrc contains a version yet the directory does not exist - echo "I'm confused because I can't find OpenOffice's user files." - echo "Your ~/.xversionrc file tells they should be under $OOHOME," - echo "but they are not. Please fix the situation manually." - echo "You may want to edit ~/.xversionrc to indicate where is OO" - echo "installed, or remove it if you did remove your installation" - echo "directory manually (you bad one)." - exit 1 -fi - -## search LOCALE -if [ -n "$LC_ALL" ]; then - LOCALE="$LC_ALL" - # OOo doesn't understand LC_ALL, so set LANG - LANG="$LC_ALL" -elif [ -n "$LANG" ]; then - LOCALE="$LANG" -elif [ -n "$LC_MESSAGES" ]; then - LOCALE="$LC_MESSAGES" - LANG="$LC_MESSAGES" -else - LOCALE="en_US" -fi - -# Set locale to en_US if locale is C -if [ "x$LOCALE" = "xC" ] ; then LOCALE="en_US"; fi - -LOCALEOO=`echo $LOCALE | sed 's/_/-/'` - -## -## install OO for this user if needed -## -if [ -z "$OOHOME" ] ; then - if [ -e /etc/ximian-openoffice/autoresponse-<pv>.conf ] && \ - grep -q DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf ; then - - # first install - OOHOME=`grep DESTINATIONPATH /etc/ximian-openoffice/autoresponse-<pv>.conf | \ - sed -e 's/DESTINATIONPATH=//' -e "s|<home>|$HOME|"` - - if [ -d "$OOHOME" ]; then - echo "openoffice.org: You have no entry for $OOVERSION in ~/.xversionrc, " - echo "yet the directory $OOHOME exists." - echo "Please remove $OOHOME and try again." - exit 1 - fi - - echo "running openoffice.org setup..." - if ! /opt/Ximian-OpenOffice/program/setup -R:/etc/ximian-openoffice/autoresponse-<pv>.conf >& /dev/null; then - echo "setup failed.. abort" - exit 1 - fi - - echo "Setup complete. Running openoffice.org..." - -else - echo "openoffice.org: Damnit! I can't find OpenOffice's user files. Did you break" - echo "the /etc/ximian-openoffice/autoresponse-<pv>.conf file manually ?" - echo "This file should contain DESTINATIONPATH" - exit 1 - fi -fi - -## -## If no file is specified on the command line, which application to start? -## The wrapper can be called from several links in /usr/bin -## -if [ $# = 0 ]; then - case `basename $0` in - xoocalc) set -- private:factory/scalc;; - xoodraw) set -- private:factory/sdraw;; - xooimpress) set -- private:factory/simpress;; - xoomath) set -- private:factory/smath;; - xooweb) set -- private:factory/swriter/web;; - xoowriter) set -- private:factory/swriter;; - 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" - -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 diff --git a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.16 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.16 deleted file mode 100644 index 5e59f9d4e286..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.16 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 1c8e860adae05087a53bdba5646962a9 OOo_1.1.5_src.tar.gz 223418209 -MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 -MD5 d29117a40ff4435680c2113e28adcba6 ooo-build-1.3.16.tar.gz 3424577 -MD5 264e955e19c7e961e22382db09e19597 libwpd-0.8.2.tar.gz 486490 -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/files/digest-openoffice-ximian-1.3.9-r1 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.9-r1 deleted file mode 100644 index 5f528e912035..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.3.9-r1 +++ /dev/null @@ -1,7 +0,0 @@ -MD5 20c10db97865ae4c51dc827d668b8939 OOo_1.1.4_source.tar.gz 219743530 -MD5 4c01c84f1212369ceb369567ed06d1a2 STLport-4.6.2.tar.gz 755958 -MD5 ae2131f2b452f7a3f8d15e2cbd35e53c ooo-build-1.3.9.tar.gz 3393080 -MD5 98e59beecc112339bb78654863304c1c libwpd-0.8.0.tar.gz 449371 -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/files/digest-openoffice-ximian-1.9.199 b/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.9.199 deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/app-office/openoffice-ximian/files/digest-openoffice-ximian-1.9.199 +++ /dev/null diff --git a/app-office/openoffice-ximian/metadata.xml b/app-office/openoffice-ximian/metadata.xml deleted file mode 100644 index 362db259797a..000000000000 --- a/app-office/openoffice-ximian/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>openoffice</herd> -<longdescription>This package provides the ximian flavour of openoffice. It - needs a long time to compile so be warned</longdescription> -</pkgmetadata> diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild deleted file mode 100644 index f626e2338b32..000000000000 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.16.ebuild +++ /dev/null @@ -1,628 +0,0 @@ -# Copyright 1999-2006 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.16.ebuild,v 1.5 2006/01/21 15:11:39 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 eutils fdo-mime flag-o-matic kde-functions toolchain-funcs - -IUSE="curl gnome hardened java kde nas nptl zlib" - -OO_VER="1.1.5" -PATCHLEVEL="OOO_1_1_5" -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}" -DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite." - -SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_src.tar.gz - http://www.stlport.org/archive/STLport-4.6.2.tar.gz - http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz - http://go-oo.org/packages/libwpd/libwpd-0.8.2.tar.gz - mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2 - gnome? ( http://go-oo.org/packages/ooo-icons-${ICON_VER}.tar.gz ) - !kde? ( http://go-oo.org/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://go-oo.org" - -LICENSE="|| ( LGPL-2 SISSL-1.1 )" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc" - -RDEPEND=" - || ( ( - x11-libs/libXaw - x11-libs/libXinerama - ) - virtual/x11 ) - virtual/libc - >=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/jre-1.4.1 ) - ppc? ( >=sys-devel/gcc-3.2.1 ) - linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) - linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) - linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" - -DEPEND="${RDEPEND} - || ( ( - x11-libs/libXrender - x11-proto/printproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xineramaproto - ) - virtual/x11 ) - net-print/cups - >=sys-apps/findutils-4.1.20-r1 - app-shells/tcsh - dev-util/pkgconfig - dev-util/intltool - curl? ( net-misc/curl ) - nas? ( media-libs/nas ) - zlib? ( sys-libs/zlib ) - sys-libs/pam - !dev-util/dmake - java? ( >=virtual/jdk-1.4.1 ) - !java? ( dev-libs/libxslt )" - -PROVIDE="virtual/ooo" - -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 - ewarn " It is important to note that OpenOffice.org is a very fragile " - ewarn " build when it comes to CFLAGS. A number of flags have already " - ewarn " been filtered out. If you experience difficulty merging this " - ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " - ewarn " merge again. " - ewarn - ewarn " Please note that this package now uses the LINGUAS environment " - ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..." - ewarn " system does NOT work anymore." - ewarn - ewarn " If you want localized helpcontent, please download the correct file " - ewarn " for your language from an OpenOffice.org-mirror " - ewarn " (directory /contrib/helpcontent/ e.g.) and put it in your " - ewarn " /usr/portage/distfiles, the ebuild will use it automatically. " - ewarn - - set_languages -} - -set_languages () { - - strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb nn pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he - if [ -n "${LINGUAS}" ] ; then - # use the leftmost value - temp_lang=( ${LINGUAS} ) - primary_lang=${temp_lang[0]} - else - primary_lang="en" - fi - - case "${primary_lang}" in - en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)" - ;; - pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese - ;; - ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian - ;; - el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek - ;; - nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch - ;; - fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French - ;; - es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish - ;; - fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish - ;; - hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian - ;; - ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan - ;; - it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian - ;; - cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech - ;; - sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak - ;; - da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish - ;; - sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish - ;; - nn ) OOLANGNO=79; OOLANGNAME=NORNYN; OOLFULLNAME="Norwegian" - ;; - nb ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian" - ;; - pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish - ;; - de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German - ;; - sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian - ;; - pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian" - ;; - th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai - ;; - et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian - ;; - ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese" - ;; - ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean - ;; - zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)" - ;; - zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)" - ;; - tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish - ;; - hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi - ;; - ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic - ;; - he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew - ;; - esac - - einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment." - -} - -oo_setup() { - - unset LANGUAGE - unset LANG - unset LC_ALL - - 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 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 - - cd ${S} - - #Still needed: The STLport patch - cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die - epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch - - epatch ${FILESDIR}/${OO_VER}/gcc-instlib.patch - - #Another java problem - epatch ${FILESDIR}/${OO_VER}/javafix.patch - - #fix for bug #82385 - epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch - - #Allow building with libxslt >= 1.1.15 - use java || epatch ${FILESDIR}/${OO_VER}/build-new-xslt.diff - - #Workaround for bug #73940, may break debug use flag on ppc - if use ppc; then - epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch - fi - - #Fix for nptl - if use nptl; then - epatch ${FILESDIR}/${OO_VER}/nptl.patch - fi - - #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" - - #Fix for hardened - if use hardened; then - epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch - epatch ${FILESDIR}/${OO_VER}/hardened-link.patch - epatch ${FILESDIR}/${OO_VER}/pyunolink-fix.patch - fi - - einfo "Installing / Scaling Icons" - ${PATCHDIR}/bin/scale-icons ${S} || die - cp -pPRf ${ICONDIR}/* ${S} || die - - einfo "Copying splash screens in place" - cp -pPRf ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die - - einfo "Copying libpwd tarball in build dir" - mkdir -p ${S}/libwpd/download/ || die - cp -pPRf ${DISTDIR}/libwpd-0.8.2.tar.gz ${S}/libwpd/download/ || die - - einfo "Munging font mappings ..." - ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die -} - -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() { - - unset LIBC - addpredict "/bin" - addpredict "/root/.gconfd" - addpredict "/root/.gnome" - - # 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 - - #See if we use system-nas - if use nas - then - MYCONF="${MYCONF} --with-system-nas" - fi - - use kde && set-kdedir 3 - - # 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) - cd ${S}/config_office - rm -f config.cache || die - autoconf || die - - if [ "OOLANGNAME" != "ENUS" ]; then - OOLANGNAME="${OOLANGNAME},ENUS" - fi - - MYCONF="${MYCONF} --enable-libart \ - --enable-libsn \ - --enable-crashdump=no \ - --with-lang=${OOLANGNAME} \ - --without-fonts \ - --disable-rpath \ - --enable-fontconfig \ - --with-system-freetype \ - --with-system-xrender \ - --with-build-version=ooo-build-${PV} \ - --disable-mozilla" - - ./configure ${MYCONF} || die - - cd ${S} - get_EnvSet - - # unpack help files if present - if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then - einfo "Using helpcontent for ${OOLFULLNAME}" - mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck - tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck - fi - - # Build as minimal as possible - export BUILD_MINIMAL="${OOLANGNO}" - - # Embedded python dies without Home set - if test "z${HOME}" = "z"; then - export HOME="" - fi - - #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="${CXXFLAGS}" - - 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" - addpredict "/root/.gnome" - - - # 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. - # - # <azarah@gentoo.org> (9 Sep 2002) - - # Autoresponse file for main installation - cat > ${T}/rsfile-global <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_NETWORK - INSTALLATIONTYPE=STANDARD - DESTINATIONPATH=<destdir> - OUTERPATH= - LOGFILE= - LANGUAGELIST=<LANGUAGE> - - [JAVA] - JavaSupport=preinstalled_or_none - END_RS - - # Autoresponse file for user installation - cat > ${T}/rsfile-local <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_WORKSTATION - INSTALLATIONTYPE=WORKSTATION - DESTINATIONPATH=<home>/.xopenoffice/<pv> - - [JAVA] - JavaSupport=none - END_RS - - # Fixing install location in response file - sed -e "s|<destdir>|${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse || die - - einfo "Installing Ximian-OpenOffice.org into build root..." - dodir ${INSTDIR} - cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/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 - - 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 - - # Install user autoresponse file - insinto /etc/ximian-openoffice - sed -e "s|<pv>|${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|<pv>|${OO_VER}|g" \ - ${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice - doexe ${T}/xooffice - - # Component symlinks - for app in calc draw impress math web 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 - - # 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() { - - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - - 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" -} diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild deleted file mode 100644 index 3371b667b6d7..000000000000 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild +++ /dev/null @@ -1,635 +0,0 @@ -# Copyright 1999-2006 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.9-r1.ebuild,v 1.11 2006/01/21 15:11:39 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 eutils fdo-mime flag-o-matic kde-functions toolchain-funcs - -IUSE="curl gnome hardened java kde nas nptl zlib" - -OO_VER="1.1.4" -PATCHLEVEL="OOO_1_1_4" -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}" -DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite." - -SRC_URI="mirror://openoffice/stable/${OO_VER}/OOo_${OO_VER}_source.tar.gz - http://www.stlport.org/archive/STLport-4.6.2.tar.gz - http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${PV}.tar.gz - http://go-oo.org/packages/libwpd/libwpd-0.8.0.tar.gz - mirror://gentoo/OOo-gentoo-splash-1.1.tar.bz2 - gnome? ( http://go-oo.org/packages/ooo-icons-${ICON_VER}.tar.gz ) - !kde? ( http://go-oo.org/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://go-oo.org" - -LICENSE="|| ( LGPL-2 SISSL-1.1 )" -SLOT="0" -KEYWORDS="ppc sparc x86" - -RDEPEND=" - || ( ( - x11-libs/libXaw - x11-libs/libXinerama - ) - virtual/x11 ) - virtual/libc - >=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/jre-1.4.1 ) - ppc? ( >=sys-devel/gcc-3.2.1 ) - linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) - linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) - linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )" - -DEPEND="${RDEPEND} - || ( ( - x11-libs/libXrender - x11-proto/printproto - x11-proto/xextproto - x11-proto/xproto - x11-proto/xineramaproto - ) - virtual/x11 ) - net-print/cups - >=sys-apps/findutils-4.1.20-r1 - app-shells/tcsh - dev-util/pkgconfig - dev-util/intltool - curl? ( net-misc/curl ) - nas? ( media-libs/nas ) - zlib? ( sys-libs/zlib ) - sys-libs/pam - !dev-util/dmake - java? ( >=virtual/jdk-1.4.1 ) - !java? ( dev-libs/libxslt )" - -PROVIDE="virtual/ooo" - -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 - ewarn " It is important to note that OpenOffice.org is a very fragile " - ewarn " build when it comes to CFLAGS. A number of flags have already " - ewarn " been filtered out. If you experience difficulty merging this " - ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to " - ewarn " merge again. " - ewarn - ewarn " Please note that this package now uses the LINGUAS environment " - ewarn " variable to provide localization. The old LANGUAGE=ENUS|PORT..." - ewarn " system does NOT work anymore." - ewarn - ewarn " If you want localized helpcontent, please download the correct file " - ewarn " for your language from an OpenOffice.org-mirror " - ewarn " (directory /contrib/helpcontent/ e.g.) and put it in your " - ewarn " /usr/portage/distfiles, the ebuild will use it automatically. " - ewarn - - set_languages -} - -set_languages () { - - strip-linguas en pt ru el nl fr es fi hu ca it cs sk da sv nb no pl de sl pt_BR th et ja ko zh_CN zh_TW tr hi_IN ar he - if [ -n "${LINGUAS}" ] ; then - # use the leftmost value - temp_lang=( ${LINGUAS} ) - primary_lang=${temp_lang[0]} - else - primary_lang="en" - fi - - case "${primary_lang}" in - en ) OOLANGNO=01; OOLANGNAME=ENUS; OOLFULLNAME="US English (default)" - ;; - pt ) OOLANGNO=03; OOLANGNAME=PORT; OOLFULLNAME=Portuguese - ;; - ru ) OOLANGNO=07; OOLANGNAME=RUSS; OOLFULLNAME=Russian - ;; - el ) OOLANGNO=30; OOLANGNAME=GREEK; OOLFULLNAME=Greek - ;; - nl ) OOLANGNO=31; OOLANGNAME=DTCH; OOLFULLNAME=Dutch - ;; - fr ) OOLANGNO=33; OOLANGNAME=FREN; OOLFULLNAME=French - ;; - es ) OOLANGNO=34; OOLANGNAME=SPAN; OOLFULLNAME=Spanish - ;; - fi ) OOLANGNO=35; OOLANGNAME=FINN; OOLFULLNAME=Finnish - ;; - hu ) OOLANGNO=36; OOLANGNAME=HUNG; OOLFULLNAME=Hungarian - ;; - ca ) OOLANGNO=37; OOLANGNAME=CAT; OOLFULLNAME=Catalan - ;; - it ) OOLANGNO=39; OOLANGNAME=ITAL; OOLFULLNAME=Italian - ;; - cs ) OOLANGNO=42; OOLANGNAME=CZECH; OOLFULLNAME=Czech - ;; - sk ) OOLANGNO=43; OOLANGNAME=SLOVAK; OOLFULLNAME=Slovak - ;; - da ) OOLANGNO=45; OOLANGNAME=DAN; OOLFULLNAME=Danish - ;; - sv ) OOLANGNO=46; OOLANGNAME=SWED; OOLFULLNAME=Swedish - ;; - no ) OOLANGNO=47; OOLANGNAME=NORBOK; OOLFULLNAME="Norwegian" - ;; - pl ) OOLANGNO=48; OOLANGNAME=POL; OOLFULLNAME=Polish - ;; - de ) OOLANGNO=49; OOLANGNAME=GER; OOLFULLNAME=German - ;; - sl ) OOLANGNO=50; OOLANGNAME=SLOVENIAN; OOLFULLNAME=Slovenian - ;; - pt_BR ) OOLANGNO=55; OOLANGNAME=PORTBR; OOLFULLNAME="Portuguese brazilian" - ;; - th ) OOLANGNO=66; OOLANGNAME=THAI; OOLFULLNAME=Thai - ;; - et ) OOLANGNO=77; OOLANGNAME=ESTONIAN; OOLFULLNAME=Estonian - ;; - ja ) OOLANGNO=81; OOLANGNAME=JAPN; OOLFULLNAME="Japanese" - ;; - ko ) OOLANGNO=82; OOLANGNAME=KOREAN; OOLFULLNAME=Korean - ;; - zh_CN ) OOLANGNO=86; OOLANGNAME=CHINSIM; OOLFULLNAME="Simplified Chinese (PRC)" - ;; - zh_TW ) OOLANGNO=88; OOLANGNAME=CHINTRAD; OOLFULLNAME="Traditional Chinese (taiwan)" - ;; - tr ) OOLANGNO=90; OOLANGNAME=TURK; OOLFULLNAME=Turkish - ;; - hi_IN ) OOLANGNO=91; OOLANGNAME=HINDI; OOLFULLNAME=Hindi - ;; - ar ) OOLANGNO=96; OOLANGNAME=ARAB; OOLFULLNAME=Arabic - ;; - he ) OOLANGNO=97; OOLANGNAME=HEBREW; OOLFULLNAME=Hebrew - ;; - esac - - einfo "Installing OpenOffice.org for ${OOLFULLNAME} environment." - -} - -oo_setup() { - - unset LANGUAGE - unset LANG - unset LC_ALL - - 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 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 - - cd ${S} - - #Still needed: The STLport patch - cp ${DISTDIR}/STLport-4.6.2.tar.gz ${S}/stlport/download || die - epatch ${FILESDIR}/${OO_VER}/newstlportfix.patch - - epatch ${FILESDIR}/${OO_VER}/gcc-instlib.patch - - #Another java problem - epatch ${FILESDIR}/${OO_VER}/javafix.patch - - # fix for bug #82385 - epatch ${FILESDIR}/${OO_VER}/getcompver.awk.patch - - #Allow building with libxslt >= 1.1.15 - use java || epatch ${FILESDIR}/${OO_VER}/build-new-xslt.diff - - # Security fix, bug #88863 - epatch ${FILESDIR}/${OO_VER}/cws-heapbug_CAN-2005-0941.diff - - # Workaround for bug #73940, may break debug use flag on ppc - if use ppc; then - epatch ${FILESDIR}/${OO_VER}/STLport-vector.patch - fi - - #Fix for nptl - if use nptl; then - epatch ${FILESDIR}/${OO_VER}/nptl.patch - fi - - #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" - - #Fix for hardened - if use hardened; then - epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch - epatch ${FILESDIR}/${OO_VER}/hardened-link.patch - epatch ${FILESDIR}/${OO_VER}/pyunolink-fix.patch - fi - - einfo "Installing / Scaling Icons" - ${PATCHDIR}/bin/scale-icons ${S} || die - cp -pPRf ${ICONDIR}/* ${S} || die - - einfo "Copying splash screens in place" - cp -pPRf ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die - - einfo "Copying libpwd tarball in build dir" - mkdir -p ${S}/libwpd/download/ || die - cp -pPRf ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die - - einfo "Munging font mappings ..." - ${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die -} - -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() { - - unset LIBC - addpredict "/bin" - addpredict "/root/.gconfd" - addpredict "/root/.gnome" - - # 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 - - #See if we use system-nas - if use nas - then - MYCONF="${MYCONF} --with-system-nas" - fi - - use kde && set-kdedir 3 - - # 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) - cd ${S}/config_office - rm -f config.cache || die - autoconf || die - - if [ "OOLANGNAME" != "ENUS" ]; then - OOLANGNAME="${OOLANGNAME},ENUS" - fi - - MYCONF="${MYCONF} --enable-libart \ - --enable-libsn \ - --enable-crashdump=no \ - --with-lang=${OOLANGNAME} \ - --without-fonts \ - --disable-rpath \ - --enable-fontconfig \ - --with-system-freetype \ - --with-system-xrender \ - --with-build-version=ooo-build-${PV} \ - --disable-mozilla" - - ./configure ${MYCONF} || die - - cd ${S} - get_EnvSet - - # unpack help files if present - if [ -f ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz ]; then - einfo "Using helpcontent for ${OOLFULLNAME}" - mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck - tar -xzf ${DISTDIR}/helpcontent_${OOLANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck - fi - - # Build as minimal as possible - export BUILD_MINIMAL="${OOLANGNO}" - - # Embedded python dies without Home set - if test "z${HOME}" = "z"; then - export HOME="" - fi - - #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="${CXXFLAGS}" - - 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" - addpredict "/root/.gnome" - - - # 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. - # - # <azarah@gentoo.org> (9 Sep 2002) - - # Autoresponse file for main installation - cat > ${T}/rsfile-global <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_NETWORK - INSTALLATIONTYPE=STANDARD - DESTINATIONPATH=<destdir> - OUTERPATH= - LOGFILE= - LANGUAGELIST=<LANGUAGE> - - [JAVA] - JavaSupport=preinstalled_or_none - END_RS - - # Autoresponse file for user installation - cat > ${T}/rsfile-local <<-"END_RS" - [ENVIRONMENT] - INSTALLATIONMODE=INSTALL_WORKSTATION - INSTALLATIONTYPE=WORKSTATION - DESTINATIONPATH=<home>/.xopenoffice/<pv> - - [JAVA] - JavaSupport=none - END_RS - - # Fixing install location in response file - sed -e "s|<destdir>|${D}${INSTDIR}|" \ - ${T}/rsfile-global > ${T}/autoresponse || die - - einfo "Installing Ximian-OpenOffice.org into build root..." - dodir ${INSTDIR} - cd ${S}/instsetoo/${SOLPATH}/${OOLANGNO}/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 - - 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 - - # Install user autoresponse file - insinto /etc/ximian-openoffice - sed -e "s|<pv>|${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|<pv>|${OO_VER}|g" \ - ${FILESDIR}/${OO_VER}/xooffice-wrapper-1.3 > ${T}/xooffice - doexe ${T}/xooffice - - # Component symlinks - for app in calc draw impress math web 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 - - 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() { - - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - - 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" -} diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild deleted file mode 100644 index ec97ec96ac68..000000000000 --- a/app-office/openoffice-ximian/openoffice-ximian-1.9.199.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2006 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.9.199.ebuild,v 1.5 2006/01/21 19:08:29 josejx Exp $ - -IUSE="" - -DESCRIPTION="Ximian-ized version of OpenOffice.org, a full office productivity suite - now deprecated" -HOMEPAGE="http://go-oo.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="ppc sparc x86" - -RDEPEND="" -DEPEND="${RDEPEND}" - -pkg_setup() { - - ewarn - ewarn " This package is now deprecated, please use app-office/openoffice " - ewarn " instead, which - starting from 2.0 - comes with all the extra stuff that " - ewarn " was previously only available in openoffice-ximian." - ewarn - ewarn " To do this you will have to unmerge openoffice-ximian first. If you " - ewarn " want to have a backup just for the case that something goes wrong " - ewarn " during the build process of app-office/openoffice, do: " - ewarn - ewarn " # quickpkg openoffice-ximian" - ewarn - ewarn " which builds a binary package. In case of a failure and that you fast " - ewarn " need a working version of OOo you can get the old version back " - ewarn " by issueing: " - ewarn - ewarn " # emerge -k =app-office/openoffice-ximian-1.3.9-r1 " - ewarn - ewarn " (Assuming the last version you used was 1.3.9-r1, if not just replace " - ewarn " the number) " - - die -} diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index bcce1d0481a3..35e6b76d4883 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,5 +1,15 @@ -MD5 152f249f2a8077c65438074e03108a68 ChangeLog 38996 +MD5 d03114b721e7bd418351ba4f9cc58ddf ChangeLog 39146 +RMD160 8caad52e4cda244d4d3d73c95977a58e31329c0d ChangeLog 39146 +SHA256 f5324ccb230b5021168f8da1c05fe6fdb34e2bb5efd71670ca8e470cdf81d3c3 ChangeLog 39146 MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222 +RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222 +SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222 MD5 395809eda113094fb17da00460aee420 files/digest-openoffice-2.0.1 552 +RMD160 ec99e7db715d6bf67db572f79bdaa027d89ef7ca files/digest-openoffice-2.0.1 552 +SHA256 224563b62f7bb7be50187171015a871c475d388efd2efbbef3c73a8b5d97821e files/digest-openoffice-2.0.1 552 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 -MD5 cdec342427182b8952c217eb60329541 openoffice-2.0.1.ebuild 7374 +RMD160 3e99c165e962e73417462c6df7a476a558b3ae18 metadata.xml 461 +SHA256 7a25927f2c830703539753c0f7295551795419ef0d05b72db505a2ac1094d291 metadata.xml 461 +MD5 e0b84ad20cd5795a797b5724116867ab openoffice-2.0.1.ebuild 7343 +RMD160 c349f07d83646395f109a312ace6972e0f38c538 openoffice-2.0.1.ebuild 7343 +SHA256 4a0f0c224ae1a0005ab5b4b9e568da3209a4f8f06d5a56e3d25e87466aab2934 openoffice-2.0.1.ebuild 7343 |