From 0f9e4ba23bb6296d8bb8010f70d868fd08db9c54 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 23:14:33 +0000 Subject: Sun Aug 7 23:14:33 UTC 2011 --- extra/libreoffice/PKGBUILD | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'extra/libreoffice') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 96155e9b3..ebcbdab57 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134107 2011-08-01 16:13:27Z stephane $ +# $Id: PKGBUILD 134623 2011-08-06 17:29:22Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -37,7 +37,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.2.3 pkgver=3.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" @@ -52,13 +52,13 @@ 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' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # 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" +_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 @@ -90,6 +90,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions 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://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 http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt @@ -141,7 +142,8 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) + f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2 '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2 @@ -190,6 +192,7 @@ md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2 'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 + '0625a7d661f899a8ce263fc8a9879108' #0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt @@ -282,7 +285,7 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --disable-graphite\ + --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ @@ -348,7 +351,6 @@ build() { #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool -#--with-system-graphite --enable-graohite ? #--with-servlet-api-jar=JARFILE # see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 # --with-system-saxon\ @@ -402,7 +404,7 @@ package_libreoffice-common() { etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) groups=('libreoffice') - provides=('go-openoffice' 'libreoffice') + provides=('go-openoffice') conflicts=('go-openoffice') replaces=('go-openoffice' 'openoffice-base' 'libreoffice') @@ -446,6 +448,7 @@ package_libreoffice-base() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do @@ -467,6 +470,7 @@ package_libreoffice-calc() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do @@ -488,6 +492,7 @@ package_libreoffice-draw() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do @@ -530,6 +535,7 @@ package_libreoffice-impress() { optdepends=('mesa: for the OGLTrans extension') backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do @@ -572,6 +578,7 @@ package_libreoffice-math() { optdepends=() backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do @@ -652,6 +659,7 @@ package_libreoffice-writer() { optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') backup=() groups=('libreoffice') + replaces=('libreoffice') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do -- cgit v1.2.3-54-g00ecf