[arch-commits] Commit in openoffice-base-beta/trunk (ChangeLog PKGBUILD)

[andyrtr at archlinux.org]

    Date: Wednesday, April 28, 2010 @ 09:23:46
  Author: andyrtr
Revision: 78839

upgpkg: openoffice-base-beta 3.2.1_ooo320_m16-1
new version; beta snapshot OOO320_m16

Modified:
  openoffice-base-beta/trunk/ChangeLog
  openoffice-base-beta/trunk/PKGBUILD

-----------+
 ChangeLog |    2 +-
 PKGBUILD  |   34 ++++++++++++++++++++++------------
 2 files changed, 23 insertions(+), 13 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-04-28 13:16:17 UTC (rev 78838)
+++ ChangeLog	2010-04-28 13:23:46 UTC (rev 78839)
@@ -7,7 +7,7 @@
 	- disable system saxon
 	- stick to internal cppunit
 	- force configure to use internal redland
-	- --enable-layout again - add buildfixes for this
+	# - --enable-layout again - add buildfixes for this - referred for now
 
 2010-04-16 Andreas Radke <andyrtr at archlinux.org>
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-28 13:16:17 UTC (rev 78838)
+++ PKGBUILD	2010-04-28 13:23:46 UTC (rev 78839)
@@ -30,10 +30,15 @@
 	buildfix_system_db48.diff
 	redland.patch
 	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/cppu-lbnames-enable-gcc-4.5.diff
-	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/layout-parallel-build.diff
-	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/build-fix-layout-numfmt.diff
-	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/buildfix-svx-uiconfig-layout.diff
-	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/buildfix-sw-uiconfig-layout.diff
+	# fixes for ---enable-layout
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/layout-parallel-build.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/build-fix-layout-numfmt.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/buildfix-svx-uiconfig-layout.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/buildfix-sw-uiconfig-layout.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/buildfix-toolkit-workben-layout.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/tree/patches/dev300/layout-generate-localize-sdf.diff
+#	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/layout-localize-fix-sc.diff
+	http://cgit.freedesktop.org/ooo-build/ooo-build/plain/patches/dev300/vcl-system-graphite-with-stlport.diff
 	openoffice-beta.profile)
 options=('!distcc' '!ccache' '!makeflags')
 
@@ -73,14 +78,20 @@
 	patch -Np0 -i ${srcdir}/buildfix_system_db48.diff || return 1
 	# fix for --enable-layout 
 	# /bin/bash: tralay: command not found
-	patch -Np0 -i ${srcdir}/layout-parallel-build.diff || return 1
-	patch -Np0 -i ${srcdir}/build-fix-layout-numfmt.diff || return 1
-	patch -Np0 -i ${srcdir}/buildfix-svx-uiconfig-layout.diff || return 1
-	patch -Np0 -i ${srcdir}/buildfix-sw-uiconfig-layout.diff || return 1
+#	patch -Np0 -i ${srcdir}/layout-parallel-build.diff || return 1
+#	patch -Np0 -i ${srcdir}/build-fix-layout-numfmt.diff || return 1
+#	patch -Np0 -i ${srcdir}/buildfix-svx-uiconfig-layout.diff || return 1
+#	patch -Np0 -i ${srcdir}/buildfix-sw-uiconfig-layout.diff || return 1
+#	patch -Np0 -i ${srcdir}/buildfix-toolkit-workben-layout.diff || return 1
 
+#	patch -Np0 -i ${srcdir}/layout-generate-localize-sdf.diff || return 1
+#	patch -Np0 -i ${srcdir}/layout-localize-fix-sc.diff || return 1
+	
 	# gcc4.5 fix
 	patch -Np0 -i ${srcdir}/cppu-lbnames-enable-gcc-4.5.diff || return 1
-	
+	# allow system graphite with stlport
+	patch -Np0 -i ${srcdir}/vcl-system-graphite-with-stlport.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
@@ -138,7 +149,6 @@
 	--enable-gtk\
 	--enable-graphite\
 	--enable-kde4\
-	--enable-layout\
 	--enable-ldap\
 	--enable-lockdown\
 	--enable-mediawiki\
@@ -212,8 +222,8 @@
  install=openoffice.install
  depends=("curl>=7.20.0" "hunspell>=1.2.8" "python>=2.6.5" 'libwpd' 'libxaw' "neon>=0.28.6" 'gtk2'
           'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 
-	  'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene')
- # 'libmythes' 'redland' 
+	  'beanshell' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap' 'lucene')
+ # 'libmythes' 'redland'  'saxon' 
  optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'