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

[andyrtr at archlinux.org]

    Date: Wednesday, October 5, 2011 @ 22:53:19
  Author: andyrtr
Revision: 140046

upgpkg: libreoffice 3.4.3-4

poppler rebuild; add some upstream fixes to make it build

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-06 02:16:00 UTC (rev 140045)
+++ PKGBUILD	2011-10-06 02:53:19 UTC (rev 140046)
@@ -37,7 +37,7 @@
 	'libreoffice-extension-wiki-publisher')
 _LOver=3.4.3.2
 pkgver=3.4.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -45,7 +45,7 @@
 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 
@@ -107,7 +107,11 @@
 	vbahelper.visibility.patch
 	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)
+	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
@@ -210,7 +214,11 @@
          '43b145db28e6c0d73578ae6fd35e510d'
          '37638431e7e40baf2e47966ebb9bc0e9'
          'ca6032e86229ae798f3744ae244f5bfe'
-         '3c6c62e77c30649a3dfe73512947cc9a')
+         '3c6c62e77c30649a3dfe73512947cc9a'
+         '64497be966802e62ffe3282d3facf7b7'
+         '89ff871e77e10357a976fe9d1ab3a65a'
+         'c4cb0d7f2602396a3f4cac55b8a4e308'
+         'b8f1fb7f3902d22aeaa2575c6b08a62c')
 
 build() {
 
@@ -242,6 +250,10 @@
 	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