Date: Saturday, December 21, 2013 @ 23:30:34 Author: andyrtr Revision: 202439
prepare next release Modified: libreoffice/trunk/PKGBUILD libreoffice/trunk/PKGBUILD.42 -------------+ PKGBUILD | 116 ++++++++++++++++++++++++++-------------------------------- PKGBUILD.42 | 2 - 2 files changed, 53 insertions(+), 65 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-21 21:14:43 UTC (rev 202438) +++ PKGBUILD 2013-12-21 22:30:34 UTC (rev 202439) @@ -16,11 +16,12 @@ 'libreoffice-writer' 'libreoffice-en-US' 'libreoffice-postgresql-connector' + 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.2.0.1 -pkgver=4.2.0 -pkgrel=0.1 +_LOver=4.1.4.2 +pkgver=4.1.4 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,14 +30,13 @@ 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' - 'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb' + '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.0' + '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-liberation' # to satisfy regression tests - 'git') + '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 @@ -45,15 +45,16 @@ # 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 - ${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 + ${_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 ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip + ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -70,34 +71,30 @@ ${_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}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 - ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 + ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 ${_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}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 ${_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}/libmwaw-0.1.11.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 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) -noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2 +noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2 + 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2 - 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz + dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 + b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip + 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz @@ -118,23 +115,19 @@ 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.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' - '15cb8c0803064faef0c4ddf5bc5ca279' + libmwaw-0.1.11.tar.bz2 + libvisio-0.0.31.tar.bz2 ) +md5sums=('2e7880600b26387f342f277c5d198bfa' + '1235bb27ff2a060cc666752143dfbf6b' + '083f211866fe1f77fd2712b822a56f5c' + 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' + '2a177023f9ea8ec8bd00837605c5df1b' 'a7983f859eafb2677d7ff386a023bc40' '3c219630e4302863a9a83d0efde889db' '625ff5f2f968dd908bca43c9469d6e6b' @@ -151,24 +144,19 @@ 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '8c853024fbcff39113d9285250dafc66' - 'ae330b9493bd4503ac390106ff6060d7' - '22f8a85daf4a012180322e1f52a7563b' + '08c85a6d6d793daee14e10e22eefdc4b' + 'dc3d21a3921931096d6e80f6701f6763' + 'b2371dc7cf4811c9d32146eec913d296' 'ea2acaf140ae40a87a952caa75184f4d' '36271d3fa0d9dec1632029b6d7aac925' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' - 'd794625f156a9fb1c53b3f8a8aa13b5e' + '828dd03510791fbe037081a2b4a1a8ff' '82628333418f101a20cd21f980cf9f40' - '040e0d7ce0cc0eb3a016964699d54a6c' - '496dd00028afcc19f896b01394769043' - '9cafe7f50a3b2c5ebd2dc9c6c509d2b4' - '21154d2004e025c8a3666625b0357bb5' - 'c0b86562d5aa40761a87134f83e6adcf' - '3a62e10c57270718cabfdfc4b7b4e095' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -176,7 +164,7 @@ 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 @@ -187,11 +175,6 @@ ln -s ${srcdir}/$source . done popd - - # unowinreg.dll must be a file not a symlink or the result will become a broken symlink - # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll - rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll - cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff @@ -259,11 +242,6 @@ --without-system-apache-commons \ --without-system-libodfgen \ --without-system-libmwaw \ - --without-system-libetonyek \ - --without-system-libfreehand \ - --without-system-firebird \ - --without-system-libatomic-ops \ - --without-system-libebook \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -283,9 +261,9 @@ --with-system-headers\ --without-system-hsqldb \ --with-alloc=system\ - --with-system-clucene \ - --disable-dependency-tracking - + --with-system-clucene\ + --without-system-servlet-api + # --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 # --without-ppds\ # breaks spadmin permission @@ -310,7 +288,7 @@ 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>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.4" 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' @@ -336,7 +314,7 @@ conflicts=('go-openoffice') replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' - 'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer') + 'libreoffice-extension-report-builder') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do @@ -648,6 +626,16 @@ done } +package_libreoffice-extension-presentation-minimizer() { + + pkgdesc="This extension reduce the file size of the current presentation" + depends=('libreoffice-common' 'gcc-libs') + groups=('libreoffice-extensions') + + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer +} + package_libreoffice-extension-wiki-publisher() { pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" @@ -656,7 +644,7 @@ groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher } package_libreoffice-extension-nlpsolver() { @@ -667,5 +655,5 @@ groups=('libreoffice-extensions') install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver + unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver } Modified: PKGBUILD.42 =================================================================== --- PKGBUILD.42 2013-12-21 21:14:43 UTC (rev 202438) +++ PKGBUILD.42 2013-12-21 22:30:34 UTC (rev 202439) @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 198658 2013-11-01 15:08:02Z andyrtr $ +# $Id: PKGBUILD 202438 2013-12-21 21:14:43Z andyrtr $ # Maintainer: AndyRTR <andy...@archlinux.org> # Maintainer: Bartłomiej Piotrowski <nos...@bpiotrowski.pl>