From fd8d6e073e217ed4fe429bba867abc2b265189b3 Mon Sep 17 00:00:00 2001 From: tnut Date: Wed, 3 Mar 2010 22:45:59 +0100 Subject: suppression de openoffice-3.2 --- test/openoffice-3.2/.md5sum | 17 -- test/openoffice-3.2/Pkgfile | 183 --------------------- test/openoffice-3.2/buildfix-gcc44.diff | 10 -- .../buildfix_FormulaMissingHeader.diff | 10 -- test/openoffice-3.2/buildfix_system_db48.diff | 11 -- test/openoffice-3.2/default-no-startup-wizard.diff | 19 --- test/openoffice-3.2/default-system-fpicker.diff | 13 -- test/openoffice-3.2/openoffice.install | 26 --- test/openoffice-3.2/openoffice.profile | 2 - .../soffice-detect-mozilla-certificates.diff | 27 --- test/openoffice-3.2/startcenter.desktop | 48 ------ 11 files changed, 366 deletions(-) delete mode 100644 test/openoffice-3.2/.md5sum delete mode 100644 test/openoffice-3.2/Pkgfile delete mode 100644 test/openoffice-3.2/buildfix-gcc44.diff delete mode 100644 test/openoffice-3.2/buildfix_FormulaMissingHeader.diff delete mode 100644 test/openoffice-3.2/buildfix_system_db48.diff delete mode 100644 test/openoffice-3.2/default-no-startup-wizard.diff delete mode 100644 test/openoffice-3.2/default-system-fpicker.diff delete mode 100644 test/openoffice-3.2/openoffice.install delete mode 100644 test/openoffice-3.2/openoffice.profile delete mode 100644 test/openoffice-3.2/soffice-detect-mozilla-certificates.diff delete mode 100644 test/openoffice-3.2/startcenter.desktop (limited to 'test/openoffice-3.2') diff --git a/test/openoffice-3.2/.md5sum b/test/openoffice-3.2/.md5sum deleted file mode 100644 index 39daa4c15..000000000 --- a/test/openoffice-3.2/.md5sum +++ /dev/null @@ -1,17 +0,0 @@ -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 -aee18235b0db7a26340d038a97c44ba6 OOo_3.2.0_src_testautomation.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 -40ca15a651e78d9cf44722046552d769 openoffice.profile -1dc7480a04f572ad136d35923a2af66d soffice-detect-mozilla-certificates.diff -63209bbc64c901ef105455bda0282f45 startcenter.desktop -e3a0b76dcd876f3d721ee7183729153d unowinreg.dll diff --git a/test/openoffice-3.2/Pkgfile b/test/openoffice-3.2/Pkgfile deleted file mode 100644 index 9b6dc0ca7..000000000 --- a/test/openoffice-3.2/Pkgfile +++ /dev/null @@ -1,183 +0,0 @@ -# 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.2.0 -release=1 -OOdir=OOO320_m12 -backup=(usr/lib/openoffice/program/sofficerc) - -source=(http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_core.tar.bz2 \ - http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_extensions.tar.bz2\ - http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_l10n.tar.bz2 \ - http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_binfilter.tar.bz2\ - http://www.paldo.org/paldo/sources/OpenOffice.org/OpenOffice.org-3.2.0-default-no-registration.patch.bz2 \ - http://www.paldo.org/paldo/sources/OpenOffice.org/OpenOffice.org-3.2.0-default-large-buttons.patch.bz2 \ - http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_system.tar.bz2\ - http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_src_testautomation.tar.bz2\ - http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll \ - 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 \ - openoffice.profile ) - - -build() { - install -D -m644 startcenter.desktop \ - $PKG/usr/share/ede/programs/Applications/startcenter.desktop - - mkdir -p $PKG/usr/bin - mkdir -p $PKG/usr/share/icons - mkdir -p $PKG/usr/share/applications - - - 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 $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 - - 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="en-US de fr it es pt pl tr" \ - --with-use-shell=bash --with-alloc=system - - # - source LinuxX86Env.Set.sh - - # Build dmake utility - ./bootstrap - - cd instsetoo_native/util - build.pl --dlv_switch -link --all -P0 -- -P0 -s - - # install binaries - cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/fr/linux-2.6-intel/buildroot/* $PKG/ - - # move all to /usr/lib - mkdir -p $PKG/usr/lib - mv $PKG/opt/* $PKG/usr/lib/ - rmdir $PKG/opt - - ## Step 1 - cd $PKG/usr/lib/openoffice.orgi - mv ure/ basis3.2/ - cd basis3.2 - rm ure-link && mv ure ure-link - ## Step 2 - cd $PKG/usr/lib/ - mv openoffice.org/basis3.2/ openoffice.org3/ - cd openoffice.org3/ - rm basis-link && mv basis3.2 basis-link - ## Step 3 - cd $PKG/usr/lib/ - rmdir $PKG/usr/lib/openoffice.org - mv openoffice.org3 openoffice - - # install all built dictionaries from source tree - pushd $SRC/$OOdir/dictionaries/unxlng?6.pro/bin - for i in `ls -1 dict-??.oxt`; do - install -D -m644 $i $PKG/usr/lib/openoffice/share/extension/install/$i - done - popd - - # install extensions - pushd $SRC/$OOdir/solver/320/unxlng?6.pro/bin - install -D -m644 sun-report-builder.oxt $PKG/usr/lib/openoffice/share/extension/install/sun-report-builder.oxt - install -D -m644 swext/wiki-publisher.oxt $PKG/usr/lib/openoffice/share/extension/install/wiki-publisher.oxt - install -D -m644 minimizer/sun-presentation-minimizer.oxt $PKG/usr/lib/openoffice/share/extension/install/sun-presentation-minimizer.oxt - install -D -m644 presenter/presenter-screen.oxt $PKG/usr/lib/openoffice/share/extension/install/presenter-screen.oxt - install -D -m644 pdfimport/pdfimport.oxt $PKG/usr/lib/openoffice/share/extension/install/pdfimport.oxt - popd - - # prepare filesystem entries - mkdir -p $PKG/usr/{bin,share/applications} - mkdir -p $PKG/usr/share/icons/{hicolor,locolor} - - # install shortcuts - mv $PKG/usr/lib/openoffice/share/xdg/*.desktop $PKG/usr/share/applications - # add startcenter desktop file - install -D -m644 $SRC/startcenter.desktop $PKG/usr/share/applications/startcenter.desktop - - cd $PKG/usr/share/applications - sed -i -e 's|Exec=openoffice.org3|Exec=/usr/bin/soffice|g' *.desktop - sed -i -e 's|Exec=/usr/bin/soffice-printeradmin|Exec=/usr/bin/spadmin|g' printeradmin.desktop - # fix exec commands in shortcuts for Xfce menu - sed -i -e 's|base %U|base|g' base.desktop - sed -i -e 's|calc %U|calc|g' calc.desktop - sed -i -e 's|draw %U|draw|g' draw.desktop - sed -i -e 's|impress %U|impress|g' impress.desktop - sed -i -e 's|math %U|math|g' math.desktop - sed -i -e 's|writer %U|writer|g' writer.desktop - # remove quickstarter, we disabled it above - rm -rf $PKG/usr/share/applications/qstart.desktop - # fix icons in desktop files - sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop - - # install icons - cd $SRC/$OOdir/sysui/desktop/icons - cp -a -v hicolor/*x* $PKG/usr/share/icons/hicolor - cp -a -v locolor/*x* $PKG/usr/share/icons/locolor - - # just in case icon calc is used by calculator :) - find $PKG/usr/share/icons -type d -name apps -exec mv {}/calc.png {}/ooocalc.png \; - sed -i -e 's|Icon=calc|Icon=ooocalc|g' $PKG/usr/share/applications/calc.desktop # already done above - - # fix ownership and permissions - chown root.root -R $PKG/ - chmod +rX -R $PKG/usr - - # set desktop variable to force gtk/gnome vcl usage - install -m755 -d $PKG/etc/profile.d - install -m755 $PKG/openoffice.profile $PKG/etc/profile.d/openoffice.sh - - # make symlinks - cd $PKG/usr/bin - ln -s /usr/lib/openoffice/program/soffice soffice - ln -s /usr/lib/openoffice/program/spadmin spadmin - - # link the mozilla-plugin - mkdir -p $PKG/usr/lib/mozilla/plugins/ - cd $PKG/usr/lib/mozilla/plugins/ - ln -v -s /usr/lib/openoffice/program/libnpsoplugin.so . -} - diff --git a/test/openoffice-3.2/buildfix-gcc44.diff b/test/openoffice-3.2/buildfix-gcc44.diff deleted file mode 100644 index 01520a70e..000000000 --- a/test/openoffice-3.2/buildfix-gcc44.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-3.2/buildfix_FormulaMissingHeader.diff b/test/openoffice-3.2/buildfix_FormulaMissingHeader.diff deleted file mode 100644 index 85c046b34..000000000 --- a/test/openoffice-3.2/buildfix_FormulaMissingHeader.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-3.2/buildfix_system_db48.diff b/test/openoffice-3.2/buildfix_system_db48.diff deleted file mode 100644 index c7378fb7a..000000000 --- a/test/openoffice-3.2/buildfix_system_db48.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-3.2/default-no-startup-wizard.diff b/test/openoffice-3.2/default-no-startup-wizard.diff deleted file mode 100644 index 432c2de1a..000000000 --- a/test/openoffice-3.2/default-no-startup-wizard.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- desktop/source/migration/wizard.cxx -+++ desktop/source/migration/wizard.cxx -@@ -121,6 +121,7 @@ - ,m_bAutomaticUpdChk(sal_True) - ,m_aLicensePath( rLicensePath ) - { -+ return; - // --- - // FreeResource(); - // enableState(STATE_USER, sal_False); -@@ -383,7 +384,7 @@ - - short FirstStartWizard::Execute() - { -- return svt::RoadmapWizard::Execute(); -+ return sal_True || svt::RoadmapWizard::Execute(); - } - - static OUString _makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_False) diff --git a/test/openoffice-3.2/default-system-fpicker.diff b/test/openoffice-3.2/default-system-fpicker.diff deleted file mode 100644 index 331130f98..000000000 --- a/test/openoffice-3.2/default-system-fpicker.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- officecfg/registry/data/org/openoffice/Office/Common.xcu -+++ officecfg/registry/data/org/openoffice/Office/Common.xcu -@@ -576,8 +576,8 @@ - - - -- -- false -+ -+ true - - - true diff --git a/test/openoffice-3.2/openoffice.install b/test/openoffice-3.2/openoffice.install deleted file mode 100644 index 94a8d6432..000000000 --- a/test/openoffice-3.2/openoffice.install +++ /dev/null @@ -1,26 +0,0 @@ -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-3.2/openoffice.profile b/test/openoffice-3.2/openoffice.profile deleted file mode 100644 index fb85bcb17..000000000 --- a/test/openoffice-3.2/openoffice.profile +++ /dev/null @@ -1,2 +0,0 @@ -export OOO_FORCE_DESKTOP=gnome -#export OOO_FORCE_DESKTOP=KDE4 \ No newline at end of file diff --git a/test/openoffice-3.2/soffice-detect-mozilla-certificates.diff b/test/openoffice-3.2/soffice-detect-mozilla-certificates.diff deleted file mode 100644 index b3be61bc4..000000000 --- a/test/openoffice-3.2/soffice-detect-mozilla-certificates.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- desktop/scripts/soffice.sh -+++ desktop/scripts/soffice.sh -@@ -207,6 +207,24 @@ - OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program" - export OPENOFFICE_MOZILLA_FIVE_HOME - -+if [ -z "$MOZILLA_CERTIFICATE_FOLDER" ]; then -+ db="" -+ dir="" -+ for d in $HOME/.mozilla/firefox $HOME/.firefox $HOME/.thunderbird $HOME/.gnome2/epiphany/mozilla $HOME/.mozilla/default $HOME/.mozilla; do -+ if [ -z "$dir" -a -d "$d" ]; then -+ dir=$d; -+ fi; -+ done -+ if [ -n "$dir" ]; then -+ cert8=`find $dir -name "cert8.db" | head -n 1` -+ if [ -n "$cert8" ]; then -+ profiledir=`dirname "$cert8"` -+ MOZILLA_CERTIFICATE_FOLDER=$profiledir -+ export MOZILLA_CERTIFICATE_FOLDER -+ fi -+ fi -+fi -+ - unset XENVIRONMENT - - # uncomment line below to disable anti aliasing of fonts diff --git a/test/openoffice-3.2/startcenter.desktop b/test/openoffice-3.2/startcenter.desktop deleted file mode 100644 index 552f06dd5..000000000 --- a/test/openoffice-3.2/startcenter.desktop +++ /dev/null @@ -1,48 +0,0 @@ -[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