From d1f50a6ce0d3ad4540268c8077fde2c3dd9caacb Mon Sep 17 00:00:00 2001 From: tnut Date: Wed, 3 Mar 2010 22:46:46 +0100 Subject: Maj openoffice#3.2.0-1 --- test/openoffice/.md5sum | 25 +-- test/openoffice/Pkgfile | 189 +++++++-------------- test/openoffice/buildfix-gcc44.diff | 10 ++ test/openoffice/buildfix_FormulaMissingHeader.diff | 10 ++ test/openoffice/buildfix_system_db48.diff | 11 ++ test/openoffice/default-no-startup-wizard.diff | 0 test/openoffice/default-system-fpicker.diff | 0 test/openoffice/openoffice.install | 26 +++ test/openoffice/openoffice.profile | 2 + .../soffice-detect-mozilla-certificates.diff | 0 test/openoffice/startcenter.desktop | 48 ++++++ 11 files changed, 184 insertions(+), 137 deletions(-) create mode 100644 test/openoffice/buildfix-gcc44.diff create mode 100644 test/openoffice/buildfix_FormulaMissingHeader.diff create mode 100644 test/openoffice/buildfix_system_db48.diff mode change 100755 => 100644 test/openoffice/default-no-startup-wizard.diff mode change 100755 => 100644 test/openoffice/default-system-fpicker.diff create mode 100644 test/openoffice/openoffice.install create mode 100644 test/openoffice/openoffice.profile mode change 100755 => 100644 test/openoffice/soffice-detect-mozilla-certificates.diff create mode 100644 test/openoffice/startcenter.desktop (limited to 'test') diff --git a/test/openoffice/.md5sum b/test/openoffice/.md5sum index 801ff3667..84e239fce 100644 --- a/test/openoffice/.md5sum +++ b/test/openoffice/.md5sum @@ -1,13 +1,14 @@ -483767bf510f11d55a7acd86b80777a2 OOo_3.1.1_src_binfilter.tar.bz2 -2cc0bcd0bfe6448c415aebb1f4768c10 OOo_3.1.1_src_core.tar.bz2 -0fbfb36fcd7b2e5d0d9c14daca44b0b0 OOo_3.1.1_src_extensions.tar.bz2 -ff1c2b90c315b0482a775cd7c30668e5 OOo_3.1.1_src_l10n.tar.bz2 -baa694f23f77f6e270fa455254cc690f OOo_3.1.1_src_system.tar.bz2 -bf7119084a2d1e0566b5e34b57dce8eb buildfix-gcc43.diff -4fe2810b40358b0e7dc2df3d056bde7a buildfix-openjdk-6-no-rhino.diff -a8b96e9d0ce92a8f6690f277b1cfacc9 libxmlsec-findcerts.diff -8ed31aa04cac6177bd34df7fa7da55d8 ooffice.desktop -5581f934888aa32e10d6cfe94827b392 ooo_getline.diff -235050360aa2b5fd2069669ab90b99a7 shell.patch +12560444c8a1d2eec4b68fe80472f1c9 OOo_3.2.0_src_binfilter.tar.bz2 +2094d07c26d2ffcf22e131658a531c67 OOo_3.2.0_src_core.tar.bz2 +586d4c9607a992169820fcccb1f5cc00 OOo_3.2.0_src_extensions.tar.bz2 +561ab60f79b0a25e90b68779227ef707 OOo_3.2.0_src_l10n.tar.bz2 +f6a738e87adf98ee4a14193f982c97e1 OOo_3.2.0_src_system.tar.bz2 +9a6d8004a927f9b4df612bf8a15cc71c OpenOffice.org-3.2.0-default-large-buttons.patch.bz2 +ac07730c9da958fefa8bf673f81ddc90 OpenOffice.org-3.2.0-default-no-registration.patch.bz2 +c8e82b4d2324fe62ad8c6e29213e80b5 buildfix-gcc44.diff +863a3ab2c17a3d11b8fa3ec321986366 buildfix_FormulaMissingHeader.diff +0cd6f3525939d3ef6e5a30ad30c25d27 buildfix_system_db48.diff +71f136a31e296a04ab68932a31dd533e default-no-startup-wizard.diff +6c596129fb48316226ce3adfd3a4c86d default-system-fpicker.diff 1dc7480a04f572ad136d35923a2af66d soffice-detect-mozilla-certificates.diff -4addae44d20bb2b247e429d88b66a4c1 system_hsqldb.diff +63209bbc64c901ef105455bda0282f45 startcenter.desktop diff --git a/test/openoffice/Pkgfile b/test/openoffice/Pkgfile index 92d80727d..d95a5d210 100644 --- a/test/openoffice/Pkgfile +++ b/test/openoffice/Pkgfile @@ -1,136 +1,75 @@ -# Description: Suite complète de office en logiciel libre -# URL: http://www.openoffice.org -# Packager: Sibelle at free dot fr -# Maintainer: NuTyX packager team -# Depends on: curl, python, libxslt, libpthread-stubs, gperf, ant, p5-archive-zip, libsndfile +# Description: Suite complète de office en logiciel libre +# URL: http://www.openoffice.org +# Packager: Sibelle at free dot fr +# Maintainer: NuTyX packager team +# Depends on: imagemagick, linux-pam, libart_lgpl, xorg-libxtst, p5-archive-zip, cairo, libwpd, cups, curl, python, xorg-libxaw, neon, dbus-glib, icu, libxslt, hicolor-icon-theme, desktop-file-utils, boost, gtk, libsndfile + name=openoffice -version=3.1.1 +version=3.2.0 release=1 -OOdir=OOO310_m19 -#source=() -source=( ftp://ftp.gwdg.de/pub/openoffice/stable/$version/OOo_${version}_src_core.tar.bz2\ - http://ftp.gwdg.de/pub/openoffice/stable/$version/OOo_${version}_src_system.tar.bz2\ - #http://www.linuxfromscratch.org/patches/blfs/svn/OOo_2.3.1-use_bin_hsqldb-1.patch\ - ftp://ftp.gwdg.de/pub/openoffice/stable/$version/OOo_${version}_src_l10n.tar.bz2 \ - buildfix-gcc43.diff system_hsqldb.diff buildfix-openjdk-6-no-rhino.diff libxmlsec-findcerts.diff \ - soffice-detect-mozilla-certificates.diff shell.patch \ - ftp://ftp.gwdg.de/pub/openoffice/stable/$version/OOo_${version}_src_extensions.tar.bz2\ - ftp://ftp.gwdg.de/pub/openoffice/stable/$version/OOo_${version}_src_binfilter.tar.bz2\ - ooffice.desktop ooo_getline.diff) +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) + build() { - install -D -m644 ooffice.desktop \ - $PKG/usr/share/ede/programs/Applications/ooffice.desktop - source /etc/profile - mkdir -p $PKG/opt - mkdir -p $PKG/usr/bin + install -D -m644 startcenter.desktop \ + $PKG/usr/share/ede/programs/Applications/startcenter.desktop + mkdir -p $PKG/opt + mkdir -p $PKG/usr/bin mkdir -p $PKG/usr/share/icons mkdir -p $PKG/usr/share/applications - cd $OOdir - - # build fixes - patch -Np0 -i ../ooo_getline.diff -# patch -Np0 -i ../buildfix-gcc43.diff -# patch -Np0 -i ../system_hsqldb.diff -# patch -Np0 -i ../buildfix-openjdk-6-no-rhino.diff - - # allows xmlsec to be able to read the format of the digital certificates. -# patch -Np0 -i ../libxmlsec-findcerts.diff - # allows soffice to find the user's firefox profile so that it can read - # his digital certificates. Nss stores digital certificates in your mozilla firefox profile. -# patch -Np0 -i ../soffice-detect-mozilla-certificates.diff - - # important bugfixes - # try to fix non-gtk integration - #patch -Np0 -i ../shell.patch + bzip2 -d $SRC/OpenOffice.org-3.2.0-default-no-registration.patch.bz2 + bzip2 -d $SRC/OpenOffice.org-3.2.0-default-large-buttons.patch.bz2 + cd $OOdir - #patch -Np0 -i ../internal-db-no-java_oog680_m9.diff -# cd config_office - -# autoreconf -v + patch -Np0 -i $SRC/OpenOffice.org-3.2.0-default-no-registration.patch + 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 - ./configure --prefix=/opt/openoffice3 \ - --enable-libart \ - --disable-fontooo \ - --disable-gnome-vfs \ - --without-fonts \ - --with-system-stdlibs \ - --without-system-jars \ - --with-system-freetype \ - --with-system-expat \ - --with-system-libxml \ - --with-system-zlib \ - --enable-cairo \ - --enable-build-mozilla \ - --with-build-version=BLFS \ - --with-package-format=native \ - --disable-binfilter \ - --disable-odk \ - --disable-qadevooo \ - --with-java-home=${JAVA_HOME} \ - --with-jdk-home=${JAVA_HOME} \ - --disable-mozilla \ - --with-ant-home=/opt/ant \ - --with-system-python \ - --with-system-cairo\ - --with-system-curl \ - --disable-pam \ - --with-system-jpeg \ - --disable-neon \ - --with-system-sndfile \ - --with-lang="fr" \ - --with-arch=x86 \ - --exec-prefix=/usr/bin \ - --with-use-shell=bash \ - --without-myspell-dicts \ - --enable-pdfimport \ - --enable-qadevooo \ - --disable-kde \ - --disable-kdeab \ - --with-dict=ALL \ - --with-vendor="NuTyX" -# cd .. + cd $SRC/$OOdir + ./configure --prefix=/usr --sysconfdir=/etc --disable-graphite --disable-ldap --disable-mozilla --disable-odk \ + --disable-qadevooo --disable-fontooo --disable-systray --enable-dbus --disable-gnome-vfs --enable-gio --disable-build-mozilla --disable-binfilter --without-agg --without-gpc --without-fonts --without-ppds \ + --without-afms --with-package-format=native --with-system-libs --without-system-lucene --without-system-hsqldb --without-system-beanshell --without-system-saxon --with-system-boost \ + --without-system-hunspell --without-system-altlinuxhyph --without-system-lpsolve --without-stlport4 --without-java --with-lang="fr" --with-arch=x86 --with-use-shell=bash --with-alloc=system + # umask 0022 - unset LANG LC_ALL -# patch -Np1 -i ../OOo_2.3.1-use_bin_hsqldb-1.patch - ./bootstrap - . LinuxX86Env.Set.sh -# source LinuxX86Env.Set.sh -# ./bootstrap ave - - cp /usr/include/X11/extensions/Xrender.h x11_extensions/inc/Xrender.h - dmake -# pushd instsetoo_native/unxlngi6.pro/OpenOffice/inative/install/fr/linux-2.6-intel/buildroot/opt - -# cp -r /home/ooo-compile/openoffice-fr/src/$OOdir $SRC/ -# cd $OOdir - - cp -r -v instsetoo_native/unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/ -# popd - cd $PKG/opt - mv openoffice.org3 openoffice3 + unset LANG LC_ALL + source LinuxX86Env.Set.sh + # Build dmake utility + ./bootstrap + cd instsetoo_native/util + build.pl --dlv_switch -link --all -P1 -- -P1 -s + # install binaries + cp -R ../unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/ + ## Step 1 + cd $PKG/opt + mv openoffice.org3 openoffice3 for appl in sbase scalc sdraw simpress smath soffice spadmin swriter - do - ln -v -sf /opt/openoffice3/program/$appl $PKG/usr/bin/$appl - done - cd ../../src/$OOdir/ - cd sysui/desktop/icons - install -v -d $PKG/usr/share/icons/{hicolor,locolor} -m755 - cp -r -v hicolor/*x* $PKG/usr/share/icons/hicolor - cp -r -v locolor/*x* $PKG/usr/share/icons/locolor - - install -v -d /usr/share/applications -m 755 && - cd $PKG/opt/openoffice3/share/xdg/ - chmod 644 * - for appl in *.desktop - do - sed -i '/Exec/d' $appl - echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl - sed -i '/Icon/d' $appl - echo "Icon=`echo $appl | sed 's/.desktop//'`" >> $appl - done - sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop && - chmod 444 * - cp -v *.desktop $PKG/usr/share/applications - + do + ln -v -sf /opt/openoffice3/program/$appl $PKG/usr/bin/$appl + done + ## Icons + cd $SRC/$OOdir/sysui/desktop/icons + install -v -d $PKG/usr/share/icons/{hicolor,locolor} -m755 + cp -r -v hicolor/*x* $PKG/usr/share/icons/hicolor + cp -r -v locolor/*x* $PKG/usr/share/icons/locolor + ## desktop files + cd $PKG/opt/openoffice3/share/xdg/ + chmod 644 * + for appl in *.desktop + do + sed -i '/Exec/d' $appl + echo "Exec=/usr/bin/s`echo $appl | sed 's/.desktop//'`" >> $appl + sed -i '/Icon/d' $appl + echo "Icon=`echo $appl | sed 's/.desktop//'`" >> $appl + done + sed -i 's@bin/sprinteradmin@bin/spadmin@' printeradmin.desktop && + chmod 444 * + cp -v *.desktop $PKG/usr/share/applications } diff --git a/test/openoffice/buildfix-gcc44.diff b/test/openoffice/buildfix-gcc44.diff new file mode 100644 index 000000000..01520a70e --- /dev/null +++ b/test/openoffice/buildfix-gcc44.diff @@ -0,0 +1,10 @@ +--- oox/source/token/tokenmap.cxx 2009-09-28 06:35:40.000000000 +0000 ++++ oox/source/token/tokenmap.cxx.new 2009-09-28 10:12:00.996437647 +0000 +@@ -33,6 +33,7 @@ + #include + #include "tokens.hxx" + #include "oox/helper/containerhelper.hxx" ++#include + + using ::rtl::OString; + using ::rtl::OUString; diff --git a/test/openoffice/buildfix_FormulaMissingHeader.diff b/test/openoffice/buildfix_FormulaMissingHeader.diff new file mode 100644 index 000000000..85c046b34 --- /dev/null +++ b/test/openoffice/buildfix_FormulaMissingHeader.diff @@ -0,0 +1,10 @@ +--- formula/inc/formula/tokenarray.hxx 2009-01-17 00:12:44.000000000 +0000 ++++ formula/inc/formula/tokenarray.hxx.new 2009-01-17 17:10:20.850652556 +0000 +@@ -35,6 +35,7 @@ + #include "formula/ExternalReferenceHelper.hxx" + #include + #include ++#include + + namespace formula + { diff --git a/test/openoffice/buildfix_system_db48.diff b/test/openoffice/buildfix_system_db48.diff new file mode 100644 index 000000000..c7378fb7a --- /dev/null +++ b/test/openoffice/buildfix_system_db48.diff @@ -0,0 +1,11 @@ +--- configure.in 2009-08-25 15:10:12.000000000 +0000 ++++ configure.in.new 2009-09-27 17:43:11.207515081 +0000 +@@ -3626,7 +3626,7 @@ + ], [] + ) + AC_MSG_CHECKING([whether db is at least 4.1]) +- for v in `seq 1 7`; do ++ for v in `seq 1 8`; do + AC_TRY_RUN([ + #include + diff --git a/test/openoffice/default-no-startup-wizard.diff b/test/openoffice/default-no-startup-wizard.diff old mode 100755 new mode 100644 diff --git a/test/openoffice/default-system-fpicker.diff b/test/openoffice/default-system-fpicker.diff old mode 100755 new mode 100644 diff --git a/test/openoffice/openoffice.install b/test/openoffice/openoffice.install new file mode 100644 index 000000000..94a8d6432 --- /dev/null +++ b/test/openoffice/openoffice.install @@ -0,0 +1,26 @@ +post_install() { + +gtk-update-icon-cache -f -q /usr/share/icons/hicolor +update-desktop-database -q + +echo " * check /etc/profile.d/openoffice.sh, then relogin or \"source\" the file" +echo " * see http://wiki.archlinux.org/index.php/Openoffice" +echo " how to use extensions, e.g. for spell checking" +echo " see /usr/lib/openoffice/share/extension/install what" +echo " is shipped with this package" +echo " * make sure you have installed a ttf font (ttf-dejavu recommended)" +} + +post_upgrade() { + post_install $1 +} + +post_remove() { +update-desktop-database -q +gtk-update-icon-cache -f -q /usr/share/icons/hicolor + +# make sure everything is gone, maybe someone has installed +# extensions for all users using unopkg --shared +rm -rf /usr/lib/openoffice +} + diff --git a/test/openoffice/openoffice.profile b/test/openoffice/openoffice.profile new file mode 100644 index 000000000..fb85bcb17 --- /dev/null +++ b/test/openoffice/openoffice.profile @@ -0,0 +1,2 @@ +export OOO_FORCE_DESKTOP=gnome +#export OOO_FORCE_DESKTOP=KDE4 \ No newline at end of file diff --git a/test/openoffice/soffice-detect-mozilla-certificates.diff b/test/openoffice/soffice-detect-mozilla-certificates.diff old mode 100755 new mode 100644 diff --git a/test/openoffice/startcenter.desktop b/test/openoffice/startcenter.desktop new file mode 100644 index 000000000..552f06dd5 --- /dev/null +++ b/test/openoffice/startcenter.desktop @@ -0,0 +1,48 @@ +[Desktop Entry] +Version=1.0 +Terminal=false +TryExec=ooffice +Exec=openoffice.org3 %U +Icon=startcenter +Type=Application +Categories=Office;X-SuSE-Core-Office; +StartupNotify=false +InitialPreference=5 +Name=OpenOffice.org 3.2 +Name[af]=OpenOffice.org 3.2 +Name[ar]=أوبن أفيس.أورج +Name[be@latin]=OpenOffice.org 3.2 +Name[ca]=OpenOffice.org 3.2 +Name[cs]=OpenOffice.org 3.2 +Name[da]=OpenOffice.org 3.2 +Name[de]=OpenOffice.org 3.2 +Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི། +Name[el]=OpenOffice.org 3.2 +Name[en_CA]=OpenOffice.org 3.2 +Name[en_GB]=OpenOffice.org 3.2 +Name[es]=OpenOffice.org 3.2 +Name[et]=OpenOffice.org 3.2 +Name[eu]=OpenOffice.org 3.2 +Name[fi]=OpenOffice.org 3.2 +Name[fr]=OpenOffice.org 3.2 +Name[gl]=OpenOffice.org 3.2 +Name[he]=OpenOffice.org 3.2 +Name[hu]=OpenOffice.org 3.2 +Name[it]=OpenOffice.org 3.2 +Name[ko]=OpenOffice.org 3.2 +Name[lt]=OpenOffice.org 3.2 +Name[nb]=OpenOffice.org 3.2 +Name[ne]=ओपनअफिस डट अर्ग +Name[nl]=OpenOffice.org 3.2 +Name[oc]=OpenOffice.org 3.2 +Name[pl]=OpenOffice.org 3.2 +Name[ps]=اوپنافس.ورګ +Name[pt]=OpenOffice.org 3.2 +Name[pt_BR]=OpenOffice.org 3.2 +Name[sl]=OpenOffice.org 3.2 +Name[sr]=OpenOffice.org 3.2 +Name[sr@latin]=OpenOffice.org 3.2 +Name[sv]=OpenOffice.org 3.2 +Name[vi]=OpenOffice.org 3.2 +Name[zh_CN]=OpenOffice.org 3.2 +GenericName=Office -- cgit v1.2.3-54-g00ecf