Remove libreoffice changes: never worked, make merges harder, probably won't be ported before OpenJDK.

2 files changed, 6 insertions, 37 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 83a13bab8..e53c4c31d 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -10,10 +10,13 @@ pkgname=('libreoffice-common'
 	'libreoffice-impress'
 	'libreoffice-kde4'
 	'libreoffice-math'
+	'libreoffice-sdk'
+	'libreoffice-sdk-doc'
 	'libreoffice-writer'
 	'libreoffice-en-US'
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-pdfimport'
+	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder'
 	'libreoffice-scripting-beanshell'
@@ -43,8 +46,6 @@ makedepends=( # makedepends
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-[ "${CARCH}" != "mips64el" ] && makedepends+=('hsqldb-java' 'apache-ant' 'beanshell' 'junit' 'mesa' 'java-environment' 'libgl' 'lucene')
-
 _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 #_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
@@ -153,14 +154,9 @@ md5sums=('3ddcf145b74daa4361e48dafe97e7d21'
 
 build() {
 
-    if [ "${CARCH}"  != "mips64el" ] ; then
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
 	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
 	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-        extraconf="--enable-opengl --enable-ext-scripting-beanshell --with-system-lucene --with-ant-home=\"/usr/share/java/apache-ant\" --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar --with-java-target-version=1.5 --enable-odk --enable-ext-diagram --enable-ext-google-docs --enable-ext-nlpsolver --enable-ext-report-builder --enable-ext-scripting-javascript --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher"
-    else
-        extraconf="--disable-opengl --without-java --without-system-lucene --without-system-hsqldb --without-system-beanshell --without-system-jfreereport --without-system-saxon --without-system-mesa-headers --without-junit"
-    fi
 
         cd ${srcdir}/libreoffice-core-$_LOver
 
@@ -178,8 +174,6 @@ build() {
     patch -Np1 -i ${srcdir}/buildfix.diff
     patch -Np1 -i ${srcdir}/git_fixes.diff
     
-# Checks if --hash-style is accepted, not if --hash-style=both is accepted.
-    [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
 		case "$i" in
@@ -194,16 +188,10 @@ build() {
 	#autoconf -f
 
 	# non-SMP test build
-<<<<<<< HEAD
-#	export MAKEFLAGS="-j1"
-#	touch autogen.lastrun
-	./autogen.sh --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \
-=======
 	#export MAKEFLAGS="-j1"
 	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
 
 	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
->>>>>>> 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3
 		--with-unix-wrapper="libreoffice" \
 		--enable-split-app-modules \
 		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
@@ -250,6 +238,7 @@ build() {
 		--with-external-thes-dir=/usr/share/mythes \
 		--with-system-beanshell \
 		--with-system-cppunit\
+		--with-system-graphite\
 		--with-system-libwpg \
 		--with-system-libwps \
 		--with-system-redland\
@@ -268,7 +257,6 @@ build() {
 		--with-system-clucene\
 		--without-system-servlet-api \
 		--with-java-target-version=1.5 \
-		$extraconf
 		$EXTRAOPTS
 
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
@@ -294,8 +282,8 @@ package_libreoffice-common() {
           'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
           #'saxon'
- [ "${CARCH}" != "mips64el" ] && depends+=('libgl')
  optdepends=('libreoffice-langpack: additional language support'
+             'java-runtime:     adds java support'
              'libcups:          adds printing support'
              'gconf:            adds additional gnome support'
              'nss:              adds support for signed files/macros'
@@ -308,16 +296,8 @@ package_libreoffice-common() {
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
-<<<<<<< HEAD
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- [ "${CARCH}" != "mips64el" ] && optdepends+=('java-runtime:     adds java support' \
-             'hsqldb-java:      default database format for OpenOffice.org' \
-             'beanshell:        interactive java -- good for prototyping /macros' \
-             'lucene:           full-text search engine library for Java needed in the help section')
-=======
              'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
              'gtk2:             for browser plugin')
->>>>>>> 2a4c41bf2946fad65b14cf1b4ea284ebce0f11f3
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
          etc/libreoffice/psprint.conf)
@@ -487,7 +467,7 @@ package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
  depends=('libreoffice-common')
- [ "${CARCH}" != "mips64el" ] && optdepends=('mesa:             for the OGLTrans extension')
+ optdepends=('mesa:             for the OGLTrans extension')
  backup=()
  groups=('libreoffice')
  replaces=('libreoffice')
diff --git a/extra/libreoffice/fix-nobody-temp-dir.patch b/extra/libreoffice/fix-nobody-temp-dir.patch
deleted file mode 100644
index a36465c05..000000000
--- a/extra/libreoffice/fix-nobody-temp-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig	2011-11-05 19:38:58.812005183 +0100
-+++ bridges/source/cpp_uno/shared/vtablefactory.cxx	2011-11-05 19:40:01.654548478 +0100
-@@ -263,7 +263,7 @@
- 
-     for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i)
-     {
--        if (!strDirectory.getLength())
-+        if (strDirectory.getLength() < 2)
-             strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" ));
- 
-         strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" ));