diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-01-17 17:08:23 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-01-17 17:08:23 +0000 |
| commit | afa6a46089be98eae27d729e7cfa9afa07a10fb0 (patch) | |
| tree | aa0d652099ece59b071a2de319ddd3f3592c22d2 /app-office | |
| parent | Bumped revision. Fixed copyright headers. Closes bug 28813 (diff) | |
| download | historical-afa6a46089be98eae27d729e7cfa9afa07a10fb0.tar.gz historical-afa6a46089be98eae27d729e7cfa9afa07a10fb0.tar.bz2 historical-afa6a46089be98eae27d729e7cfa9afa07a10fb0.zip | |
bug fixes
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.1.0-r2.ebuild | 21 |
3 files changed, 19 insertions, 14 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 2e1e458b0274..cd127d5e88f9 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.51 2003/11/14 19:37:22 bazik Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.52 2004/01/17 17:08:23 suka Exp $ + + 17 Jan 2004; <suka@gentoo.org> openoffice-1.1.0-r2.ebuild: + Compile fixes especially for Pentium4, also closes bug #32418 (broken menu + entry) 14 Nov 2003; Sven Blumenstein <bazik@gentoo.org> openoffice-1.1.0-r2.ebuild: Removed -r3 and added the change to -r2 to make seemant happy diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 41e8b6de0a84..8a699a3df420 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,8 +1,8 @@ -MD5 0f0c3ad86484104253f493cf8cb8e48b openoffice-1.1.0-r2.ebuild 20078 +MD5 40faa470e772b471249d094ac09b264e openoffice-1.1.0-r2.ebuild 20277 MD5 c0a6d36a7529f0a22bae30399b11bc5d openoffice-1.0.3-r1.ebuild 21888 MD5 b9784ec8b39fd6b0f6f7c27a8eb77da5 openoffice-1.1.0-r1.ebuild 19871 MD5 f077d92e54b1d2ca2b657c9c1b04471d openoffice-1.1.0.ebuild 19836 -MD5 9b33195ce9a5b063e135ac2c25f20f27 ChangeLog 12130 +MD5 45e708894452ab9a863b8e95b5a7c3b7 ChangeLog 12277 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0 195 MD5 b1ec8fd75e9b93ccf4a4f0c926de5199 files/digest-openoffice-1.0.3-r1 330 diff --git a/app-office/openoffice/openoffice-1.1.0-r2.ebuild b/app-office/openoffice/openoffice-1.1.0-r2.ebuild index c60e8f8468ea..7c97b56d7faa 100644 --- a/app-office/openoffice/openoffice-1.1.0-r2.ebuild +++ b/app-office/openoffice/openoffice-1.1.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r2.ebuild,v 1.6 2003/11/14 19:37:24 bazik Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r2.ebuild,v 1.7 2004/01/17 17:08:23 suka Exp $ # IMPORTANT: This is extremely alpha!!! @@ -30,6 +30,7 @@ inherit flag-o-matic eutils # Compile problems with these ... filter-flags "-funroll-loops" filter-flags "-fomit-frame-pointer" +filter-flags "-fprefetch-loop-arrays" append-flags "-fno-strict-aliasing" replace-flags "-O3" "-O2" @@ -293,7 +294,10 @@ src_unpack() { # einfo "Removing crashrep from the installed set" # sed -i -e "s,\(crashrep \),," ${S}/instsetoo/prj/build.lst - + 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 ... perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \ @@ -330,11 +334,6 @@ get_EnvSet() { src_compile() { - 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 - addpredict /bin addpredict /root/.gconfd local buildcmd="" @@ -593,8 +592,9 @@ src_install() { for x in ${D}${INSTDIR}/share/gnome/net/*.desktop do - # We have to handle setup differently + # We have to handle soffice and setup differently perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x} + perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x} # Now fix the rest perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x} doins ${x} @@ -614,8 +614,9 @@ src_install() { for x in ${kdeloc}/*.desktop do - # We have to handle setup differently + # We have to handle soffice and setup differently perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x} + perl -pi -e "s:${INSTDIR}/program/soffice:/usr/bin/ooffice:g" ${x} # Now fix the rest perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x} doins ${x} |