diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-18 01:09:28 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-18 01:09:28 -0700 |
| commit | cc1dbaab9d968ae5ace1956c3662b8b492694800 (patch) | |
| tree | da9b8d35950f63d7a68e4d4e5938715e1f0f5cdb /extra/libreoffice | |
| parent | c72dc5de577922ea7f6002cdabcfac1576eae211 (diff) | |
Fri Oct 18 01:09:01 PDT 2013
Diffstat (limited to 'extra/libreoffice')
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 36ebc53ff..8bddba6bd 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $ +# $Id: PKGBUILD 196745 2013-10-17 14:02:51Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.1.2.3 pkgver=4.1.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends 'clucene' 'bluez-libs' 'harfbuzz-icu' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -284,7 +284,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -354,10 +354,6 @@ package_libreoffice-common() { # workaround all packages now depend on that file cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd - - # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages - mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/ - mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/ } package_libreoffice-base() { @@ -451,7 +447,9 @@ package_libreoffice-draw() { package_libreoffice-gnome() { pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gconf' 'gtk3') + depends=('libreoffice-common' 'gconf') + optdepends=('gtk3: for gtk3 Gnome integration' + 'gtk2: for older gtk2 desktop integration') groups=('libreoffice') # create directories from *list.txt file @@ -620,11 +618,6 @@ package_libreoffice-en-US() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - - # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook - mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic - mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic } package_libreoffice-extension-presentation-minimizer() { |