[arch-commits] Commit in openoffice-base/repos/extra-i686 (13 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Aug 26 16:22:17 UTC 2009
Date: Wednesday, August 26, 2009 @ 12:22:17
Author: andyrtr
Revision: 50438
fix svn conflicts
Deleted:
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/openoffice.install
openoffice-base/repos/extra-i686/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
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/template.desktop
------------------------------------------------------+
ChangeLog | 112 ------
PKGBUILD | 276 -----------------
buildfix-gcc43.diff | 10
buildfix-sw-printf.diff | 21 -
default-no-startup-wizard.diff | 19 -
default-system-fpicker.diff | 13
openoffice.install | 25 -
openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch | 16
openoffice.profile | 1
shell.patch | 42 --
soffice-detect-mozilla-certificates.diff | 27 -
soltools-mkdepend-getline.diff | 43 --
template.desktop | 50 ---
13 files changed, 655 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2009-08-26 11:46:35 UTC (rev 50437)
+++ ChangeLog 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,112 +0,0 @@
-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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2009-08-26 11:46:35 UTC (rev 50437)
+++ PKGBUILD 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,276 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
-
-pkgname=openoffice-base
-pkgver=3.1.0
-pkgrel=5
-pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
-arch=(i686 x86_64)
-_OO_milestone=OOO310_m11 # =RC2 = final
-license=('LGPL3')
-url="http://www.openoffice.org"
-install=openoffice.install
-depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland'
- 'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.2' 'hsqldb-java' 'libxslt' '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-2' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost'
-source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
- template.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
- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch)
-options=('!distcc' '!ccache' '!makeflags')
-md5sums=('650d8f2b648b291688bed9821f9dda91'
- '5e22f876c3c5d4754af394399e9bf375'
- '71f136a31e296a04ab68932a31dd533e'
- '6c596129fb48316226ce3adfd3a4c86d'
- '1dc7480a04f572ad136d35923a2af66d'
- 'bf7119084a2d1e0566b5e34b57dce8eb'
- 'a51200f770c635355c430cc5052db8cf'
- '8d68d44c941a687813ddd968383cdf27'
- '7f9012680d0e329227445925710bafe6'
- '2461119a2b7f1580f997f504a76a1c98'
- '75c7e5dd7cf4c266f48565fb6425f8c4')
-
-
-# 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 -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || 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
-
- # 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
-
-#
-# --disable-mozilla\
-# --with-system-boost\
-
- # 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
-
- cd ${pkgdir}/opt/
-
- ## Step 1
- cd ${pkgdir}/opt/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}/opt/ || 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}/opt/ || return 1
- rmdir ${pkgdir}/opt/openoffice.org || return 1
- mv openoffice.org3 openoffice || return 1
-
- # prepare filesystem entries
- mkdir -p ${pkgdir}/usr/{bin,share/applications}
- mkdir -p ${pkgdir}/usr/share/icons/{hicolor,locolor}
-
- # make symlinks
- cd ${pkgdir}/usr/bin
- ln -s ../../opt/openoffice/program/soffice soffice
- ln -s ../../opt/openoffice/program/spadmin spadmin
-
- # 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}/opt/openoffice/share/extension/install/$i || return 1
- done
- popd
-
- # install shortcuts
- mv ${pkgdir}/opt/openoffice/share/xdg/*.desktop ${pkgdir}/usr/share/applications
- cd ${pkgdir}/usr/share/applications
- sed -i -e 's|Exec=openoffice.org3|Exec=/opt/openoffice/program/soffice|g' *.desktop || return 1
- sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/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 shortcuts
- sed -i -e 's|Icon=openofficeorg3-|Icon=|g' *.desktop
- # add template desktop file
- install -D -m644 ${srcdir}/template.desktop ${pkgdir}/usr/share/applications/template.desktop || return 1
-
- # 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
-
- # link the mozilla-plugin
- mkdir -p ${pkgdir}/usr/lib/mozilla/plugins/
- cd ${pkgdir}/usr/lib/mozilla/plugins/
- ln -v -s /opt/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
-}
Deleted: buildfix-gcc43.diff
===================================================================
--- buildfix-gcc43.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ buildfix-gcc43.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,10 +0,0 @@
---- 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"
-
-
Deleted: buildfix-sw-printf.diff
===================================================================
--- buildfix-sw-printf.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ buildfix-sw-printf.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,21 +0,0 @@
---- 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"
-
Deleted: default-no-startup-wizard.diff
===================================================================
--- default-no-startup-wizard.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ default-no-startup-wizard.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -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)
Deleted: default-system-fpicker.diff
===================================================================
--- default-system-fpicker.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ default-system-fpicker.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,13 +0,0 @@
---- 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>
Deleted: openoffice.install
===================================================================
--- openoffice.install 2009-08-26 11:46:35 UTC (rev 50437)
+++ openoffice.install 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,25 +0,0 @@
-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 /opt/openoffice/share/extension/install what"
-echo " is shipped with this package"
-}
-
-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 /opt/openoffice
-}
-
Deleted: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
===================================================================
--- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 2009-08-26 11:46:35 UTC (rev 50437)
+++ openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,16 +0,0 @@
-Index: source/plugin/inc/plugin/unx/plugcon.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
-retrieving revision 1.13.64.2
-diff -u -r1.13.64.2 plugcon.hxx
---- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 15 Dec 2008 10:29:47 -0000 1.13.64.2
-+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx 23 Dec 2008 09:24:57 -0000
-@@ -102,7 +102,7 @@
- extern "C" {
- #include <npsdk/npupp.h>
- }
--#include <npapi.h>
-+#include <npsdk/npapi.h>
-
- #if NP_VERSION_MINOR < 17
- // compatibility hack: compile with older NPN api header, but define
Deleted: openoffice.profile
===================================================================
--- openoffice.profile 2009-08-26 11:46:35 UTC (rev 50437)
+++ openoffice.profile 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1 +0,0 @@
-export OOO_FORCE_DESKTOP=gnome
Deleted: shell.patch
===================================================================
--- shell.patch 2009-08-26 11:46:35 UTC (rev 50437)
+++ shell.patch 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,42 +0,0 @@
-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 ) )
- {
Deleted: soffice-detect-mozilla-certificates.diff
===================================================================
--- soffice-detect-mozilla-certificates.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ soffice-detect-mozilla-certificates.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -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
Deleted: soltools-mkdepend-getline.diff
===================================================================
--- soltools-mkdepend-getline.diff 2009-08-26 11:46:35 UTC (rev 50437)
+++ soltools-mkdepend-getline.diff 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,43 +0,0 @@
---- 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:
-
Deleted: template.desktop
===================================================================
--- template.desktop 2009-08-26 11:46:35 UTC (rev 50437)
+++ template.desktop 2009-08-26 16:22:17 UTC (rev 50438)
@@ -1,50 +0,0 @@
-[Desktop Entry]
-Version=0.92
-Encoding=UTF-8
-MultipleArgs=false
-Terminal=0
-Icon=extension.png
-Exec=/opt/openoffice/program/soffice slot:5500
-Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
-Type=Application
-Name=OpenOffice.org 3.1 From Template
-Name[en]=OpenOffice.org 3.1 From Template
-Name[de]=OpenOffice.org 3.1 Aus Vorlage
-Name[pt]=OpenOffice.org 3.1 Aus Vorlage
-Name[ru]=OpenOffice.org 3.1 из шаблона...
-Name[el]=OpenOffice.org 3.1 Από πρότυπο
-Name[nl]=OpenOffice.org 3.1 Uit sjabloon
-Name[fr]=À partir d'un modèle OpenOffice.org 3.1
-Name[es]=A partir de una plantilla de OpenOffice.org 3.1
-Name[fi]=OpenOffice.org 3.1 Aus Vorlage
-Name[hu]=OpenOffice.org 3.1 sablonból
-Name[it]=OpenOffice.org 3.1 Da modello
-Name[cs]=Ze šablony OpenOffice.org 3.1
-Name[sk]=Zo šablóny OpenOffice.org 3.1
-Name[da]=OpenOffice.org 3.1 Fra skabelon
-Name[sv]=Från en OpenOffice.org 3.1-mall
-Name[pl]=OpenOffice.org 3.1 Na podstawie szablonu
-Name[pt_BR]=A partir de um modelo OpenOffice.org 3.1
-Name[ja]=OpenOffice.org 3.1 テンプレートから
-Name[ko]=OpenOffice.org 3.1 서식 파일로부터
-Name[zh_CN]=OpenOffice.org 3.1 采用样式
-Name[zh_TW]=OpenOffice.org 3.1 採用樣式
-Name[tr]=OpenOffice.org 3.1 Şablondan
-Name[ar]=OpenOffice.org 3.1 Aus Vorlage
-Name[he]=OpenOffice.org 3.1 Aus Vorlage
-Name[ca]=OpenOffice.org 3.1 Aus Vorlage
-Name[th]=OpenOffice.org 3.1 จากแม่แบบ
-Name[hi_IN]=OpenOffice.org 3.1 Aus Vorlage
-Name[et]=OpenOffice.org 3.1 mallist
-Name[sl]=OpenOffice.org 3.1 iz predloge
-Name[ns]=OpenOffice.org 3.1 go tšwa go Template
-Name[af]=OpenOffice.org 3.1 vanaf sjabloon
-Name[zu]=I-OpenOffice.org 3.1 esuka Oqwenjini lokuphumelelisa
-Name[nb]=OpenOffice.org 3.1 From Template
-Name[cy]=OpenOffice.org 3.1 From Template
-Name[tn]=OpenOffice.org 3.1 From Template
-Name[nn]=OpenOffice.org 3.1 From Template
-Name[eu]=OpenOffice.org 3.1 Aus Vorlage
-Name[lt]=„OpenOffice.org 3.1“ dokumentas iš šablono
-Name[kn_IN]=OpenOffice.org 3.1 ಸಿದ್ಧವಿನ್ಯಾಸ ಪುಟದಿಂದ
-Name[gl]=A partir dun modelo de OpenOffice.org 3.1
More information about the arch-commits
mailing list