diff options
Diffstat (limited to 'extra/libreoffice/PKGBUILD')
| -rw-r--r-- | extra/libreoffice/PKGBUILD | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 23f698db7..46901fd8a 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 211311 2014-04-18 17:28:14Z andyrtr $ +# $Id: PKGBUILD 212157 2014-05-09 14:51:00Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -18,9 +18,9 @@ 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.3.3 -pkgver=4.2.3 -pkgrel=3 +_LOver=4.2.4.2 +pkgver=4.2.4 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,14 +29,14 @@ makedepends=( # makedepends 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'mesa' 'clucene' 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu' - 'gdb' 'doxygen' + 'gdb' 'doxygen' 'libatomic_ops' 'mdds' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' - 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' #"icu>=52.1" + 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' - #'libcdr' 'libmspub' + 'libcdr' 'libmspub' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib' 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests @@ -49,13 +49,12 @@ 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{,.asc} ${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 - ${_additional_source_url}/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -75,7 +74,6 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_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}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.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 @@ -83,20 +81,19 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_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}/libfreehand-0.0.0.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.3.tar.bz2 ${_additional_source_url}/libabw-0.0.2.tar.bz2 + ${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh) + libreoffice-common.sh libreoffice-common.csh + prevent_KDE_Qt_from_interfering_with_the_session_manager.diff + icu53.diff + icu53_crashfix.diff) noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 - 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 @@ -122,22 +119,19 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.14.tar.bz2 - libmspub-0.0.6.tar.bz2 libmwaw-0.2.0.tar.bz2 libfreehand-0.0.0.tar.bz2 Firebird-2.5.2.26540-0.tar.bz2 - libatomic_ops-7_2d.zip libe-book-0.0.3.tar.bz2 - libabw-0.0.2.tar.bz2) -md5sums=('0347f2c919e809b3f3794ed509caa902' + libabw-0.0.2.tar.bz2 + language-subtag-registry-2014-03-27.tar.bz2) +md5sums=('698a482f0cacd8b5eba9865fdd8a5403' 'SKIP' - 'fa82b4c4510c78fe22a3a56d53fb9752' + 'a0ed88ac1758d2f87687fcf4bb7c9432' 'SKIP' - '81759541de9ce626a02d652399cd1ffe' + '3db05930dc7c694d2cf58875b3245c2e' 'SKIP' '15cb8c0803064faef0c4ddf5bc5ca279' - '9e96ed4c1d99c0d14ac03c140f9f346c' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -157,7 +151,6 @@ md5sums=('0347f2c919e809b3f3794ed509caa902' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '47203e7cade74e5c385aa812f21e7932' 'ae330b9493bd4503ac390106ff6060d7' '22f8a85daf4a012180322e1f52a7563b' 'ea2acaf140ae40a87a952caa75184f4d' @@ -165,25 +158,23 @@ md5sums=('0347f2c919e809b3f3794ed509caa902' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - 'd88f9b94df880d2c05be943b000ca112' - '1120705cd0f0d9bd5506360bf57b6c2e' 'd794625f156a9fb1c53b3f8a8aa13b5e' '496dd00028afcc19f896b01394769043' '21154d2004e025c8a3666625b0357bb5' - 'c0b86562d5aa40761a87134f83e6adcf' '2f1ceaf2ac8752ed278e175447d9b978' '40fa48e03b1e28ae0325cc34b35bc46d' + '504af523f5d1a5590bbeb6a4b55e8a97' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' + 'fa2109339289663cb8ea7cf27cc22f4e' + '07f53a9f899e533f9393e48b5d429165' + '2a296750092824cd5631e7b529433b28') prepare() { cd libreoffice-$_LOver #return 1 - # fix exttextcat build error - # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] - unset CPPFLAGS # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources @@ -199,6 +190,14 @@ prepare() { # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff + + # fix some startup issues with kde4 integration + # https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128 + patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff + + # upstream fixes for icu 53 + patch -Np1 -i ${srcdir}/icu53.diff + patch -Np1 -i ${srcdir}/icu53_crashfix.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -257,13 +256,12 @@ build() { --enable-ext-nlpsolver \ --without-fonts\ --without-afms\ - --without-system-libwps\ - --without-system-libcdr \ - --without-system-mdds\ + --with-system-libcdr \ + --with-system-mdds\ --without-myspell-dicts \ --with-system-libvisio \ --without-system-libcmis \ - --without-system-libmspub \ + --with-system-libmspub \ --without-system-libexttextcat \ --without-system-orcus \ --without-system-liblangtag \ @@ -274,7 +272,7 @@ build() { --with-system-libetonyek \ --without-system-libfreehand \ --without-system-firebird \ - --without-system-libatomic-ops \ + --with-system-libatomic-ops \ --without-system-libebook \ --without-system-libabw \ --with-system-dicts \ @@ -290,7 +288,7 @@ build() { --without-system-npapi-headers \ --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ - --without-system-icu \ + --with-system-icu \ --with-system-cairo\ --with-system-libs\ --with-system-mythes\ @@ -324,9 +322,10 @@ 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' 'clucene' 'lcms2' "poppler>=0.24.0" #"icu>=52.1" + 'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu' #'telepathy-glib' # (calc telepathy-glib libtubeslo.so) 'libodfgen' 'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu' + 'libmspub' 'libcdr' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -707,7 +706,6 @@ package_libreoffice-extension-wiki-publisher() { package_libreoffice-extension-nlpsolver() { pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') depends=('libreoffice-common' 'java-environment') groups=('libreoffice-extensions') |