diff options
Diffstat (limited to 'staging/libreoffice/PKGBUILD')
| -rw-r--r-- | staging/libreoffice/PKGBUILD | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD index 7b50bdb65..07f3c14e5 100644 --- a/staging/libreoffice/PKGBUILD +++ b/staging/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154787 2012-03-30 17:12:40Z andyrtr $ +# $Id: PKGBUILD 154994 2012-04-01 08:55:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder') _LOver=3.5.1.2 pkgver=3.5.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends #'saxon' - currently broken # 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>=49.1" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -46,7 +46,6 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz ${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -77,10 +76,10 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a + buildfix_icu49.diff libreoffice-common.sh libreoffice-common.csh) noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -111,7 +110,6 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '607b544cd7b38f9e6db6fe7da25007a7' 'a3fa7818bfab14a6cccec645193e9982' '18f577b374d60b3c760a3a3350407632' - '314e582264c36b3735466c522899aa07' 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -142,6 +140,7 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '60ce5dc9bd098f95c2e621a930c98dd9' '661a52a02a31b3afbe4b3b3146061afd' '15fe8b5d79fbdc0b6bc2b454086671e7' + '9734ea20c9f67e1b6e1c5a1247fbd3ff' '32fcd844935434807e68d7bd06b94f09' '06a45184aefe078c4314e002ba666b52') @@ -168,6 +167,7 @@ build() { patch -Np1 -i ${srcdir}/gmake_install.diff patch -Np1 -i ${srcdir}/smp_buildfix.diff patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff + patch -Np0 -i ${srcdir}/buildfix_icu49.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -220,7 +220,6 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ - --without-system-icu \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ @@ -287,7 +286,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' #"icu>=4.6" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' |