From 600d5378dadf22b8517d52ac19500594bce4b66d Mon Sep 17 00:00:00 2001 From: root Date: Sun, 13 Nov 2011 23:14:59 +0000 Subject: Sun Nov 13 23:14:59 UTC 2011 --- extra/libreoffice/PKGBUILD | 99 ++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 60 deletions(-) (limited to 'extra/libreoffice') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 15b67b82a..393d6716e 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $ +# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -35,16 +35,16 @@ pkgname=('libreoffice-common' 'libreoffice-extension-validator' 'libreoffice-extension-watch-window' 'libreoffice-extension-wiki-publisher') -_LOver=3.4.3.2 -pkgver=3.4.3 -pkgrel=4 +_LOver=3.4.4.2 +pkgver=3.4.4 +pkgrel=3 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" 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. + 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' 'boost' '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' @@ -52,15 +52,15 @@ makedepends=( # makedepends # the depends from libreoffice main pkg "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' 'orbit2' # keep gtk2 for install script + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # 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 # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -88,10 +88,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt @@ -106,14 +103,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_ct2n.diff 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 - 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) + RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -148,28 +140,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) -md5sums=('7c2e73f1197d169519f86efe422e5df9' - '823956297a7e0b7603c585c49bd9fd4e' - '465b3be0e30f88e1139c45d2e2217927' - 'a1d5af5be5eb522c8a24feacbb0161fa' - '8b972e130dfe62eb41d1d71d72de4b76' - 'a6b22494e3a65a3b242ecb896aa7ab48' - 'b7d86f8baee5b31af210cc81785e5676' - 'de6c062d334daab99cf0592aa3568215' - 'df46914d540ef0126cd746d09c68ca2a' - '8f308250c397ddc6fdb1aae13e102927' - '1fd00a0fcfd4a5d1956c3f6a0990d1ce' - '86914ac8bc30ea721b708b2f2faa3111' - '1452229e57ac3c4191e798eac4c0a7e0' - 'bb46bdb682689629d432cdbf5f3f42c2' - 'bec7f633562762debdf810690002e688' - '87061613efece1c253906a90cd4dc01f' - '308284d7d1d1bd6860d128b26e24390b' - 'fa8b36365a2b2fb110c44886d7069774' - 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) +md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' + 'db423cbb1cee416b718138044a5de930' + '31944d2139d6d81ef1131bd513530621' + 'f447fd4ffe54aab9561c6caa262754b3' + '97fe698737a35c8803712d4e08007620' + 'acff44d97a5106d9b53c747dabeb0800' + '620d43a0b9f36388f423e030513864ef' + '4c5b1ed870363eca2602f0cb42a8415a' + '702c6ca31525d7d2c2ded86c77b0bd2e' + 'ac9b3acf78f43c1395d0e2dedc860f30' + 'd8d2c41cb86bc8ba2a07e001a5317abb' + '4d4af2fc06dbe33ec2307df812f7abe1' + '1398a566eb76598bf3005e187fc2386c' + 'dd962d2d57f88b9e07e665adad3cabbc' + 'fff0fc9cd16ef1eb2b2ed5d0a6e77f95' + 'e54d41d39e63d04ac4a88ce79e37af98' + 'dbc71403040f447683bf55d1f0be3cad' + '69ce5b72f44b008d0e78767c5b1dbf39' + '34a2e8ae6b81a042966740263c53e135' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -195,10 +185,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '0625a7d661f899a8ce263fc8a9879108' '451ccf439a36a568653b024534669971' '7e7efc5d4a03126bb9ae3ae9aa2c4e87' '41c9b65ad60af4b3255bbecdfef11736' @@ -213,17 +200,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' - 'ca6032e86229ae798f3744ae244f5bfe' '3c6c62e77c30649a3dfe73512947cc9a' - '64497be966802e62ffe3282d3facf7b7' - '89ff871e77e10357a976fe9d1ab3a65a' - 'c4cb0d7f2602396a3f4cac55b8a4e308' - 'b8f1fb7f3902d22aeaa2575c6b08a62c') + 'eb35d4c715e0dfc23bbc706996033829') build() { unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh @@ -244,16 +227,12 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_boost.diff + #patch -Np1 -i ${srcdir}/buildfix_boost.diff 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 + patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -282,7 +261,7 @@ build() { # fi # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -v -f + autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" @@ -299,7 +278,6 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ @@ -342,6 +320,7 @@ build() { --with-external-hyph-dir=/usr/share/hyphen \ --with-external-thes-dir=/usr/share/mythes \ --with-system-cppunit\ + --with-system-graphite\ --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ @@ -350,7 +329,7 @@ build() { --with-external-libtextcat-data \ --with-openldap\ --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ + --with-system-boost\ --with-system-cairo\ --with-system-libs\ --with-system-mozilla\ @@ -393,7 +372,7 @@ package_libreoffice-common() { install=${pkgbase}.install 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' + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script #'java-runtime' #'saxon' -- cgit v1.2.3-54-g00ecf