From: Andreas Proschofsky Date: Tue, 11 Oct 2005 05:55:53 +0000 (+0000) Subject: Release Candidate for OpenOffice.org 2.0 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d185dabee2391cfcbdf11b3e281aac041d9d2f3;p=gentoo.git Release Candidate for OpenOffice.org 2.0 Package-Manager: portage-2.0.53_rc5 --- diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index c638765323d5..557ee7b6a055 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.126 2005/09/24 07:27:54 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.127 2005/10/11 05:55:53 suka Exp $ + +*openoffice-2.0.0_rc2 (11 Oct 2005) + + 11 Oct 2005; Andreas Proschofsky + +files/2.0.0/gentoo-2.0.0_rc2.diff, +openoffice-2.0.0_rc2.ebuild: + Release Candidate for OpenOffice.org 2.0, still masked, should work fine + though. 24 Sep 2005; Andreas Proschofsky openoffice-1.1.5.ebuild: diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 40f99d863da5..64e44a776e89 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,38 +1,41 @@ -MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 -MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 -MD5 019d5cf16206f4bd8eee6ee78eae0ab8 ChangeLog 27899 -MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 -MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 -MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 -MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342 -MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475 -MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659 -MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393 -MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092 -MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382 -MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576 -MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418 +MD5 079c081b654a3dc9e287d594d763f363 ChangeLog 28143 +MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598 -MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329 -MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766 -MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785 +MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393 +MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405 -MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472 +MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342 +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 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342 -MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 -MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 +MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785 +MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659 +MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092 +MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133 +MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475 +MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472 +MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650 +MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766 MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393 -MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 -MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382 -MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576 -MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.5/gcc34-nojava-fix.patch 329 -MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 -MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766 -MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785 -MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.5/gcc34-sal-link-to-libsupc++.diff 405 -MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472 +MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342 +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 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785 +MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659 +MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092 +MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133 +MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475 +MD5 451ba8a0ffcf837d73ff47b26205e931 files/2.0.0/gentoo-2.0.0_rc2.diff 1034 +MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325 +MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322 +MD5 c42ff313cdc05c1102bbe41e5d9d5f07 files/digest-openoffice-2.0.0_rc2 414 +MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 +MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561 +MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566 +MD5 c961555d63b8316b924669628cad3d87 openoffice-2.0.0_rc2.ebuild 6900 diff --git a/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff new file mode 100644 index 000000000000..b21d0fd7b69d --- /dev/null +++ b/app-office/openoffice/files/2.0.0/gentoo-2.0.0_rc2.diff @@ -0,0 +1,40 @@ +--- patches/OOO_2_0/apply ++++ patches/OOO_2_0/apply +@@ -356,9 +356,6 @@ + [ NotDebian ] + # Fix the system default fpicker + default-system-fpicker.diff +-# don't display File->Wizards-> install dictionaries/fonts - +-# makes no sense on Linux n#74249 +-default-no-install-wizards.diff + + [ DebianBaseOnly ] + odk-remove-non-free.diff +@@ -733,6 +730,7 @@ + [ GentooOnly ] + version-2-0-sysuserconfig.diff + gentoo-splash.diff ++no-fontooo-wizard.diff + + # + # NOTE: 64 bit OOo is work in progress! +--- distro-configs/Common.conf.in.old 2005-07-27 19:33:53.000000000 +0200 ++++ distro-configs/Common.conf.in 2005-08-24 19:10:33.000000000 +0200 +@@ -2,17 +2,10 @@ + --disable-crashdump + --disable-epm + --enable-crashdump=no +---enable-openldap + --with-build-version=\"Build @OOO_BUILDVERSION@\" + --with-lang=\"@OOO_LANGS@\" + --without-fonts + --without-gpc + --with-system-freetype + --with-system-gcc +---with-system-jpeg +---with-system-libxml +---with-system-mozilla +---with-system-python +---with-system-zlib +---enable-evolution2 + @CAIRO_CONFIGURE_FLAG@ diff --git a/app-office/openoffice/files/digest-openoffice-2.0.0_rc2 b/app-office/openoffice/files/digest-openoffice-2.0.0_rc2 new file mode 100644 index 000000000000..401d0aadf074 --- /dev/null +++ b/app-office/openoffice/files/digest-openoffice-2.0.0_rc2 @@ -0,0 +1,6 @@ +MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740 +MD5 b02c7bc05031f4fb7ac15c8a31a01ef4 ooo-build-2.0.rc2.tar.gz 4142886 +MD5 953371e1907b03e14895bababd019443 ooo680-m2-core.tar.bz2 156979138 +MD5 793c55bcf17e52b7d888729f55d984b6 ooo680-m2-lang.tar.bz2 33104453 +MD5 e5ec50d3c1b78d6880037d88036657e5 ooo680-m2-system.tar.bz2 19325507 +MD5 586d0f26b3f79d89bbb5b25b874e3df6 ooo_crystal_images-6.tar.bz2 1308872 diff --git a/app-office/openoffice/openoffice-2.0.0_rc2.ebuild b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild new file mode 100644 index 000000000000..09cb0622fc15 --- /dev/null +++ b/app-office/openoffice/openoffice-2.0.0_rc2.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.0_rc2.ebuild,v 1.1 2005/10/11 05:55:53 suka Exp $ + +inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs + +IUSE="curl eds gnome java kde ldap mozilla nas python zlib xml2" + +OO_VER="${PV/_rc2}" +MY_PV="2.0.rc2" +PATCHLEVEL="OOO680" +KDE_ICON_VER="6" +PATCHDIR="${WORKDIR}/ooo-build-${MY_PV}" +SRC="ooo680-m2" +S="${WORKDIR}/${SRC}" +CONFFILE="${PATCHDIR}/distro-configs/Gentoo.conf.in" +DESCRIPTION="OpenOffice.org, a full office productivity suite." + +SRC_URI="http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-core.tar.bz2 + http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-system.tar.bz2 + http://go-oo.org/packages/${PATCHLEVEL}/${SRC}-lang.tar.bz2 + http://go-oo.org/packages/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz + kde? ( http://go-oo.org/packages/${PATCHLEVEL}/ooo_crystal_images-${KDE_ICON_VER}.tar.bz2 ) + http://go-oo.org/packages/SRC680/extras-2.tar.bz2" + +HOMEPAGE="http://go-oo.org" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~x86" + +RDEPEND="!app-office/openoffice-bin + !app-office/openoffice-ximian-bin + !app-office/openoffice-ximian + virtual/x11 + virtual/libc + >=dev-lang/perl-5.0 + gnome? ( >=x11-libs/gtk+-2.4 + >=gnome-base/gnome-vfs-2.6 + >=gnome-base/gconf-2.0 ) + eds? ( >=gnome-extra/evolution-data-server-1.2 ) + kde? ( kde-base/kdelibs ) + >=x11-libs/startup-notification-0.5 + >=media-libs/freetype-2.1.4 + >=media-libs/fontconfig-2.2.0 + media-libs/libpng + sys-devel/flex + sys-devel/bison + app-arch/zip + app-arch/unzip + dev-libs/expat + java? ( =virtual/jre-1.4* ) + >=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} + net-print/cups + >=sys-apps/findutils-4.1.20-r1 + app-shells/tcsh + dev-perl/Archive-Zip + dev-util/pkgconfig + dev-util/intltool + curl? ( >=net-misc/curl-7.9.8 ) + nas? ( >=media-libs/nas-1.6 ) + zlib? ( sys-libs/zlib ) + sys-libs/pam + !dev-util/dmake + java? ( =virtual/jdk-1.4* + dev-java/ant-core ) + !java? ( dev-libs/libxslt ) + ldap? ( net-nds/openldap ) + python? ( >=dev-lang/python-2.3.4 ) + xml2? ( >=dev-libs/libxml2-2.0 )" + +PROVIDE="virtual/ooo" + +pkg_setup() { + + ewarn + ewarn " This is a pre-release, so expect stuff to be broken, in fact there are " + ewarn " known problems. To sum it up: Good luck, you are on your own. " + + 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. Also note that building OOo takes a lot of time and " + ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are " + ewarn " the minimum requirements. If you have less, use openoffice-bin " + ewarn " instead. " + ewarn + + strip-linguas af ar be_BY bg bn br ca cs cy da de el en en_GB en_US es et fi fr ga gu_IN he hi_IN hr hu it ja km ko lt nb ne nl nn ns pa_IN pl pt pt_BR ru sh_YU sk sl sr_CS sv th tn tr vi xh zh_CN zh_TW zu + + if [ -z "${LINGUAS}" ]; then + export LINGUAS_OOO="en-US" + ewarn " To get a localized build, set the according LINGUAS variable(s). " + ewarn + else + export LINGUAS_OOO="${LINGUAS//_/-}" + export LINGUAS_OOO="${LINGUAS//en /en-US }" + fi + + if use !java; then + ewarn " You are building with java-support disabled, this results in some " + ewarn " of the OpenOffice.org functionality (i.e. help) being disabled. " + ewarn " If something you need does not work for you, rebuild with " + ewarn " java in your USE-flags " + ewarn + fi + +} + +src_unpack() { + + cd ${WORKDIR} + unpack ooo-build-${MY_PV}.tar.gz + + #Some fixes for our patchset + cd ${PATCHDIR} + epatch ${FILESDIR}/${OO_VER}/gentoo-${PV}.diff + + #Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only + use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo" + + #Use flag checks + use java && echo "--with-jdk-home=${JAVA_HOME} --with-ant-home=${ANT_HOME}" >> ${CONFFILE} || echo "--without-java" >> ${CONFFILE} + + echo "`use_with curl system-curl`" >> ${CONFFILE} + echo "`use_with nas system-nas`" >> ${CONFFILE} + echo "`use_with python system-python`" >> ${CONFFILE} + echo "`use_with xml2 system-libxml`" >> ${CONFFILE} + echo "`use_with zlib system-zlib`" >> ${CONFFILE} + + echo "`use_with mozilla system-mozilla`" >> ${CONFFILE} + echo "`use_enable mozilla`" >> ${CONFFILE} + + echo "`use_enable ldap openldap`" >> ${CONFFILE} + echo "`use_enable eds evolution2`" >> ${CONFFILE} + echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE} + echo "`use_enable gnome lockdown`" >> ${CONFFILE} + +} + +src_compile() { + + unset LIBC + addpredict "/bin" + addpredict "/root/.gconfd" + addpredict "/root/.gnome" + + # Should the build use multiprocessing? Not enabled by default, as it tends to break + if [ "${WANT_DISTCC}" == "true" ]; then + export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j[ ]{0,1}\([0-9]\+\).*/\1/"` + fi + + cd ${PATCHDIR} + autoconf || die + ./configure ${MYCONF} \ + --with-distro="${DISTRO}" \ + --with-vendor="Gentoo" \ + --with-arch="${ARCH}" \ + --with-tag="${SRC}" \ + --with-srcdir="${DISTDIR}" \ + --with-lang="${LINGUAS_OOO}" \ + --with-num-cpus="${JOBS}" \ + --with-binsuffix="2" \ + --with-installed-ooo-dirname="openoffice" \ + `use_enable gnome gtk` \ + `use_enable kde` \ + --disable-access \ + --disable-mono \ + --disable-cairo \ + || die "Configuration failed!" + + # 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" + replace-flags "-O3" "-O2" + replace-flags "-Os" "-O2" + + # Now for our optimization flags ... + export ARCH_FLAGS="${CFLAGS}" + + einfo "Building OpenOffice.org..." + use kde && set-kdedir 3 + make || die "Build failed" + +} + +src_install() { + + einfo "Preparing Installation" + cd ${PATCHDIR} + make DESTDIR=${D} install || die "Installation failed!" + + #Correcting location of menu entries, this should really be handled in ooo-build / setup.in + mkdir ${D}/usr/share/applications + mv ${D}/opt/gnome/share/applications/* ${D}/usr/share/applications/ + rmdir ${D}/opt/gnome/share/applications/ -p + + # Install corrected Symbol Font + insinto /usr/share/fonts/TTF/ + doins ${PATCHDIR}/fonts/*.ttf + +} + +pkg_postinst() { + + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + + einfo " To start OpenOffice.org, run:" + einfo + einfo " $ ooffice2" + einfo + einfo " Also, for individual components, you can use any of:" + einfo + einfo " oobase2, oocalc2, oodraw2, oofromtemplate2, ooimpress2, oomath2," + einfo " ooweb2 or oowriter2" +}