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

[andyrtr at archlinux.org]

    Date: Thursday, July 2, 2009 @ 04:58:08
  Author: andyrtr
Revision: 44507

upgpkg: openoffice-base 3.1.0-3
    rebuild for libjpeg; xulrunner plugin doesn't build anymore - disabled for now, add libsm dep

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

-----------+
 ChangeLog |    9 +++++++++
 PKGBUILD  |   21 +++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-07-02 08:03:34 UTC (rev 44506)
+++ ChangeLog	2009-07-02 08:58:08 UTC (rev 44507)
@@ -1,3 +1,12 @@
+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 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-02 08:03:34 UTC (rev 44506)
+++ PKGBUILD	2009-07-02 08:58:08 UTC (rev 44507)
@@ -3,14 +3,14 @@
 
 pkgname=openoffice-base
 pkgver=3.1.0
-pkgrel=2
+pkgrel=3
 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'
+depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland' 'libsm'
          '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'
@@ -18,8 +18,8 @@
             '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.0.4'
-             'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.4') #'boost' 
+             'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
+             'apache-ant>=1.7.1-2' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost' #'xulrunner>=1.9.1-2'
 source=(ftp://ftp.archlinux.org/other/openoffice/${pkgname}-${_OO_milestone}.tar.bz2
 	template.desktop
 	default-no-startup-wizard.diff
@@ -59,6 +59,8 @@
 	[ -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"
@@ -139,7 +141,7 @@
 	--with-system-libwpd\
 	--with-system-libxml\
 	--with-system-libxslt\
-	--with-system-mozilla=libxul\
+	--disable-mozilla\
 	--with-system-neon\
 	--with-system-python\
 	--with-system-redland\
@@ -163,8 +165,11 @@
 	--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
+
+#	--with-system-mozilla=libxul\
 	 
 #	--with-system-boost\
 
@@ -253,9 +258,9 @@
 	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 .
+#	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