[arch-commits] CVS update of extra/office/openoffice-base (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, March 1, 2008 @ 14:39:03
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

   Added: soffice.diff (1.1)
Modified: ChangeLog (1.4 -> 1.5) PKGBUILD (1.66 -> 1.67)

upgpkg: openoffice-base 2.4.0-0.2


--------------+
 ChangeLog    |    4 ++++
 PKGBUILD     |   18 ++++++++++++------
 soffice.diff |   16 ++++++++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)


Index: extra/office/openoffice-base/ChangeLog
diff -u extra/office/openoffice-base/ChangeLog:1.4 extra/office/openoffice-base/ChangeLog:1.5
--- extra/office/openoffice-base/ChangeLog:1.4	Thu Feb 14 17:25:59 2008
+++ extra/office/openoffice-base/ChangeLog	Sat Mar  1 14:39:03 2008
@@ -1,3 +1,7 @@
+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
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.66 extra/office/openoffice-base/PKGBUILD:1.67
--- extra/office/openoffice-base/PKGBUILD:1.66	Thu Feb 14 23:03:19 2008
+++ extra/office/openoffice-base/PKGBUILD	Sat Mar  1 14:39:03 2008
@@ -3,11 +3,11 @@
 
 pkgname=openoffice-base
 pkgver=2.4.0
-pkgrel=0.1 # =RC1
+pkgrel=0.2 # =RC2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=('i686' 'x86_64')
-_OO_milestone=ooh680-m7
-#_OO_milestone=OOH680_m7
+_OO_milestone=ooh680-m8
+#_OO_milestone=OOH680_m8
 license=('LGPL')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -56,13 +56,14 @@
 	libxmlsec-findcerts.diff
 	soffice-detect-mozilla-certificates.diff
 	gtkunixprintdialog.diff
+	soffice.diff
 	#http://oooconv.free.fr/fontooo/FontOOo.sxw
 	FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
 	awt_x86_64.diff) # only for Sun builds needed
 options=('!distcc' 'ccache' '!emptydirs')
-md5sums=('2757e74404ae800baa7b727f3f0684ae'
-         'ff5495ee992dfd8cce27a54d1a3fbfaf'
-         '1e6de10d2481d7144e095b40cf9931f3'
+md5sums=('0908a608f233abe7bdec8cecc9a6a925'
+         'e21c671864612514cbae46a5dfe44c13'
+         '243a8b2d747683004c54ca673eefa809'
          'a728dcd463c1aa7ca5db75146377a0d1'
          '0faab33566196ddc9c405d68cf614663'
          '39e4c1b1e864b22ee4650b2bff44c695'
@@ -73,6 +74,7 @@
          'a8b96e9d0ce92a8f6690f277b1cfacc9'
          '1dc7480a04f572ad136d35923a2af66d'
          '076d59389390afe6f1cd91a4f5cbab23'
+         '44174ef4e71ba835fcd2a59733213cc9'
          '1fc1ca5205730655eab2d2e119aa06fe'
          '83bb5e235c4e4062eed404829d760c14')
 
@@ -296,4 +298,8 @@
 	mkdir -p $startdir/pkg/usr/lib/mozilla/plugins/
 	cd $startdir/pkg/usr/lib/mozilla/plugins/
 	ln -v -s /opt/openoffice/program/libnpsoplugin.so .
+
+	# fix soffice not starting without set environment
+	cd $startdir/pkg/opt/openoffice/program/
+	patch -Np0 -i $startdir/src/soffice.diff
 }
Index: extra/office/openoffice-base/soffice.diff
diff -u /dev/null extra/office/openoffice-base/soffice.diff:1.1
--- /dev/null	Sat Mar  1 14:39:03 2008
+++ extra/office/openoffice-base/soffice.diff	Sat Mar  1 14:39:03 2008
@@ -0,0 +1,16 @@
+*** soffice.orig    2007-10-27 16:40:34.000000000 +0200
+--- soffice    2007-10-27 16:41:14.000000000 +0200
+***************
+*** 34,39 ****
+--- 34,44 ----
+  #
+  #*************************************************************************
+  
++ if [ -z $SAL_USE_VCLPLUGIN ]; then
++         export SAL_USE_VCLPLUGIN=gtk
++ fi
++ # export SAL_ENABLE_NATIVE_XFONTS=0
++ 
+  #
+  # STAR_PROFILE_LOCKING_DISABLED=1
+  # export STAR_PROFILE_LOCKING_DISABLED