diff options
| -rw-r--r-- | extra/openoffice/.md5sum | 1 | ||||
| -rw-r--r-- | extra/openoffice/Pkgfile | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/extra/openoffice/.md5sum b/extra/openoffice/.md5sum index 84e239fce..f24736bf1 100644 --- a/extra/openoffice/.md5sum +++ b/extra/openoffice/.md5sum @@ -8,6 +8,7 @@ ac07730c9da958fefa8bf673f81ddc90 OpenOffice.org-3.2.0-default-no-registration.p c8e82b4d2324fe62ad8c6e29213e80b5 buildfix-gcc44.diff 863a3ab2c17a3d11b8fa3ec321986366 buildfix_FormulaMissingHeader.diff 0cd6f3525939d3ef6e5a30ad30c25d27 buildfix_system_db48.diff +e666e8cea0ef557a8bce41c58dd16408 cppu-lbnames-enable-gcc-4.5.diff 71f136a31e296a04ab68932a31dd533e default-no-startup-wizard.diff 6c596129fb48316226ce3adfd3a4c86d default-system-fpicker.diff 1dc7480a04f572ad136d35923a2af66d soffice-detect-mozilla-certificates.diff diff --git a/extra/openoffice/Pkgfile b/extra/openoffice/Pkgfile index d95a5d210..7c21e3091 100644 --- a/extra/openoffice/Pkgfile +++ b/extra/openoffice/Pkgfile @@ -6,14 +6,15 @@ name=openoffice version=3.2.0 -release=1 +release=2 OOdir=OOO320_m12 source=(http://download.services.openoffice.org/files/stable/$version/OOo_${version}_src_{core,system,l10n,extensions,binfilter}.tar.bz2 \ http://www.paldo.org/paldo/sources/OpenOffice.org/OpenOffice.org-${version}-default-no-registration.patch.bz2 \ http://www.paldo.org/paldo/sources/OpenOffice.org/OpenOffice.org-${version}-default-large-buttons.patch.bz2 \ startcenter.desktop default-no-startup-wizard.diff default-system-fpicker.diff \ - soffice-detect-mozilla-certificates.diff buildfix-gcc44.diff buildfix_FormulaMissingHeader.diff buildfix_system_db48.diff) + soffice-detect-mozilla-certificates.diff buildfix-gcc44.diff buildfix_FormulaMissingHeader.diff buildfix_system_db48.diff\ + http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff) build() { install -D -m644 startcenter.desktop \ @@ -31,6 +32,8 @@ build() { patch -Np0 -i $SRC/default-no-startup-wizard.diff patch -Np0 -i $SRC/default-system-fpicker.diff patch -Np0 -i $SRC/OpenOffice.org-3.2.0-default-large-buttons.patch + # gcc4.5 fix + patch -Np0 -i $SRC/cppu-lbnames-enable-gcc-4.5.diff cd $SRC/$OOdir ./configure --prefix=/usr --sysconfdir=/etc --disable-graphite --disable-ldap --disable-mozilla --disable-odk \ @@ -44,7 +47,7 @@ build() { # Build dmake utility ./bootstrap cd instsetoo_native/util - build.pl --dlv_switch -link --all -P1 -- -P1 -s + build.pl --dlv_switch -link --all -P4 -- -P4 -s # install binaries cp -R ../unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/ ## Step 1 |