From 6120dd388d785a78dae4f7ca474b9cf661ab3eaa Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 10 Feb 2017 20:21:01 +0000 Subject: [PATCH] extra/libreoffice-fresh to 5.3.0-2 --- extra/libreoffice-fresh/PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index 5e95f5083..327a2d53e 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=5.3.0.3 pkgver=5.3.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -35,7 +35,7 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.6' 'libwpd>=0.9.2' 'lib 'junit' 'libmythes' 'libwpg' 'java-environment' 'postgresql-libs' 'libgl' 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds' 'glew' 'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker' - 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' #'liborcus' + 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus' 'libexttextcat' 'libcmis' 'gobject-introspection' #'libfbclient' 'libtommath' 'libzmf') @@ -70,7 +70,6 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/libfreehand-0.1.1.tar.bz2 ${_additional_source_url}/libstaroffice-0.0.2.tar.bz2 ${_additional_source_url}/Firebird-3.0.0.32483-0.tar.bz2 - ${_additional_source_url}/liborcus-0.12.1.tar.gz ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite ${_additional_source_url2}/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar # for test suite ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -102,7 +101,6 @@ noextract=(boost_1_60_0.tar.bz2 libfreehand-0.1.1.tar.bz2 libstaroffice-0.0.2.tar.bz2 Firebird-3.0.0.32483-0.tar.bz2 - liborcus-0.12.1.tar.gz 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz @@ -140,7 +138,6 @@ sha256sums=('04b9215e1c4b8c7ce2d79b8e322bff8d097426a2d103476cf237cfd42262556e' '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877' 'f06eb29d13357f1aa1944de0be1162de05d9f9333b5f54e9bf762415029a8899' '6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860' - '676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908' 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770' 'a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' @@ -223,7 +220,7 @@ build() { --with-system-libcmis \ --with-system-libmspub \ --with-system-libexttextcat \ - --without-system-orcus \ + --with-system-orcus \ --with-system-liblangtag \ --without-system-jfreereport \ --without-system-apache-commons \ @@ -317,7 +314,7 @@ package_libreoffice-fresh() { 'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker' 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups' - 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' #'liborcus' + 'liblangtag' 'libexttextcat' 'libfbclient' 'libcmis' 'liborcus' 'libtommath' 'libzmf' 'libatomic_ops') optdepends=('java-runtime: adds java support' 'java-environment: required by extension-wiki-publisher and extension-nlpsolver' @@ -369,6 +366,11 @@ package_libreoffice-fresh() { ln -svf /usr/lib/libreoffice/program/unohelper.py \ ${pkgdir}/usr/lib/python3.6/site-packages/unohelper.py + # add a symlink required for gnome-documents; FS#51887 + # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html + ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \ + ${pkgdir}/usr/lib/liblibreofficekitgtk.so + # cleanup rm -rf ${pkgdir}/usr/share/libreoffice/sdk