[arch-commits] Commit in libreoffice/trunk (PKGBUILD.40)

[andyrtr at archlinux.org]

    Date: Friday, November 30, 2012 @ 14:21:56
  Author: andyrtr
Revision: 172174

prepare 4.0 release; move to gstreamer 1.0.x

Modified:
  libreoffice/trunk/PKGBUILD.40

-------------+
 PKGBUILD.40 |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD.40
===================================================================
--- PKGBUILD.40	2012-11-30 16:26:29 UTC (rev 172173)
+++ PKGBUILD.40	2012-11-30 19:21:56 UTC (rev 172174)
@@ -26,7 +26,7 @@
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.0.0.alpha1
 pkgver=4.0.0
-pkgrel=0.alpha1.1
+pkgrel=0.alpha1.2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -34,7 +34,7 @@
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
              'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
+             'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1-2" 
@@ -165,7 +165,7 @@
 
 build() {
 
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
+	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
 	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
 
@@ -202,7 +202,7 @@
 
 	# non-SMP test build
 	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
+	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 
 	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
 		--with-unix-wrapper="libreoffice" \
@@ -222,17 +222,15 @@
 		--disable-kde\
 		--enable-kde4\
 		--enable-gtk3 \
+		--enable-gstreamer \
 		--enable-lockdown\
 		--enable-mergelibs \
 		--enable-opengl \
 		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
 		--enable-ext-wiki-publisher \
 		--enable-ext-nlpsolver \
 		--disable-ext-mysql-connector \
 		--with-system-mysql \
-		--enable-librsvg=system \
 		--without-fonts\
 		--without-afms\
 		--without-ppds\
@@ -258,7 +256,6 @@
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
-		--without-system-saxon\
 		--disable-mozilla \
 		--without-system-mozilla \
 		--without-system-npapi-headers \
@@ -272,9 +269,9 @@
 		--with-alloc=system\
 		--with-system-clucene\
 		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
+		--with-java-target-version=1.6
 
+
 #configure: WARNING: unrecognized options: --enable-ext-scripting-beanshell, --enable-ext-scripting-javascript, --enable-librsvg, --without-system-saxon
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -312,7 +309,7 @@
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
+             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
              'gtk2:             for browser plugin')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc