[arch-commits] Commit in go-openoffice/repos (4 files)

[andyrtr at archlinux.org]

    Date: Sunday, May 3, 2009 @ 04:32:25
  Author: andyrtr
Revision: 37575

Merged revisions 37424,37574 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/go-openoffice/trunk

........
  r37424 | andyrtr | 2009-05-01 16:19:04 +0000 (Fr, 01 Mai 2009) | 2 lines
  
  upgpkg: go-openoffice 3.0.99.7-1
      new version 3.0.99.7
........
  r37574 | andyrtr | 2009-05-03 08:31:43 +0000 (So, 03 Mai 2009) | 2 lines
  
  upgpkg: go-openoffice 3.0.99.7-2
      with stlport causes extensions not working on x86_64, move mono and gstreamer to optdepends
........

Modified:
  go-openoffice/repos/extra-x86_64/	(properties)
  go-openoffice/repos/extra-x86_64/ChangeLog
  go-openoffice/repos/extra-x86_64/PKGBUILD
Deleted:
  go-openoffice/repos/extra-x86_64/ooo-build-3.0.99.6-apply.diff

-------------------------------+
 ChangeLog                     |    7 +++++++
 PKGBUILD                      |   18 +++++++++++++-----
 ooo-build-3.0.99.6-apply.diff |   10 ----------
 3 files changed, 20 insertions(+), 15 deletions(-)


Property changes on: go-openoffice/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /go-openoffice/trunk:1-37406
   + /go-openoffice/trunk:1-37574

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-05-03 08:31:43 UTC (rev 37574)
+++ extra-x86_64/ChangeLog	2009-05-03 08:32:25 UTC (rev 37575)
@@ -1,3 +1,10 @@
+2009-05-02 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.0.99.7-2 :
+	build without stlport on x86_64 and with on i686
+	to fix extensions (e.g. SunPDFImport)
+	try move mono and gstreamer to optdepends
+
 2009-04-25 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.0.99.7-1 :

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-03 08:31:43 UTC (rev 37574)
+++ extra-x86_64/PKGBUILD	2009-05-03 08:32:25 UTC (rev 37575)
@@ -4,7 +4,7 @@
 pkgname=go-openoffice
 pkgver=3.0.99.7
 _GOver=3.0.99.7
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
 arch=('i686' 'x86_64')
 _go_tree="OOO310"
@@ -13,18 +13,21 @@
 license=('LGPL3')
 url="http://go-oo.org/"
 install=${pkgname}.install
-depends=("curl>=7.19.4" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland' 'gstreamer0.10-base-plugins>=0.10.22'
-         'libxaw' "neon>=0.28.3-2" "icu>=4.0-2" 'hsqldb-java' 'libxslt' 'libxtst' 'desktop-file-utils' 'mono>=2.4')
+depends=("curl>=7.19.4" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland' 
+         'libxaw' "neon>=0.28.3-2" "icu>=4.0-2" 'hsqldb-java' 'libxslt' 'libxtst' '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'
 	    'poppler:		for the pdfimport extension'
-	    'mesa:		for the OGLTrans extension')
+	    'mesa:		for the OGLTrans extension'
+	    'mono:		allows UNO automation with Mono'
+	    'gstreamer0.10-base:	+ some gstr-plugins to support multimedia content, e.g. in impress')
 makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
 	'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.0.10" 'apache-ant' 'cairo' 
-	'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.4" 'unixodbc' 'mesa>=7.4' 'poppler>=0.10.5') # 'boost' # 'libjpeg' 
+	'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.4" 'unixodbc' 'mesa>=7.4' 'poppler>=0.10.5'
+	'gstreamer0.10-base>=0.10.22'  'mono>=2.4') # 'boost' # 'libjpeg' 
 provides=('openoffice-base')
 conflicts=('openoffice-base')
 _mirror="http://download.go-oo.org/"
@@ -90,6 +93,11 @@
 
 	export ARCH_FLAGS="${CXXFLAGS}"
 
+	if [ "$CARCH" = "x86_64" ]; then
+	      EXTRAOPTS="--without-stlport"
+	 else EXTRAOPTS="--with-stlport"
+	fi
+
 	./configure --with-distro=ArchLinux \
 		--with-build-version="${_GOver} ArchLinux build-${pkgrel} (${_OO_milestone})" \
 		--with-srcdir=${srcdir} \

Deleted: extra-x86_64/ooo-build-3.0.99.6-apply.diff
===================================================================
--- extra-x86_64/ooo-build-3.0.99.6-apply.diff	2009-05-03 08:31:43 UTC (rev 37574)
+++ extra-x86_64/ooo-build-3.0.99.6-apply.diff	2009-05-03 08:32:25 UTC (rev 37575)
@@ -1,10 +0,0 @@
---- patches/dev300/apply.old	2009-04-24 18:37:11.000000000 +0200
-+++ patches/dev300/apply	2009-04-24 18:53:06.000000000 +0200
-@@ -2903,7 +2903,6 @@ xlsx-snapshot.diff
- # (converts the xlsx export to a UNO filter)
- xlsx-shared-import-and-export.diff
- 
--[ Fixes ]
- # manually force page preview obj to PRESOBJ_PAGE
- sd-pptin-slidepreview-fix.diff, i#101051, thorsten
-