[arch-commits] Commit in openoffice-base/repos/extra-i686 (14 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Aug 26 21:37:44 UTC 2009
Date: Wednesday, August 26, 2009 @ 17:37:43
Author: andyrtr
Revision: 50444
commit release to extra-i686
Added:
openoffice-base/repos/extra-i686/ChangeLog
openoffice-base/repos/extra-i686/PKGBUILD
openoffice-base/repos/extra-i686/buildfix-gcc43.diff
openoffice-base/repos/extra-i686/buildfix-sw-printf.diff
openoffice-base/repos/extra-i686/default-no-startup-wizard.diff
openoffice-base/repos/extra-i686/default-system-fpicker.diff
openoffice-base/repos/extra-i686/no-mozilla-plug-in-option.diff
openoffice-base/repos/extra-i686/nsplugin-path.diff
openoffice-base/repos/extra-i686/openoffice.install
openoffice-base/repos/extra-i686/openoffice.profile
openoffice-base/repos/extra-i686/shell.patch
openoffice-base/repos/extra-i686/soffice-detect-mozilla-certificates.diff
openoffice-base/repos/extra-i686/soltools-mkdepend-getline.diff
openoffice-base/repos/extra-i686/startcenter.desktop
------------------------------------------+
ChangeLog | 128 +++++++++++
PKGBUILD | 282 ++++++++++++++++++++++++++
buildfix-gcc43.diff | 10
buildfix-sw-printf.diff | 21 +
default-no-startup-wizard.diff | 19 +
default-system-fpicker.diff | 13 +
no-mozilla-plug-in-option.diff | 313 +++++++++++++++++++++++++++++
nsplugin-path.diff | 132 ++++++++++++
openoffice.install | 26 ++
openoffice.profile | 1
shell.patch | 42 +++
soffice-detect-mozilla-certificates.diff | 27 ++
soltools-mkdepend-getline.diff | 43 +++
startcenter.desktop | 48 ++++
14 files changed, 1105 insertions(+)
Added: ChangeLog
===================================================================
--- ChangeLog (rev 0)
+++ ChangeLog 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,128 @@
+2009-08-25 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.1-1 :
+ - ooo310_m19 = 3.1.1RC2 = final
+ - add 2 patches to fix plugin + remove plugin option
+ - change libxul buildfix to make the plugin work
+
+2009-08-07 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0.91-ooo310_m18-1 :
+ - 3.1.1rc1
+ - backup sofficerc file to fix
+ http://bugs.archlinux.org/task/15161
+ - move all files to /usr/lib
+ - add startcenter menu entry, drop templates entry
+
+2009-07-03 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0-5 :
+ rebuild with lowered compiler optimizations
+ http://bugs.archlinux.org/task/15290
+
+2009-07-02 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0-4 :
+ buildfix for new xulrunner
+ enable the plugin again
+
+2009-07-02 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0-3 :
+ - rebuild for libjpeg 7
+ - temporarely disable plugin, cannot be built
+ with new xulrunner 1.9.1
+ - fix apache-ant detection
+ - add libsm dependency
+
+2009-05-30 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0-2 :
+ - rebuild for icu 4.2
+ - add gcc4.4 fix
+ - add glibc 2.10.1 fix
+
+2009-05-05 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.0-1 :
+ - based on OOO310_m11 = RC2 = final
+ - major bump
+ - see changes developed in openoffice-base-beta pkg
+
+openoffice-base 3.0.1-1
+- modify install msg
+- build with stlport for i686 and
+ without for x86_64
+- fix high cpu load in file dialog FS #11710
+- change to internal boost
+
+openoffice-base 3.0.0-4
+- rebuild for heimdal 1.2.1
+
+openoffice-base 3.0.0-3
+- rebuild for python 2.6
+
+openoffice-base 3.0.0-2
+- add libxslt dependency to fix file recovering issue
+- add profile.d script to preset the gnome vcl usage
+- reenable stlport to be compatible with crappy old
+ Sun extensions
+
+openoffice-base 3.0.0-1
+- major bump
+- see changes developed in openoffice-base-beta pkg
+
+openoffice-base 2.4.1-2
+- rebuild for new db4.7 - fix detection
+- fix xulrunner 1.9 detection
+- add libsndfile dep again, fixes #10680
+- disable the gtkunixprintdialog.diff
+ as it _may_ be the reason for trouble on
+ *box desktops
+- fix FS#10143 (duplicate menu entries)
+
+openoffice-base 2.4.1-1
+- try shell.patch to non-gtk solve integration
+- disable crashdump that would break with gcc-4.3
+- use system Xrender-headers and sane headers again
+- cleanup deps/makedeps
+- fix FS#10143 (duplicate menu entries)
+
+openoffice-base 2.4.0-1
+- rebuild against extra
+- rc6 is final
+
+openoffice-base 2.4.0-0.4
+- ooh680-m12 = 2.4 RC6
+- fix gcc-4.3 compile issues
+- fix gcj lib paths
+
+openoffice-base 2.4.0-0.3
+- ooh680-m9 = 2.4 RC3
+
+openoffice-base 2.4.0-0.2
+- ooh680-m8 = 2.4 RC2
+- added soffice.diff to solve OOo not stating in certain DEs (#9638)
+
+openoffice-base 2.4.0-0.1
+- ooh680-m7 = 2.4 RC1
+- remove gstreamer patch that breaks letter wizard on x86_64
+- removed Arch splash
+- removed obsolete patches
+- added gtk-printing patch to provide the nice dialog on gtk based desktops
+
+openoffice-base 2.3.1-1
+- remove broken --without-stlport4 option for i686
+
+openoffice-base 2.3.1-0.1
+- make use of !emptydir
+- adopt patch changes from devel pkg src680_m236
+- prepare 2.3.1 release - this is rc1
+
+openoffice-base 2.3.0-4
+- fixed weird gtk behavior - http://bugs.archlinux.org/task/8209
+- added missing spell wizard
+- removed system agg dependency due to license issues
+ see http://www.openoffice.org/issues/show_bug.cgi?id=81224
+- removed unneeded provide tag
+- added ChangeLog
Added: PKGBUILD
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,282 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
+
+pkgname=openoffice-base
+pkgver=3.1.1
+pkgrel=1
+pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
+arch=(i686 x86_64)
+_OO_milestone=OOO310_m19 # =RC2 = final
+license=('LGPL3')
+url="http://www.openoffice.org"
+install=openoffice.install
+depends=('curl>=7.19.6' 'hunspell>=1.2.8' 'python>=2.6.2-5' 'libwpd>=0.8.14' 'redland>=1.0.8-3' 'libxaw>=1.0.6' 'neon>=0.28.4'
+ 'dbus-glib>=0.80' 'icu>=4.2.1' ' ' 'libxslt>=1.1.24-2' 'hicolor-icon-theme' 'desktop-file-utils')
+optdepends=('java-runtime: adds java support'
+ 'libcups: adds printing support'
+ 'gconf: adds additional gnome support'
+ 'nss: adds support for signed files/macros'
+ 'pstoedit: translates PostScript and PDF graphics into other vector formats')
+makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
+ 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1.2'
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5.1')
+backup=(usr/lib/openoffice/program/sofficerc)
+source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
+ startcenter.desktop
+ default-no-startup-wizard.diff
+ default-system-fpicker.diff
+ soffice-detect-mozilla-certificates.diff
+ buildfix-gcc43.diff
+ shell.patch
+ openoffice.profile
+ soltools-mkdepend-getline.diff
+ buildfix-sw-printf.diff
+ xulrunner-1.9.1.diff
+ nsplugin-path.diff
+ no-mozilla-plug-in-option.diff)
+options=('!distcc' '!ccache' '!makeflags')
+md5sums=('23370db83cc40bfbf22cedc460fd6b85'
+ '90897451b6cfed490e481f06d45408aa'
+ '71f136a31e296a04ab68932a31dd533e'
+ '6c596129fb48316226ce3adfd3a4c86d'
+ '1dc7480a04f572ad136d35923a2af66d'
+ 'bf7119084a2d1e0566b5e34b57dce8eb'
+ 'a51200f770c635355c430cc5052db8cf'
+ '8d68d44c941a687813ddd968383cdf27'
+ '7f9012680d0e329227445925710bafe6'
+ '2461119a2b7f1580f997f504a76a1c98'
+ '94b52cefc3656013f33ccedc0392848b'
+ 'b48650dbdcf72c09a15dc9dff54915f1'
+ '00d28e85d97a467c58f317a2d93d26ac')
+
+# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
+
+build() {
+ cd ${srcdir}
+ # now svn: http://wiki.services.openoffice.org/wiki/OOo_and_Subversion
+# svn checkout svn://svn.services.openoffice.org/ooo/tags/${_OO_milestone}
+# find ${srcdir} -type d -depth -name ".svn" -exec rm -rf {} \;
+# tar -cvjf ../${pkgname}-${_OO_milestone}.tar.bz2 ${_OO_milestone}/*
+# return 1
+
+ cd ${srcdir}/${_OO_milestone}
+
+ # just to make sure that it will detect the desired JDK/JVM - we want openjdk6
+ unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
+ [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
+ JAVAHOME=${JAVA_HOME}
+ [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+ [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
+
+ # some speedups
+ export SMP="6"
+ MAXMODULESFLAG="-P${SMP}"
+ MAXPROCESSESFLAG="-P${SMP}"
+ export nodep=true
+ export NO_HIDS=true
+
+ # build fixes
+ patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
+ patch -Np0 -i ${srcdir}/buildfix-sw-printf.diff || return 1
+ patch -Np0 -i ${srcdir}/soltools-mkdepend-getline.diff || return 1
+ patch -Np0 -i ${srcdir}/xulrunner-1.9.1.diff || return 1
+
+
+ # allows soffice to find the user's firefox profile so that it can read
+ # its digital certificates. Nss stores digital certificates in your mozilla firefox profile.
+ patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
+
+ # important bugfixes
+ # try to fix non-gtk integration
+ patch -Np0 -i ${srcdir}/shell.patch || return 1
+ # fix the mozilla plugin and remove it from option menu
+ patch -Np0 -i ${srcdir}/nsplugin-path.diff || return 1
+ patch -Np0 -i ${srcdir}/no-mozilla-plug-in-option.diff || return 1
+
+ # remove the startup wizard
+ patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
+ # enables the default system-file-picker in case we have that built
+ patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
+
+ if [ "$CARCH" = "x86_64" ]; then
+ EXTRAOPTS="--without-stlport"
+ # fix to build with SUN jdk/jre and OpenJDK
+ # http://qa.openoffice.org/issues/show_bug.cgi?id=74749
+ sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/${_OO_milestone}/solenv/inc/libs.mk || return 1
+ else EXTRAOPTS="--with-stlport"
+ fi
+
+ cd ${srcdir}/${_OO_milestone}
+
+ # export C(XX)FLAGS
+ # http://www.openoffice.org/issues/show_bug.cgi?id=103205
+ unset CFLAGS
+ unset CXXFLAGS
+# export ARCH_FLAGS="$CFLAGS"
+
+ # Need to recreate the configure script because of patches
+ autoreconf -v || return 1
+
+ ./configure --with-build-version="${pkgver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
+ --with-vendor="ArchLinux"\
+ --prefix=/usr --exec-prefix=/usr\
+ --disable-ldap\
+ --with-lang="en-US"\
+ --with-dict=ALL\
+ --disable-gnome-vfs\
+ --disable-binfilter\
+ --disable-evolution2\
+ --disable-kde\
+ --disable-lockdown\
+ --disable-mediawiki\
+ --disable-minimizer\
+ --disable-odk\
+ --disable-pdfimport\
+ --disable-qadevooo\
+ --disable-reportdesign\
+ --disable-systray\
+ --disable-mathmldtd\
+ --enable-gio\
+ --enable-gtk\
+ --enable-cups\
+ --enable-dbus\
+ --enable-cairo\
+ --enable-crashdump=no\
+ --enable-vba\
+ --with-package-format=native\
+ --with-system-db\
+ --with-system-cairo\
+ --with-system-curl\
+ --with-system-expat\
+ --with-system-freetype\
+ --with-system-hunspell\
+ --with-system-icu\
+ --with-system-jpeg\
+ --with-system-libwpd\
+ --with-system-libxml\
+ --with-system-libxslt\
+ --with-system-neon\
+ --with-system-python\
+ --with-system-redland\
+ --with-system-sane-header\
+ --with-system-sndfile\
+ --with-system-stdlibs\
+ --with-system-xrender-headers\
+ --with-system-zlib\
+ --with-system-openssl\
+ --with-system-mozilla=libxul\
+ --without-fonts\
+ --without-afms\
+ --without-gpc\
+ --without-nas\
+ --with-jdk-home=${JAVA_HOME}\
+ --with-system-hsqldb\
+ --with-hsqldb-jar=/usr/share/java/hsqldb.jar\
+ --with-system-xerces\
+ --with-xerces-jar=/usr/share/java/xercesImpl.jar\
+ --with-system-xalan\
+ --with-xalan-jar=/usr/share/java/xalan.jar\
+ --with-system-xml-apis\
+ --with-xml-apis-jar=/usr/share/java/xml-apis.jar\
+ --with-serializer-jar=/usr/share/java/serializer.jar\
+ --with-ant-home=/usr/share/java/apache-ant \
+ --with-use-shell=bash\
+ $EXTRAOPTS || return 1
+
+ # Setup environment for build
+ if [ "$CARCH" = "x86_64" ]; then
+ source LinuxX86-64Env.Set.sh
+ else source LinuxX86Env.Set.sh
+ fi
+
+ # Build dmake utility
+ ./bootstrap || return 1
+
+ cd instsetoo_native
+ build.pl -P${SMP} ${MAXMODULESFLAG} ${MAXPROCESSESFLAG} --dlv_switch -link --all || return 1
+ cd ..
+
+ # install binaries
+ if [ "$CARCH" = "x86_64" ]; then
+ cp -R instsetoo_native/unxlngx6.pro/OpenOffice/native/install/en-US/linux-2.6-x86_64/buildroot/* ${pkgdir}/
+ else cp -R instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/* ${pkgdir}/
+ fi
+
+ # move all to /usr/lib
+ mkdir -p ${pkgdir}/usr/lib
+ mv ${pkgdir}/opt/* ${pkgdir}/usr/lib/
+ rmdir ${pkgdir}/opt
+
+ ## Step 1
+ cd ${pkgdir}/usr/lib/openoffice.org || return 1
+ mv ure/ basis3.1/ || return 1
+ cd basis3.1 || return 1
+ rm ure-link && mv ure ure-link || return 1
+ ## Step 2
+ cd ${pkgdir}/usr/lib/ || return 1
+ mv openoffice.org/basis3.1/ openoffice.org3/ || return 1
+ cd openoffice.org3/ || return 1
+ rm basis-link && mv basis3.1 basis-link || return 1
+ ## Step 3
+ cd ${pkgdir}/usr/lib/ || return 1
+ rmdir ${pkgdir}/usr/lib/openoffice.org || return 1
+ mv openoffice.org3 openoffice || return 1
+
+ # install all built dictionaries from source tree
+ pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlng?6.pro/bin
+ for i in `ls -1 dict-??.oxt`; do
+ install -D -m644 $i ${pkgdir}/usr/lib/openoffice/share/extension/install/$i || return 1
+ done
+ popd
+
+ # prepare filesystem entries
+ mkdir -p ${pkgdir}/usr/{bin,share/applications}
+ mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
+
+ # install shortcuts
+ mv ${pkgdir}/usr/lib/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
+ # add startcenter desktop file
+ install -D -m644 ${srcdir}/startcenter.desktop ${pkgdir}/usr/share/applications/startcenter.desktop || return 1
+
+ cd ${pkgdir}/usr/share/applications
+ sed -i -e 's|Exec=openoffice.org3|Exec=/usr/bin/soffice|g' *.desktop || return 1
+ sed -i -e 's|Exec=/usr/bin/soffice-printeradmin|Exec=/usr/bin/spadmin|g' printeradmin.desktop || return 1
+ # fix exec commands in shortcuts for Xfce menu
+ sed -i -e 's|base %U|base|g' base.desktop || return 1
+ sed -i -e 's|calc %U|calc|g' calc.desktop || return 1
+ sed -i -e 's|draw %U|draw|g' draw.desktop || return 1
+ sed -i -e 's|impress %U|impress|g' impress.desktop || return 1
+ sed -i -e 's|math %U|math|g' math.desktop || return 1
+ sed -i -e 's|writer %U|writer|g' writer.desktop || return 1
+ # remove quickstarter, we disabled it above
+ rm -rf ${pkgdir}/usr/share/applications/qstart.desktop
+ # fix icons in desktop files
+ sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
+
+ # install icons
+ cd ${srcdir}/${_OO_milestone}/sysui/desktop/icons
+ cp -a -v hicolor/*x* ${pkgdir}/usr/share/icons/hicolor
+ cp -a -v locolor/*x* ${pkgdir}/usr/share/icons/locolor
+
+ # just in case icon calc is used by calculator :)
+ find ${pkgdir}/usr/share/icons -type d -name apps -exec mv {}/calc.png {}/ooocalc.png \;
+ sed -i -e 's|Icon=calc|Icon=ooocalc|g' ${pkgdir}/usr/share/applications/calc.desktop # already done above
+
+ # fix ownership and permissions
+ chown root.root -R ${pkgdir}/
+ chmod +rX -R ${pkgdir}/usr
+
+ # make symlinks
+ cd ${pkgdir}/usr/bin
+ ln -s /usr/lib/openoffice/program/soffice soffice
+ ln -s /usr/lib/openoffice/program/spadmin spadmin
+
+ # link the mozilla-plugin
+ mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
+ cd ${pkgdir}/usr/lib/mozilla/plugins/
+ ln -v -s /usr/lib/openoffice/program/libnpsoplugin.so .
+
+ # set desktop variable to force gtk/gnome vcl usage
+ install -m755 -d ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/openoffice.profile ${pkgdir}/etc/profile.d/openoffice.sh || return 1
+}
Added: buildfix-gcc43.diff
===================================================================
--- buildfix-gcc43.diff (rev 0)
+++ buildfix-gcc43.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,10 @@
+--- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
++++ bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+@@ -46,6 +46,7 @@
+ #include <typelib/typedescription.hxx>
+ #include <uno/any2.h>
+
++#include <string.h>
+ #include "share.hxx"
+
+
Added: buildfix-sw-printf.diff
===================================================================
--- buildfix-sw-printf.diff (rev 0)
+++ buildfix-sw-printf.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,21 @@
+--- sw/source/core/doc/docbm.cxx 2009-05-01 08:09:45.000000000 -0500
++++ sw/source/core/doc/docbm.cxx 2009-05-01 13:31:49.000000000 -0500
+@@ -33,6 +33,7 @@
+ #include "precompiled_sw.hxx"
+
+
++#include <stdio.h>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+--- sw/source/filter/ww8/WW8TableInfo.cxx 2009-04-21 04:51:46.000000000 -0500
++++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-01 15:20:53.000000000 -0500
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sw.hxx"
+
++#include <stdio.h>
+ #include <iostream>
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+
Added: default-no-startup-wizard.diff
===================================================================
--- default-no-startup-wizard.diff (rev 0)
+++ default-no-startup-wizard.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,19 @@
+--- 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)
Added: default-system-fpicker.diff
===================================================================
--- default-system-fpicker.diff (rev 0)
+++ default-system-fpicker.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,13 @@
+--- officecfg/registry/data/org/openoffice/Office/Common.xcu
++++ officecfg/registry/data/org/openoffice/Office/Common.xcu
+@@ -576,8 +576,8 @@
+ </node>
+ </node>
+ <node oor:name="Misc">
+- <prop oor:name="UseSystemFileDialog" install:module="UseOOoFileDialogs">
+- <value>false</value>
++ <prop oor:name="UseSystemFileDialog" install:module="UseOOoFileDialogs">
++ <value>true</value>
+ </prop>
+ <prop oor:name="UseSystemPrintDialog" install:module="macosx">
+ <value>true</value>
Added: no-mozilla-plug-in-option.diff
===================================================================
--- no-mozilla-plug-in-option.diff (rev 0)
+++ no-mozilla-plug-in-option.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,313 @@
+--- svx/source/dialog/optinet2.cxx-old 2007-05-04 22:59:31.000000000 +0200
++++ svx/source/dialog/optinet2.cxx 2007-05-04 22:59:56.000000000 +0200
+@@ -1813,199 +1813,6 @@
+ maProtectRecordsPB.SetText( sNewText );
+ }
+
+-//added by jmeng begin
+-MozPluginTabPage::MozPluginTabPage(Window* pParent, const SfxItemSet& rSet)
+- : SfxTabPage( pParent, SVX_RES( RID_SVXPAGE_INET_MOZPLUGIN ), rSet ),
+- aMSWordGB ( this, SVX_RES( GB_MOZPLUGIN ) ),
+- aWBasicCodeCB ( this, SVX_RES( CB_MOZPLUGIN_CODE ) )
+-{
+- FreeResource();
+-}
+-
+-MozPluginTabPage::~MozPluginTabPage()
+-{
+-}
+-
+-SfxTabPage* MozPluginTabPage::Create( Window* pParent,
+- const SfxItemSet& rAttrSet )
+-{
+- return new MozPluginTabPage( pParent, rAttrSet );
+-}
+-BOOL MozPluginTabPage::FillItemSet( SfxItemSet& )
+-{
+- BOOL hasInstall = isInstalled();
+- BOOL hasChecked = aWBasicCodeCB.IsChecked();
+- if(hasInstall && (!hasChecked)){
+- //try to uninstall
+- uninstallPlugin();
+- }
+- else if((!hasInstall) && hasChecked){
+- //try to install
+- installPlugin();
+- }
+- else{
+- // do nothing
+- }
+- return TRUE;
+-}
+-void MozPluginTabPage::Reset( const SfxItemSet& )
+-{
+- aWBasicCodeCB.Check( isInstalled());
+- aWBasicCodeCB.SaveValue();
+-}
+-
+-#ifdef WNT
+-extern "C" {
+- int lc_isInstalled(const char* realFilePath);
+- int lc_installPlugin(const char* realFilePath);
+- int lc_uninstallPlugin(const char* realFilePath);
+-}
+-#endif
+-
+-#define NPP_PATH_MAX 2048
+-inline bool getDllURL(rtl::OString * path)
+-{
+- OSL_ASSERT(path != NULL);
+- ::rtl::OUString dirPath/*dllPath, */;
+- if (osl_getExecutableFile(&dirPath.pData) != osl_Process_E_None) {
+- return false;
+- }
+- dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
+-// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
+- ::rtl::OUString sysDirPath;
+- osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
+- *path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
+- return true;
+-}
+-
+-BOOL MozPluginTabPage::isInstalled()
+-{
+-#ifdef UNIX
+- // get the real file referred by .so lnk file
+- char lnkFilePath[NPP_PATH_MAX] = {0};
+- char lnkReferFilePath[NPP_PATH_MAX] = {0};
+- char* pHome = getpwuid(getuid())->pw_dir;
+- strcat(lnkFilePath, pHome);
+- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
+-
+- struct stat sBuf;
+- if (0 > lstat(lnkFilePath, &sBuf))
+- return false;
+- if (!S_ISLNK(sBuf.st_mode))
+- return false;
+- if (0 >= readlink(lnkFilePath, lnkReferFilePath, NPP_PATH_MAX))
+- return false;
+- // If the link is relative, then we regard it as non-standard
+- if (lnkReferFilePath[0] != '/')
+- return false;
+-
+- // get the real file path
+- char realFilePath[NPP_PATH_MAX] = {0};
+- ::rtl::OString tempString;
+- if (!getDllURL(&tempString)) {
+- return false;
+- }
+- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
+- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
+-
+- if (0 != strcmp(lnkReferFilePath, realFilePath))
+- return false;
+- return true;
+-#endif
+-#ifdef WNT
+- // get the value from registry
+- BOOL ret = true;
+- ::rtl::OString tempString;
+- char realFilePath[NPP_PATH_MAX] = {0};
+- if (!getDllURL(&tempString)){
+- return false;
+- }
+- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
+- if(! lc_isInstalled(realFilePath))
+- ret =true;
+- else
+- ret = false;
+- return ret;
+-#endif
+-}
+-
+-BOOL MozPluginTabPage::installPlugin()
+-{
+-#ifdef UNIX
+- // get the real file referred by .so lnk file
+- char lnkFilePath[NPP_PATH_MAX] = {0};
+- char* pHome = getpwuid(getuid())->pw_dir;
+- strcat(lnkFilePath, pHome);
+- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
+- remove(lnkFilePath);
+-
+- // create the dirs if necessary
+- struct stat buf;
+- char tmpDir[NPP_PATH_MAX] = {0};
+- sprintf(tmpDir, "%s/.mozilla", pHome);
+- if (0 > stat(lnkFilePath, &buf))
+- {
+- mkdir(tmpDir, 0755);
+- strcat(tmpDir, "/plugins");
+- mkdir(tmpDir, 0755);
+- }
+-
+- // get the real file path
+- char realFilePath[NPP_PATH_MAX] = {0};
+- ::rtl::OString tempString;
+- if (!getDllURL(&tempString)) {
+- return false;
+- }
+- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
+- strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION);
+-
+- // create the link
+- if (0 != symlink(realFilePath, lnkFilePath))
+- return false;
+- return true;
+-#endif
+-#ifdef WNT
+- ::rtl::OString tempString;
+- char realFilePath[NPP_PATH_MAX] = {0};
+- if (!getDllURL(&tempString)) {
+- return false;
+- }
+- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
+- if( !lc_installPlugin(realFilePath))
+- return true;
+- else
+- return false;
+-#endif
+-}
+-
+-BOOL MozPluginTabPage::uninstallPlugin()
+-{
+-#ifdef UNIX
+- // get the real file referred by .so lnk file
+- char lnkFilePath[NPP_PATH_MAX] = {0};
+- char* pHome = getpwuid(getuid())->pw_dir;
+- strcat(lnkFilePath, pHome);
+- strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION);
+-
+- if(0 > remove(lnkFilePath))
+- return false;
+- return true;
+-#endif
+-#ifdef WNT
+- ::rtl::OString tempString;
+- char realFilePath[NPP_PATH_MAX] = {0};
+- if (!getDllURL(&tempString)) {
+- return false;
+- }
+- strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX);
+- if(!lc_uninstallPlugin(realFilePath))
+- return true;
+- else
+- return false;
+-#endif
+-}
+-//added by jmeng end
+-
+ /* -------------------------------------------------------------------------*/
+
+ class MailerProgramCfg_Impl : public utl::ConfigItem
+--- svx/source/dialog/optinet2.hxx 10 Apr 2008 23:34:00 -0000 1.16
++++ svx/source/dialog/optinet2.hxx 16 Jun 2008 16:09:22 -0000
+@@ -293,29 +293,6 @@
+ virtual void Reset( const SfxItemSet& rSet );
+ };
+
+-//added by jmeng begin
+-class MozPluginTabPage : public SfxTabPage
+-{
+- FixedLine aMSWordGB;
+- CheckBox aWBasicCodeCB;
+-
+- BOOL isInstalled(void);
+- BOOL installPlugin(void);
+- BOOL uninstallPlugin(void);
+-
+- MozPluginTabPage( Window* pParent, const SfxItemSet& rSet );
+- virtual ~MozPluginTabPage();
+-
+-public:
+-
+- static SfxTabPage* Create( Window* pParent,
+- const SfxItemSet& rAttrSet );
+-
+- virtual BOOL FillItemSet( SfxItemSet& rSet );
+- virtual void Reset( const SfxItemSet& rSet );
+-
+-};
+-//added by jmeng end
+ #endif
+
+ /* -----------------------------20.06.01 16:32--------------------------------
+--- svx/source/options/optinet2.src 11 Apr 2008 02:13:50 -0000 1.97
++++ svx/source/options/optinet2.src 16 Jun 2008 16:11:20 -0000
+@@ -40,32 +40,6 @@
+ /* */
+ /************************************************************************/
+
+-// added by jmeng begin
+-
+-TabPage RID_SVXPAGE_INET_MOZPLUGIN
+-{
+- OutputSize = TRUE ;
+- Size = MAP_APPFONT ( 260 , 185 ) ;
+- SVLook = TRUE ;
+- Hide = TRUE ;
+-
+- FixedLine GB_MOZPLUGIN
+- {
+- Pos = MAP_APPFONT ( 6 , 3 ) ;
+- Size = MAP_APPFONT ( 248 , 8 ) ;
+- Text[ en-US ] = "Browser Plug-in";
+- };
+- CheckBox CB_MOZPLUGIN_CODE
+- {
+- Pos = MAP_APPFONT ( 12 , 14 ) ;
+- Size = MAP_APPFONT ( 236 , 10 ) ;
+- TabStop = TRUE ;
+- Text [ en-US ] = "~Display documents in browser" ;
+- };
+-};
+-
+-//added by jmeng end
+-
+ TabPage RID_SVXPAGE_INET_PROXY
+ {
+ HelpId = HID_OPTIONS_PROXY ;
+--- svx/source/dialog/treeopt.src 11 Apr 2008 00:17:12 -0000 1.21
++++ svx/source/dialog/treeopt.src 16 Jun 2008 16:12:27 -0000
+@@ -187,7 +187,6 @@
+ < "Proxy" ; RID_SVXPAGE_INET_PROXY; > ;
+ < "Search" ; RID_SVXPAGE_INET_SEARCH; > ;
+ < "E-mail" ; RID_SVXPAGE_INET_MAIL; > ;
+- < "Browser Plug-in" ; RID_SVXPAGE_INET_MOZPLUGIN; > ;
+ };
+ //modified by jmeng end
+ };
+--- svx/inc/svx/dialogs.hrc 4 Jun 2008 11:21:07 -0000 1.14
++++ svx/inc/svx/dialogs.hrc 16 Jun 2008 16:14:30 -0000
+@@ -258,11 +258,6 @@
+ #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158)
+ #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159)
+ #define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160)
+-//added by jmeng begin
+-#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161)
+-#define GB_MOZPLUGIN 1
+-#define CB_MOZPLUGIN_CODE 2
+-//added by jmeng end
+ #define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200)
+
+ #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202)
+--- svx/source/dialog/treeopt.cxx 11 Apr 2008 00:16:21 -0000 1.56
++++ svx/source/dialog/treeopt.cxx 16 Jun 2008 16:04:13 -0000
+@@ -368,9 +368,6 @@
+ case RID_SVXPAGE_ACCESSIBILITYCONFIG: fnCreate = &SvxAccessibilityOptionsTabPage::Create; break;
+ case RID_SVXPAGE_SSO: fnCreate = GetSSOCreator(); break;
+ case RID_SVXPAGE_OPTIONS_CTL: fnCreate = &SvxCTLOptionsPage::Create ; break;
+- //added by jmeng begin
+- case RID_SVXPAGE_INET_MOZPLUGIN: fnCreate = &MozPluginTabPage::Create; break;
+- //added by jmeng end
+ case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
+ case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
+ case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
+@@ -370,7 +367,6 @@
+ { "Internet", "Proxy", RID_SVXPAGE_INET_PROXY },
+ { "Internet", "Search", RID_SVXPAGE_INET_SEARCH },
+ { "Internet", "Email", RID_SVXPAGE_INET_MAIL },
+- { "Internet", "MozillaPlugin", RID_SVXPAGE_INET_MOZPLUGIN },
+ { "LoadSave", NULL, SID_FILTER_DLG },
+ { "LoadSave", "General", RID_SFXPAGE_SAVE },
+ { "LoadSave", "VBAProperties", SID_OPTFILTER_MSOFFICE },
Added: nsplugin-path.diff
===================================================================
--- nsplugin-path.diff (rev 0)
+++ nsplugin-path.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,132 @@
+--- extensions/source/nsplugin/source/so_env.cxx.old 2009-04-02 10:51:19.000000000 +0000
++++ extensions/source/nsplugin/source/so_env.cxx 2009-04-06 16:41:44.000000000 +0000
+@@ -34,6 +34,7 @@
+ #ifdef UNIX
+ #include <sys/types.h>
+ #include <strings.h>
++#include <dlfcn.h>
+ #include <stdarg.h>
+ // For vsnprintf()
+ #define NSP_vsnprintf vsnprintf
+@@ -122,6 +123,96 @@ restoreUTF8(char *pPath)
+ return 0;
+ }
+
++#ifdef UNIX
++extern int nspluginOOoModuleHook (void** aResult);
++int nspluginOOoModuleHook (void** aResult)
++{
++ void *dl_handle;
++ void *thisp;
++
++ dl_handle = dlopen(NULL, RTLD_NOW);
++ if (!dl_handle)
++ {
++ fprintf (stderr, "Can't open myself '%s'\n", dlerror());
++ return 1;
++ }
++
++ Dl_info dl_info = { 0, };
++ if(!dladdr((void *)nspluginOOoModuleHook, &dl_info))
++ {
++ fprintf (stderr, "Can't find my own address '%s'\n", dlerror());
++ return 1;
++ }
++
++ if (!dl_info.dli_fname)
++ {
++ fprintf (stderr, "Can't find my own file name\n");
++ return 1;
++ }
++
++ char cwdstr[NPP_PATH_MAX];
++ if (!getcwd (cwdstr, sizeof(cwdstr)))
++ {
++ fprintf (stderr, "Can't get cwd\n");
++ return 1;
++ }
++
++ char libFileName[NPP_PATH_MAX];
++
++ if (dl_info.dli_fname[0] != '/')
++ {
++ if ((strlen(cwdstr) + 1 + strlen(dl_info.dli_fname)) >= NPP_PATH_MAX)
++ {
++ fprintf (stderr, "Plugin path too long\n");
++ return 1;
++ }
++ strcpy (libFileName, cwdstr);
++ strcat (libFileName, "/");
++ strcat (libFileName, dl_info.dli_fname);
++ }
++ else
++ {
++ if (strlen(dl_info.dli_fname) >= NPP_PATH_MAX)
++ {
++ fprintf (stderr, "Plugin path too long\n");
++ return 1;
++ }
++ strcpy (libFileName, dl_info.dli_fname);
++ }
++
++ char *clobber;
++ static char realFileName[NPP_PATH_MAX] = {0};
++# define SEARCH_SUFFIX "/program/libnpsoplug"
++
++ if (!(clobber = strstr (libFileName, SEARCH_SUFFIX)))
++ {
++ ssize_t len = readlink(libFileName, realFileName, NPP_PATH_MAX-1);
++ if (len == -1)
++ {
++ fprintf (stderr, "Couldn't read link '%s'\n", libFileName);
++ return 1;
++ }
++ realFileName[len] = '\0';
++ if (!(clobber = strstr (realFileName, SEARCH_SUFFIX)))
++ {
++ fprintf (stderr, "Couldn't find suffix in '%s'\n", realFileName);
++ return 1;
++ }
++ *clobber = '\0';
++ }
++ else
++ {
++ *clobber = '\0';
++ strcpy (realFileName, libFileName);
++ }
++ *aResult = realFileName;
++
++ fprintf (stderr, "OpenOffice path is '%s'\n", realFileName);
++
++ return 0;
++}
++#endif
++
+ // *aResult points the static string holding "/opt/staroffice8"
+ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const char* /*entry*/)
+ {
+@@ -134,9 +225,22 @@ int findReadSversion(void** aResult, int
+ // Filename of lnk file, eg. "soffice"
+ char lnkFileName[NPP_PATH_MAX] = {0};
+ char* pTempZero = NULL;
++
++ /* try to fetch a 'self' pointer */
++ if (!nspluginOOoModuleHook (aResult))
++ return 0;
++
++ /* .. now in $HOME */
+ sprintf(lnkFileName, "%s/.mozilla/plugins/libnpsoplugin%s", getenv("HOME"), SAL_DLLEXTENSION);
+- if ((0 > readlink(lnkFileName, realFileName, NPP_PATH_MAX)) ||
+- (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION))))
++ ssize_t len = readlink(lnkFileName, realFileName, NPP_PATH_MAX-1);
++ if (-1 == len)
++ {
++ *realFileName = 0;
++ return -1;
++ }
++ realFileName[len] = '\0';
++
++ if (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION)))
+ {
+ *realFileName = 0;
+ return -1;
Added: openoffice.install
===================================================================
--- openoffice.install (rev 0)
+++ openoffice.install 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,26 @@
+post_install() {
+
+gtk-update-icon-cache -f -q /usr/share/icons/hicolor
+update-desktop-database -q
+
+echo " * relogin or source /etc/profile.d/openoffice.sh"
+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
+}
+
Added: openoffice.profile
===================================================================
--- openoffice.profile (rev 0)
+++ openoffice.profile 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1 @@
+export OOO_FORCE_DESKTOP=gnome
Property changes on: openoffice-base/repos/extra-i686/openoffice.profile
___________________________________________________________________
Added: svn:executable
+ *
Added: shell.patch
===================================================================
--- shell.patch (rev 0)
+++ shell.patch 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,42 @@
+Index: source/unix/sysshell/systemshell.cxx
+===================================================================
+RCS file: /cvs/gsl/shell/source/unix/sysshell/systemshell.cxx,v
+retrieving revision 1.8
+diff -u -r1.8 systemshell.cxx
+--- shell/source/unix/sysshell/systemshell.cxx 19 Jun 2007 16:12:44 -0000 1.8
++++ shell/source/unix/sysshell/systemshell.cxx 13 Apr 2008 15:27:22 -0000
+@@ -62,6 +62,8 @@
+ #include <com/sun/star/uno/XComponentContext.hpp>
+ #endif
+
++#include "uno/current_context.hxx"
++
+ #include "osl/module.hxx"
+
+ using namespace ::com::sun::star;
+@@ -116,6 +118,25 @@
+
+ bool init_recent_manager_api()
+ {
++ bool bInGnome = false;
++ try
++ {
++ uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
++
++ if (xCurrentContext.is())
++ {
++ uno::Any aValue = xCurrentContext->getValueByName(
++ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
++
++ rtl::OUString aDesktopEnvironment;
++ if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsIgnoreAsciiCaseAscii("gnome")) )
++ bInGnome = true;
++ }
++ } catch ( ... ) {}
++
++ if (!bInGnome)
++ return false;
++
+ oslModule hDefault;
+ if( osl_getModuleHandle( NULL, &hDefault ) )
+ {
Added: soffice-detect-mozilla-certificates.diff
===================================================================
--- soffice-detect-mozilla-certificates.diff (rev 0)
+++ soffice-detect-mozilla-certificates.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,27 @@
+--- 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
Added: soltools-mkdepend-getline.diff
===================================================================
--- soltools-mkdepend-getline.diff (rev 0)
+++ soltools-mkdepend-getline.diff 2009-08-26 21:37:43 UTC (rev 50444)
@@ -0,0 +1,43 @@
+--- soltools/mkdepend/def.h.orig 2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h 2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+
+ char *copy();
+ char *base_name();
+-char *getline();
++char *ooo_getline();
+ char *isdefined();
+ struct filepointer *getfile();
+ struct inclist *newinclude();
+--- soltools/mkdepend/main.c.orig 2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c 2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+ * Get the next line. We only return lines beginning with '#' since that
+ * is all this program is ever interested in.
+ */
+-char *getline(filep)
++char *ooo_getline(filep)
+ register struct filepointer *filep;
+ {
+ register char *p, /* walking pointer */
+--- soltools/mkdepend/parse.c.orig 2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c 2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ register int type;
+ boolean recfailOK;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ case IF:
+ doif:
+@@ -168,7 +168,7 @@
+ register char *line;
+ register int type;
+
+- while ((line = getline(filep))) {
++ while ((line = ooo_getline(filep))) {
+ switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ case IF:
+ case IFFALSE:
+
Added: startcenter.desktop
===================================================================
--- startcenter.desktop (rev 0)
+++ startcenter.desktop 2009-08-26 21:37:43 UTC (rev 50444)
@@ -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.1
+Name[af]=OpenOffice.org 3.1
+Name[ar]=أوبن أفيس.أورج
+Name[be at latin]=OpenOffice.org 3.1
+Name[ca]=OpenOffice.org 3.1
+Name[cs]=OpenOffice.org 3.1
+Name[da]=OpenOffice.org 3.1
+Name[de]=OpenOffice.org 3.1
+Name[dz]=ཨོ་པཱན་ཨོ་ཕིསི.ཨོ་ཨར་ཇི།
+Name[el]=OpenOffice.org 3.1
+Name[en_CA]=OpenOffice.org 3.1
+Name[en_GB]=OpenOffice.org 3.1
+Name[es]=OpenOffice.org 3.1
+Name[et]=OpenOffice.org 3.1
+Name[eu]=OpenOffice.org 3.1
+Name[fi]=OpenOffice.org 3.1
+Name[fr]=OpenOffice.org 3.1
+Name[gl]=OpenOffice.org 3.1
+Name[he]=OpenOffice.org 3.1
+Name[hu]=OpenOffice.org 3.1
+Name[it]=OpenOffice.org 3.1
+Name[ko]=OpenOffice.org 3.1
+Name[lt]=OpenOffice.org 3.1
+Name[nb]=OpenOffice.org 3.1
+Name[ne]=ओपनअफिस डट अर्ग
+Name[nl]=OpenOffice.org 3.1
+Name[oc]=OpenOffice.org 3.1
+Name[pl]=OpenOffice.org 3.1
+Name[ps]=اوپنافس.ورګ
+Name[pt]=OpenOffice.org 3.1
+Name[pt_BR]=OpenOffice.org 3.1
+Name[sl]=OpenOffice.org 3.1
+Name[sr]=OpenOffice.org 3.1
+Name[sr at latin]=OpenOffice.org 3.1
+Name[sv]=OpenOffice.org 3.1
+Name[vi]=OpenOffice.org 3.1
+Name[zh_CN]=OpenOffice.org 3.1
+GenericName=Office
More information about the arch-commits
mailing list