Tue Oct 18 23:14:48 UTC 2011

1 files changed, 25 insertions, 7 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 92f5cb6d6..15b67b82a 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 138502 2011-09-25 14:55:46Z andyrtr $
+# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -37,7 +37,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.3.2
 pkgver=3.4.3
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -45,7 +45,7 @@ license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes.
-             'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
+             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
              'beanshell'  'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment'
               #'saxon' - currently broken 
@@ -53,7 +53,7 @@ makedepends=( # makedepends
              "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' "icu>=4.6" 'libxslt'
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' #'libgraphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script
+             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script
 	     'ttf-dejavu') # to satisfy regression tests
 	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # http://download.documentfoundation.org/mirrors/all.html
@@ -105,7 +105,13 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	scp2-more-reasonable-file-access-rights.diff)
+	scp2-more-reasonable-file-access-rights.diff
+	java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842
+	oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
+	poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe
+	pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b
+	poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b
+	build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
@@ -206,7 +212,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '37638431e7e40baf2e47966ebb9bc0e9')
+         '37638431e7e40baf2e47966ebb9bc0e9'
+         'ca6032e86229ae798f3744ae244f5bfe'
+         '3c6c62e77c30649a3dfe73512947cc9a'
+         '64497be966802e62ffe3282d3facf7b7'
+         '89ff871e77e10357a976fe9d1ab3a65a'
+         'c4cb0d7f2602396a3f4cac55b8a4e308'
+         'b8f1fb7f3902d22aeaa2575c6b08a62c')
 
 build() {
 
@@ -236,6 +248,12 @@ build() {
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
+	patch -Np1 -i ${srcdir}/java-detection.diff
+	patch -Np1 -i ${srcdir}/oracle-recognition.diff
+	patch -Np1 -i ${srcdir}/poppler-check.diff
+	patch -Np1 -i ${srcdir}/pdfimport.diff
+	patch -Np1 -i ${srcdir}/poppler-buildfix.diff
+	patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -376,7 +394,7 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
           'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
           'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script 
+          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script 
 	  #'java-runtime' 
           #'saxon'
  optdepends=('libreoffice-langpack: additional language support'