From e3fe31f4a2c44fef8da55c60c3f95a763fdfd3c7 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 12 Feb 2014 03:48:50 +0000 Subject: Wed Feb 12 03:44:41 UTC 2014 --- extra/libreoffice/PKGBUILD | 75 ++++++++++++++++-------------- extra/libreoffice/PKGBUILD.42 | 105 ++++++++++++++++++++++++++---------------- 2 files changed, 107 insertions(+), 73 deletions(-) (limited to 'extra/libreoffice') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 5aa022047..cb8b33ef7 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 203586 2014-01-13 17:12:18Z andyrtr $ +# $Id: PKGBUILD 205850 2014-02-11 18:23:07Z andyrtr $ # Maintainer: AndyRTR -# Maintainer: Bartłomiej Piotrowski +# Maintainer: Bartłomiej Piotrowski -pkgbase="libreoffice" +pkgbase=libreoffice pkgname=('libreoffice-common' 'libreoffice-base' 'libreoffice-calc' @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.4.2 -pkgver=4.1.4 -pkgrel=3 +_LOver=4.1.5.3 +pkgver=4.1.5 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,14 +33,14 @@ 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>=52.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests # there's only one single static library in libreoffice-sdk, # the next build that removes it may lead to trouble if people may use it # -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a -# options=('staticlibs') +# options=('staticlibs') # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors @@ -49,7 +49,7 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" #_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz +source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -120,9 +120,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 libmspub-0.0.6.tar.bz2 libmwaw-0.1.11.tar.bz2 libvisio-0.0.31.tar.bz2 ) -md5sums=('2e7880600b26387f342f277c5d198bfa' - '1235bb27ff2a060cc666752143dfbf6b' - '083f211866fe1f77fd2712b822a56f5c' +md5sums=('12679026121300396c85b4ca11b176c7' + 'SKIP' + 'e0ea06a105071c278e52866f476c0ee6' + 'SKIP' + 'c3b03c33ee14628f1c151288f2eb4962' + 'SKIP' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -175,10 +178,10 @@ prepare() { ln -s ${srcdir}/$source . done popd - + # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - + #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do case "$i" in @@ -206,6 +209,8 @@ build() { --with-parallelism=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ --disable-fetch-external \ + --disable-verbose \ + --enable-release-build \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --libdir=/usr/lib --mandir=/usr/share/man \ --with-lang="" \ @@ -262,7 +267,9 @@ build() { --without-system-hsqldb \ --with-alloc=system\ --with-system-clucene\ - --without-system-servlet-api + --without-system-servlet-api \ + --enable-hardlink-deliver \ + --disable-dependency-tracking # --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 @@ -328,7 +335,7 @@ package_libreoffice-common() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - + # put configuration files into place install -dm755 ${pkgdir}/etc/libreoffice install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ @@ -338,24 +345,24 @@ package_libreoffice-common() { ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - + # allow to preset desired VLC install -dm755 ${pkgdir}/etc/profile.d install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - + # move bash-completion files to its new place install -dm755 ${pkgdir}/usr/share/bash-completion/completions mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d - + # make pyuno find its modules install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py - + # 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 - + # add missing files from Beanshell provider # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do @@ -402,7 +409,7 @@ package_libreoffice-postgresql-connector() { # workaround double entries in the file list mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -424,7 +431,7 @@ package_libreoffice-calc() { #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 groups=('libreoffice') replaces=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -445,7 +452,7 @@ package_libreoffice-draw() { depends=('libreoffice-common') groups=('libreoffice') replaces=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -466,7 +473,7 @@ package_libreoffice-gnome() { optdepends=('gtk3: for gtk3 Gnome integration' 'gtk2: for older gtk2 desktop integration') groups=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -488,7 +495,7 @@ package_libreoffice-impress() { optdepends=('glu: for the OGLTrans extension') groups=('libreoffice') replaces=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -509,7 +516,7 @@ package_libreoffice-kde4() { optdepends=() backup=() groups=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -522,7 +529,7 @@ package_libreoffice-kde4() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - + # one file (libkde4be1lo.so) is part of kde_list.txt # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do @@ -543,7 +550,7 @@ package_libreoffice-math() { depends=('libreoffice-common') groups=('libreoffice') replaces=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -562,7 +569,7 @@ package_libreoffice-sdk() { pkgdesc="Software Development Kit for LibreOffice." depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') groups=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -575,7 +582,7 @@ package_libreoffice-sdk() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - + # fix environment path to keep compatibility with other java-environments # sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh @@ -585,7 +592,7 @@ package_libreoffice-sdk-doc() { pkgdesc="Software Development Kit documentation for LibreOffice" depends=('libreoffice-common' 'libreoffice-sdk') groups=('libreoffice') - + # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do install -dm755 ${pkgdir}/${directory/\%dir/} @@ -623,7 +630,7 @@ package_libreoffice-writer() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - + # for workaround this file belongs now to common rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd } diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42 index 39be2acc7..b36102903 100644 --- a/extra/libreoffice/PKGBUILD.42 +++ b/extra/libreoffice/PKGBUILD.42 @@ -18,22 +18,23 @@ pkgname=('libreoffice-common' 'libreoffice-postgresql-connector' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.2.0.1 +_LOver=4.2.0.4 pkgver=4.2.0 -pkgrel=0.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' - 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' + 'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb' # 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>=52.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' + 'libvisio' 'libetonyek' 'libodfgen' 'telepathy-glib' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-liberation' # to satisfy regression tests 'git') @@ -45,11 +46,11 @@ makedepends=( # makedepends # 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://dev-www.libreoffice.org/src" _additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz +source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -70,7 +71,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 + ${_additional_source_url}/01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2 ${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 @@ -81,18 +82,16 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 ${_additional_source_url}/libmwaw-0.2.0.tar.bz2 - ${_additional_source_url}/libvisio-0.0.31.tar.bz2 - ${_additional_source_url}/libetonyek-0.0.1.tar.bz2 ${_additional_source_url}/libfreehand-0.0.0.tar.bz2 - ${_additional_source_url}/libodfgen-0.0.3.tar.bz2 ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2 ${_additional_source_url}/libatomic_ops-7_2d.zip ${_additional_source_url}/libe-book-0.0.2.tar.bz2 + ${_additional_source_url}/libabw-0.0.1.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 + 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 @@ -121,16 +120,14 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 libmwaw-0.2.0.tar.bz2 - libvisio-0.0.31.tar.bz2 - libetonyek-0.0.1.tar.bz2 libfreehand-0.0.0.tar.bz2 - libodfgen-0.0.3.tar.bz2 Firebird-2.5.2.26540-0.tar.bz2 libatomic_ops-7_2d.zip - libe-book-0.0.2.tar.bz2) -md5sums=('383c63b8055967408e34ca7981b5dab8' - '74cffe54cc756bb28a4496bf94fc5185' - '5b0a27fbf474ff3f2ce819f13efafa1b' + libe-book-0.0.2.tar.bz2 + libabw-0.0.1.tar.bz2) +md5sums=('98674d57d6dd24baef38f007b5020e8e' + '8554bbbdfc72db998a191c71eeafdb55' + '4873b18cd8a535814777c8630fe2db9f' '15cb8c0803064faef0c4ddf5bc5ca279' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -151,7 +148,7 @@ md5sums=('383c63b8055967408e34ca7981b5dab8' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '8c853024fbcff39113d9285250dafc66' + '01a380acfec23bf617117ce98e318f3d' 'ae330b9493bd4503ac390106ff6060d7' '22f8a85daf4a012180322e1f52a7563b' 'ea2acaf140ae40a87a952caa75184f4d' @@ -162,13 +159,11 @@ md5sums=('383c63b8055967408e34ca7981b5dab8' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' 'd794625f156a9fb1c53b3f8a8aa13b5e' - '82628333418f101a20cd21f980cf9f40' - '040e0d7ce0cc0eb3a016964699d54a6c' '496dd00028afcc19f896b01394769043' - '9cafe7f50a3b2c5ebd2dc9c6c509d2b4' '21154d2004e025c8a3666625b0357bb5' 'c0b86562d5aa40761a87134f83e6adcf' '3a62e10c57270718cabfdfc4b7b4e095' + 'af3ccc1f1884e68389088d490d596409' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -223,10 +218,13 @@ build() { --with-parallelism=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ --disable-fetch-external \ + --disable-verbose \ + --enable-release-build \ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ --libdir=/usr/lib --mandir=/usr/share/man \ --with-lang="" \ --enable-crashdump \ + --enable-avahi \ --enable-dbus \ --enable-evolution2\ --enable-gio\ @@ -236,11 +234,15 @@ build() { --enable-gtk3 \ --enable-gstreamer \ --enable-lockdown\ + --enable-opencl \ --enable-opengl \ + --enable-openssl \ --enable-odk\ + --enable-orcus \ --enable-python=system \ --enable-scripting-beanshell \ --enable-scripting-javascript \ + --enable-telepathy \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ --without-fonts\ @@ -249,7 +251,7 @@ build() { --without-system-libcdr \ --without-system-mdds\ --without-myspell-dicts \ - --without-system-libvisio \ + --with-system-libvisio \ --without-system-libcmis \ --without-system-libmspub \ --without-system-libexttextcat \ @@ -257,13 +259,14 @@ build() { --without-system-liblangtag \ --without-system-jfreereport \ --without-system-apache-commons \ - --without-system-libodfgen \ + --with-system-libodfgen \ --without-system-libmwaw \ - --without-system-libetonyek \ + --with-system-libetonyek \ --without-system-libfreehand \ --without-system-firebird \ --without-system-libatomic-ops \ --without-system-libebook \ + --without-system-libabw \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -284,10 +287,10 @@ build() { --without-system-hsqldb \ --with-alloc=system\ --with-system-clucene \ - --disable-dependency-tracking + --disable-dependency-tracking \ + --enable-hardlink-deliver #--help -# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 - +# --enable-mergelibs= \ # https://bugs.archlinux.org/task/34414 # --without-ppds\ # breaks spadmin permission #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool @@ -311,19 +314,20 @@ package_libreoffice-common() { 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>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" - 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + 'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping /macros' + 'beanshell2: interactive java -- good for prototyping/macros' 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' 'sane: for scanner access' 'unixodbc: adds ODBC database support' 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' - 'gtk2: for browser plugin') + 'gtk2: for browser plugin' + 'libpaper: takes care of papersize') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf @@ -370,11 +374,6 @@ package_libreoffice-common() { mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh rm -rf ${pkgdir}/etc/bash_completion.d - # some files would conflict - rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb - # make pyuno find its modules install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py @@ -382,6 +381,20 @@ 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 + + # add missing files from Beanshell provider + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail + done } package_libreoffice-base() { @@ -433,7 +446,7 @@ package_libreoffice-postgresql-connector() { package_libreoffice-calc() { pkgdesc="Spreadsheet application for LibreOffice." install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) + depends=('libreoffice-common' 'lpsolve' 'telepathy-glib') #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 groups=('libreoffice') replaces=('libreoffice') @@ -497,7 +510,7 @@ package_libreoffice-gnome() { package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." install=libreoffice-impress.install - depends=('libreoffice-common') + depends=('libreoffice-common' 'libetonyek') optdepends=('glu: for the OGLTrans extension') groups=('libreoffice') replaces=('libreoffice') @@ -535,6 +548,20 @@ package_libreoffice-kde4() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done + + # one file (libkde4be1lo.so) is part of kde_list.txt + # create directories from *list.txt file + for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done + # install files into the pkg from fakeinstall dir + for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do + dirname=`dirname $file` + # check if directory has been already been created - some are missing like manpages + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + # mv file from fakeinstall to pkgdir + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } package_libreoffice-math() { -- cgit v1.2.3-54-g00ecf